コミット: f49a7af095a5ef5355b0bccd5329b11f0a667fd9 - allura (git)

allura

コミットメタ情報

• リビジョン: f49a7af095a5ef5355b0bccd5329b11f0a667fd9 (tree)
• 日時: 2012-05-04 19:17:37
• 作者: bolkimen <bolkimen@yaho...>
• コミッター: bolkimen

ログメッセージ

ticket:47 add tests and change code

変更サマリ

• modified: Allura/allura/lib/helpers.py
• modified: Allura/allura/lib/utils.py
• modified: Allura/allura/public/nf/css/forge/hilite.css
• modified: Allura/allura/templates/repo/file.html
• modified: Allura/allura/tests/test_utils.py
• modified: ForgeGit/forgegit/tests/functional/test_controllers.py
• modified: ForgeHg/forgehg/tests/functional/test_controllers.py
• modified: ForgeSVN/forgesvn/tests/functional/test_controllers.py

差分

--- a/Allura/allura/lib/helpers.py
+++ b/Allura/allura/lib/helpers.py
@@ -542,7 +542,7 @@ def paging_sanitizer(limit, page, total_count, zero_based_pages=True):
     page = min(max(int(page), (0 if zero_based_pages else 1)), max_page)
     return limit, page
 
-def render_any_markup(name, text):
+def render_any_markup(name, text, code_mode=False):
     """
     renders any markup format using the pypeline
     Returns jinja-safe text
@@ -551,6 +551,15 @@ def render_any_markup(name, text):
         text = '<p><em>Empty File</em></p>'
     else:
         text = pylons.g.pypeline_markup.render(name, text)
-        if not pylons.g.pypeline_markup.can_render(name):
-            text = '<pre>%s</pre>' % text
+        if not pylons.g.pypeline_markup.can_render(name) or True:
+            if code_mode:
+                markup_text = '<div class="codehilite"><pre>'
+                line_num = 1
+                for line in text.splitlines():
+                    markup_text = markup_text + '<div id="l%s" class="code_block"><span class="lineno">%s</span> %s</div>' % (line_num, line_num, line)
+                    line_num += 1
+                markup_text = markup_text + '</pre></div>'
+                text = markup_text
+            else:
+                text = '<pre>%s</pre>' % text
     return Markup(text)

--- a/Allura/allura/lib/utils.py
+++ b/Allura/allura/lib/utils.py
@@ -407,7 +407,6 @@ class LineAnchorCodeHtmlFormatter(HtmlFormatter):
         num = self.linenostart
         yield 0, ('<pre' + (style and ' style="%s"' % style) + '>')
         for tup in inner:
-            yield (tup[0], '<a class="linelink" href="#codeline_%s">'\
-                           '<div id="codeline_%s" class="code_block">%s</div></a>' % (num, num, tup[1]))
+            yield (tup[0], '<div id="l%s" class="code_block">%s</div>' % (num, tup[1]))
             num += 1
         yield 0, '</pre>'

--- a/Allura/allura/public/nf/css/forge/hilite.css
+++ b/Allura/allura/public/nf/css/forge/hilite.css
@@ -64,7 +64,6 @@
 
 .codehilite pre { margin:0; }
 .codehilite div { margin:0; padding: 0; }
-.codehilite a.linelink { text-decoration: none; }
-.codehilite a.linelink .code_block { width:100%; }
-.codehilite a.linelink .code_block:hover { background-color: #ffff99; }
+.codehilite .code_block { width:100%; }
+.codehilite .code_block:hover { background-color: #ffff99; }
 .codehilite .lineno { background-color: #ebebeb; display:inline-block; padding:0 .5em; border-width: 0 1px 0 0; border-style: solid; border-color: #ddd; }

--- a/Allura/allura/templates/repo/file.html
+++ b/Allura/allura/templates/repo/file.html
@@ -22,17 +22,18 @@
 {{ super() }}
 <script type="text/javascript">(function() {
   var hash = window.location.hash.substring(1);
-  if (hash != '' && hash.substring(0, 9) == 'codeline_') {
+  if (hash != '' && hash.substring(0, 1) == 'l' && !isNaN(hash.substring(1))) {
     $('#' + hash).css('background-color', '#ffff99');
   }
 
   $('.code_block').each(function(index, element) {
     $(element).bind('click', function() {
       var hash = window.location.hash.substring(1);
-      if (hash != '' && hash.substring(0, 9) == 'codeline_') {
+      if (hash != '' && hash.substring(0, 1) == 'l' && !isNaN(hash.substring(1))) {
         $('#' + hash).css('background-color', 'transparent');
       }
       $(element).css('background-color', '#ffff99');
+      window.location.href = '#' + $(element).attr('id');
     });
   });
 }());
@@ -68,7 +69,7 @@
     <div class="clip grid-19">
       <h3><span class="ico-l"><b data-icon="{{g.icons['table'].char}}" class="ico {{g.icons['table'].css}}"></b> {{h.really_unicode(blob.name)}}</span></h3>
       {% if blob.has_pypeline_view %}
-        {{h.render_any_markup(blob.name, blob.text)}}
+        {{h.render_any_markup(blob.name, blob.text, True)}}
       {% else %}
         {{g.highlight(blob.text, filename=blob.name)}}
       {% endif %}

--- a/Allura/allura/tests/test_utils.py
+++ b/Allura/allura/tests/test_utils.py
@@ -5,6 +5,10 @@ import unittest
 import pylons
 from webob import Request
 
+from pygments import highlight
+from pygments.lexers import PythonLexer, get_lexer_for_filename
+from pygments.formatters import HtmlFormatter
+
 from ming.orm import state
 from alluratest.controller import setup_unit_test
 
@@ -115,3 +119,16 @@ class TestCaseInsensitiveDict(unittest.TestCase):
         assert d == dict(foo=1, bar=2)
         assert d != dict(Foo=1, bar=2)
         assert d == utils.CaseInsensitiveDict(Foo=1, bar=2)
+
+class TestLineAnchorCodeHtmlFormatter(unittest.TestCase):
+    def test_render(self):
+        code = '#!/usr/bin/env python\n'\
+               'print "Hello, world!"'
+
+        formatter = utils.LineAnchorCodeHtmlFormatter(cssclass='codehilite',
+                                                      linenos='inline')
+        lexer = get_lexer_for_filename("some.py", encoding='chardet')
+        hl_code = highlight(code, lexer, formatter)
+        assert '<div class="codehilite">' in hl_code
+        assert '<div id="l1" class="code_block">' in hl_code
+        assert '<span class="lineno">1</span>' in hl_code

--- a/ForgeGit/forgegit/tests/functional/test_controllers.py
+++ b/ForgeGit/forgegit/tests/functional/test_controllers.py
@@ -149,6 +149,8 @@ class TestRootController(TestController):
         assert 'README' in resp.html.find('h2',{'class':'dark title'}).contents[2]
         content = str(resp.html.find('div',{'class':'clip grid-19'}))
         assert 'This is readme' in content, content
+        assert '<div id="l1" class="code_block">' in resp
+        assert 'var hash = window.location.hash.substring(1);' in resp
 
     def test_invalid_file(self):
         ci = self._get_ci()

--- a/ForgeHg/forgehg/tests/functional/test_controllers.py
+++ b/ForgeHg/forgehg/tests/functional/test_controllers.py
@@ -126,6 +126,8 @@ class TestRootController(TestController):
         assert 'README' in resp.html.find('h2',{'class':'dark title'}).contents[2]
         content = str(resp.html.find('div',{'class':'clip grid-19'}))
         assert 'This is readme' in content, content
+        assert '<div id="l1" class="code_block">' in resp
+        assert 'var hash = window.location.hash.substring(1);' in resp
 
     def test_invalid_file(self):
         ci = self._get_ci()

--- a/ForgeSVN/forgesvn/tests/functional/test_controllers.py
+++ b/ForgeSVN/forgesvn/tests/functional/test_controllers.py
@@ -76,6 +76,8 @@ class TestRootController(TestController):
         assert 'README' in resp.html.find('h2',{'class':'dark title'}).contents[2]
         content = str(resp.html.find('div',{'class':'clip grid-19'}))
         assert 'This is readme' in content, content
+        assert '<div id="l1" class="code_block">' in resp
+        assert 'var hash = window.location.hash.substring(1);' in resp
 
     def test_invalid_file(self):
         resp = self.app.get('/src/1/tree/READMEz', status=404)