add tests for and fix alex's examples

Author: Richard Jones

roundup/cgi/templating.py

@@ -1249,10 +1249,11 @@ class StringHTMLProperty(HTMLProperty):
         (?P<url>
          (
           (ht|f)tp(s?)://                   # protocol
-          ([\w]+:\w+@)?                     # username/password
-          ([\w\-]+\.)+                      # hostname
-          [\w]{2,5}                         # TLD
+          ([\w]+(:\w+)?@)?                  # username/password
+          ([\w\-]+)                         # hostname
+          ((\.[\w-]+)+)?                    # .domain.etc
          |                                  # ... or ...
+          ([\w]+(:\w+)?@)?                  # username/password
           www\.                             # "www."
           ([\w\-]+\.)+                      # hostname
           [\w]{2,5}                         # TLD

test/test_templating.py

@@ -94,7 +94,8 @@ def test_url_match(self):
         def t(s, nothing=False, **groups):
             m = StringHTMLProperty.hyper_re.search(s)
             if nothing:
-                self.assertEquals(m, None, '%r matched'%s)
+                if m:
+                    self.assertEquals(m, None, '%r matched (%r)'%(s, m.groupdict()))
                 return
             else:
                 self.assertNotEquals(m, None, '%r did not match'%s)
@@ -104,7 +105,11 @@ def t(s, nothing=False, **groups):
                     groups[g], s))
 
         #t('123.321.123.321', 'url')
+        t('http://localhost/', url='http://localhost/')
         t('http://roundup.net/', url='http://roundup.net/')
+        t('http://richard@localhost/', url='http://richard@localhost/')
+        t('http://richard:sekrit@localhost/',
+            url='http://richard:sekrit@localhost/')
         t('<HTTP://roundup.net/>', url='HTTP://roundup.net/')
         t('www.a.ex', url='www.a.ex')
         t('foo.a.ex', nothing=True)
@@ -117,6 +122,8 @@ def t(s, nothing=False, **groups):
         t('[email protected]', email='[email protected]')
         t('i1', **{'class':'i', 'id':'1'})
         t('item123', **{'class':'item', 'id':'123'})
+        t('www.user:[email protected]', email='[email protected]')
+        t('user:[email protected]', url='user:[email protected]')
 
     def test_url_replace(self):
         p = StringHTMLProperty(self.client, 'test', '1', None, 'test', '')