From 49db7362d8a0e4050166b3b34999781749e6eef4 Mon Sep 17 00:00:00 2001 From: jordan Date: Mon, 27 Dec 2010 21:54:14 +0000 Subject: [PATCH] Adding autolinking functionality, using mdx_urlize markdown extension. git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@635 0cfe37f9-358a-4d5e-be75-b63607b5c754 --- forum/markdownext/mdx_urlize.py | 81 +++++++++++++++++++++++++++++++++ forum/models/node.py | 4 +- 2 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 forum/markdownext/mdx_urlize.py diff --git a/forum/markdownext/mdx_urlize.py b/forum/markdownext/mdx_urlize.py new file mode 100644 index 0000000..071e6b2 --- /dev/null +++ b/forum/markdownext/mdx_urlize.py @@ -0,0 +1,81 @@ +"""A more liberal autolinker + +Inspired by Django's urlize function. + +Positive examples: + +>>> import markdown +>>> md = markdown.Markdown(extensions=['urlize']) + +>>> md.convert('http://example.com/') +u'

http://example.com/

' + +>>> md.convert('go to http://example.com') +u'

go to http://example.com

' + +>>> md.convert('example.com') +u'

example.com

' + +>>> md.convert('example.net') +u'

example.net

' + +>>> md.convert('www.example.us') +u'

www.example.us

' + +>>> md.convert('(www.example.us/path/?name=val)') +u'

(www.example.us/path/?name=val)

' + +>>> md.convert('go to now!') +u'

go to http://example.com now!

' + +Negative examples: + +>>> md.convert('del.icio.us') +u'

del.icio.us

' + +""" + +import markdown + +# Global Vars +URLIZE_RE = '(%s)' % '|'.join([ + r'<(?:f|ht)tps?://[^>]*>', + r'\b(?:f|ht)tps?://[^)<>\s]+[^.,)<>\s]', + r'\bwww\.[^)<>\s]+[^.,)<>\s]', + r'[^(<\s]+\.(?:com|net|org)\b', +]) + +class UrlizePattern(markdown.inlinepatterns.Pattern): + """ Return a link Element given an autolink (`http://example/com`). """ + def handleMatch(self, m): + url = m.group(2) + + if url.startswith('<'): + url = url[1:-1] + + text = url + + if not url.split('://')[0] in ('http','https','ftp'): + if '@' in url and not '/' in url: + url = 'mailto:' + url + else: + url = 'http://' + url + + el = markdown.etree.Element("a") + el.set('href', url) + el.text = markdown.AtomicString(text) + return el + +class UrlizeExtension(markdown.Extension): + """ Urlize Extension for Python-Markdown. """ + + def extendMarkdown(self, md, md_globals): + """ Replace autolink with UrlizePattern """ + md.inlinePatterns['autolink'] = UrlizePattern(URLIZE_RE, md) + +def makeExtension(configs=None): + return UrlizeExtension(configs=configs) + +if __name__ == "__main__": + import doctest + doctest.testmod() diff --git a/forum/models/node.py b/forum/models/node.py index 6a18165..2c72e81 100644 --- a/forum/models/node.py +++ b/forum/models/node.py @@ -331,10 +331,10 @@ class Node(BaseModel, NodeContent): def create_revision(self, user, **kwargs): number = self.revisions.aggregate(last=models.Max('revision'))['last'] + 1 revision = self._create_revision(user, number, **kwargs) - self.activate_revision(user, revision) + self.activate_revision(user, revision, extensions=['urlize']) return revision - def activate_revision(self, user, revision, *extensions): + def activate_revision(self, user, revision, extensions): self.title = revision.title self.tagnames = revision.tagnames self.body = self._as_markdown(revision.body, *extensions) -- 2.39.5