issue2551096 - enable markdown autolink for email and bare url's.

Modify raw markdown adding appropriate link markers '<' and '>' on the
fly so bare urls and email addreses are recognized as explicit links
by markdown backends.  Patch by Cedric Krier.

Author: rouilj

CHANGES.txt

@@ -41,7 +41,7 @@ Fixed:
   Meerwald) 
 - issue2551092 - fix crash bug by aligning
   roundup.anypy.email_.decode_header with stdlib email.header and
-  convert string to bytes for python 3.
+  convert string to bytes for python 3. (Cedric Krier)
 - issue2551097 - fix underlying bug in use of fenced codeblocks with
   markdown2. Fix for issue2551093 to prevent exception trigger.
   (patch: Cedric Krier)
@@ -60,6 +60,9 @@ Features:
 - issue2551094 - add new markdown config.ini setting to allow embedded
   newlines to cause a linebreak same as GitHub Flavored Markdown.
   (Patch: Cedric Krier; Doc change/checkin John Rouillard)
+- issue2551096 - enable markdown autolink for email and bare url's.
+  Modify raw markdown adding appropriate link markers on the fly.
+  (Cedric Krier)
 
 2020-07-13 2.0.0
 

roundup/cgi/templating.py

@@ -1621,6 +1621,23 @@ def _hyper_repl_rst(self, match):
             return match.group(0)
 
     def _hyper_repl_markdown(self, match):
+        for group in ['url', 'email']:
+            if match.group(group):
+                start = match.start(group) - 1
+                end = match.end(group)
+                if start >= 0:
+                    prefix = match.string[start]
+                    if end < len(match.string):
+                        suffix = match.string[end]
+                        if (prefix, suffix) in {
+                                ('<', '>'),
+                                ('(', ')'),
+                                }:
+                            continue
+                    if prefix == '(' and match.string[end - 1] == ')':
+                        continue
+                s = match.group(group)
+                return '<%s>' % s
         if match.group('id') and len(match.group('id')) < 10:
             return self._hyper_repl_item(match,'[%(item)s](%(cls)s%(id)s)')
         else:

test/test_templating.py

@@ -493,6 +493,33 @@ def test_markdown_break_on_newline(self):
         m = p.markdown()
         self.assertEqual(0, m.count('<br'))
 
+    def test_markdown_hyperlinked_url(self):
+        # classic markdown does not emit a \n at end of rendered string
+        # so rstrip \n.
+        p = StringHTMLProperty(self.client, 'test', '1', None, 'test', u2s(u'http://example.com/'))
+        m = p.markdown(hyperlink=1)
+        self.assertEqual(m.rstrip('\n'), '<p><a href="http://example.com/">http://example.com/</a></p>')
+
+        p = StringHTMLProperty(self.client, 'test', '1', None, 'test', u2s(u'<http://example.com/>'))
+        m = p.markdown(hyperlink=1)
+        self.assertEqual(m.rstrip('\n'), '<p><a href="http://example.com/">http://example.com/</a></p>')
+
+        p = StringHTMLProperty(self.client, 'test', '1', None, 'test', u2s(u'![](http://example.com/)'))
+        m = p.markdown(hyperlink=1)
+        self.assertIn(m, [
+                '<p><img src="http://example.com/" alt=""/></p>\n',
+                '<p><img src="http://example.com/" alt="" /></p>\n',
+                '<p><img src="http://example.com/" alt=""></p>\n',
+                '<p><img alt="" src="http://example.com/" /></p>', # markdown
+                ])
+
+        p = StringHTMLProperty(self.client, 'test', '1', None, 'test', u2s(u'An URL http://example.com/ with text'))
+        m = p.markdown(hyperlink=1)
+        self.assertEqual(m.rstrip('\n'), '<p>An URL <a href="http://example.com/">http://example.com/</a> with text</p>')
+
+        p = StringHTMLProperty(self.client, 'test', '1', None, 'test', u2s(u'An URL https://example.com/path with text'))
+        m = p.markdown(hyperlink=1)
+        self.assertEqual(m.rstrip('\n'), '<p>An URL <a href="https://example.com/path">https://example.com/path</a> with text</p>')
 
 @skip_mistune
 class MistuneTestCase(TemplatingTestCase, MarkdownTests) :