kallithea Changeset - a9adca4ba3c9

Changeset - a9adca4ba3c9

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 13 years ago 2013-02-26 00:11:59
marcin@python-works.com

fixed urlify changesets regex + tests

2 files changed with 55 insertions and 24 deletions:

rhodecode/lib/helpers.py

rhodecode/tests/test_libs.py

0 comments (0 inline, 0 general)

rhodecode/lib/helpers.py

➞

Show inline comments

@@ @@ -983,63 +983,58 @@ def urlify_text(text_, safe=True): @@
     :param text_:
     """
     url_pat = re.compile(r'''(http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]'''
                          '''|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+)''')
     def url_func(match_obj):
         url_full = match_obj.groups()[0]
         return '<a href="%(url)s">%(url)s</a>' % ({'url': url_full})
     _newtext = url_pat.sub(url_func, text_)
     if safe:
         return literal(_newtext)
     return _newtext
 def urlify_changesets(text_, repository):
     """
     Extract revision ids from changeset and make link from them
     :param text_:
     :param repository: repo name to build the URL with
     """
     from pylons import url  # doh, we need to re-import url to mock it later
-    URL_PAT = re.compile(r'(?:^|\s)([0-9a-fA-F]{12,40})(?:$|\s)')
     URL_PAT = re.compile(r'(^|\s)([0-9a-fA-F]{12,40})($|\s)')
     def url_func(match_obj):
         rev = match_obj.groups()[0]
         pref = ''
         suf = ''
         if match_obj.group().startswith(' '):
             pref = ' '
         if match_obj.group().endswith(' '):
             suf = ' '
         rev = match_obj.groups()[1]
         pref = match_obj.groups()[0]
         suf = match_obj.groups()[2]
         tmpl = (
         '%(pref)s<a class="%(cls)s" href="%(url)s">'
         '%(rev)s'
         '</a>'
         '%(suf)s'
         '%(rev)s</a>%(suf)s'
+        )
         return tmpl % {
          'pref': pref,
          'cls': 'revision-link',
          'url': url('changeset_home', repo_name=repository, revision=rev),
          'rev': rev,
          'suf': suf
+        }
     newtext = URL_PAT.sub(url_func, text_)
     return newtext
 def urlify_commit(text_, repository=None, link_=None):
     """
     Parses given text message and makes proper links.
     issues are linked to given issue-server, and rest is a changeset link
     if link_ is given, in other case it's a plain text
     :param text_:
     :param repository:
     :param link_: changeset link
     """

rhodecode/tests/test_libs.py

➞

Show inline comments

@@ @@ -188,67 +188,103 @@ class TestLibs(unittest.TestCase): @@
             fake = fake_conf(alternative_gravatar_url='http://test.com/{email}')
             with mock.patch('pylons.config', fake):
                 grav = gravatar_url(email_address='test@foo.com', size=24)
                 assert grav == 'http://test.com/test@foo.com'
             fake = fake_conf(alternative_gravatar_url='http://test.com/{md5email}')
             with mock.patch('pylons.config', fake):
                 em = 'test@foo.com'
                 grav = gravatar_url(email_address=em, size=24)
                 assert grav == 'http://test.com/%s' % (_md5(em))
             fake = fake_conf(alternative_gravatar_url='http://test.com/{md5email}/{size}')
             with mock.patch('pylons.config', fake):
                 em = 'test@foo.com'
                 grav = gravatar_url(email_address=em, size=24)
                 assert grav == 'http://test.com/%s/%s' % (_md5(em), 24)
             fake = fake_conf(alternative_gravatar_url='{scheme}://{netloc}/{md5email}/{size}')
             with mock.patch('pylons.config', fake):
                 em = 'test@foo.com'
                 grav = gravatar_url(email_address=em, size=24)
                 assert grav == 'https://server.com/%s/%s' % (_md5(em), 24)
     def _quick_url(self, text, tmpl="""<a class="revision-link" href="%s">%s</a>""", url_=None):
         """
         Changes `some text url[foo]` => `some text <a href="/">foo</a>
         :param text:
         """
         import re
         #quickly change expected url[] into a link
         URL_PAT = re.compile(r'(?:url\[)(.+?)(?:\])')
         def url_func(match_obj):
             _url = match_obj.groups()[0]
             return tmpl % (url_ or '/some-url', _url)
         return URL_PAT.sub(url_func, text)
     @parameterized.expand([
       ("",
        ""),
       ("git-svn-id: https://svn.apache.org/repos/asf/libcloud/trunk@1441655 13f79535-47bb-0310-9956-ffa450edef68",
        "git-svn-id: https://svn.apache.org/repos/asf/libcloud/trunk@1441655 13f79535-47bb-0310-9956-ffa450edef68"),
       ("from rev 000000000000",
        "from rev url[000000000000]"),
       ("from rev 000000000000123123 also rev 000000000000",
        "from rev url[000000000000123123] also rev url[000000000000]"),
       ("this should-000 00",
        "this should-000 00"),
       ("longtextffffffffff rev 123123123123",
        "longtextffffffffff rev url[123123123123]"),
       ("rev ffffffffffffffffffffffffffffffffffffffffffffffffff",
        "rev ffffffffffffffffffffffffffffffffffffffffffffffffff"),
       ("ffffffffffff some text traalaa",
        "url[ffffffffffff] some text traalaa"),
        ("""Multi line
        123123123123
        some text 123123123123""",
        some text 123123123123
        sometimes !
        """,
        """Multi line
        url[123123123123]
        some text url[123123123123]""")
        some text url[123123123123]
        sometimes !
        """)
     ])
     def test_urlify_changesets(self, sample, expected):
         import re
         def fake_url(self, *args, **kwargs):
             return '/some-url'
         #quickly change expected url[] into a link
         URL_PAT = re.compile(r'(?:url\[)(.+?)(?:\])')
         def url_func(match_obj):
             _url = match_obj.groups()[0]
             tmpl = """<a class="revision-link" href="/some-url">%s</a>"""
             return tmpl % _url
         expected = URL_PAT.sub(url_func, expected)
         expected = self._quick_url(expected)
         with mock.patch('pylons.url', fake_url):
             from rhodecode.lib.helpers import urlify_changesets
             self.assertEqual(urlify_changesets(sample, 'repo_name'), expected)
     @parameterized.expand([
       ("",
        "",
        ""),
       ("https://svn.apache.org/repos",
        "url[https://svn.apache.org/repos]",
        "https://svn.apache.org/repos"),
       ("http://svn.apache.org/repos",
        "url[http://svn.apache.org/repos]",
        "http://svn.apache.org/repos"),
       ("from rev a also rev http://google.com",
        "from rev a also rev url[http://google.com]",
        "http://google.com"),
        ("""Multi line
        https://foo.bar.com
        some text lalala""",
        """Multi line
        url[https://foo.bar.com]
        some text lalala""",
        "https://foo.bar.com")
     ])
     def test_urlify_test(self, sample, expected, url_):
         from rhodecode.lib.helpers import urlify_text
         expected = self._quick_url(expected,
                                    tmpl="""<a href="%s">%s</a>""", url_=url_)
         self.assertEqual(urlify_text(sample), expected)

0 comments (0 inline, 0 general)