Changeset 1709 for trunk/pylucid/PyLucid/tools/content_processors.py

Timestamp:

07/23/08 13:10:41 (20 months ago)

Author:

JensDiemer

Message:

blog plugin: use a simple markup for comments: ticket:213

Files:

• trunk/pylucid/PyLucid/tools/content_processors.py (modified) (3 diffs)

trunk/pylucid/PyLucid/tools/content_processors.py

@@ -21 +21 @@
 """
 
+import re
+
+if __name__ == "__main__":
+    # For doctest only
+    import os
+    os.environ["DJANGO_SETTINGS_MODULE"] = "PyLucid.settings"
+
 from django.conf import settings
 from django.template import Template, Context
@@ -36 +43 @@
 # MARKUP
 
+BLOCK_RE = re.compile("\n{2,}")
+
+LINK_RE = re.compile(
+    r'''(?<!=")(?P<url>(http|ftp|svn|irc)://(?P<title>[^\s\<]+))(?uimx)'''
+)
+
 def fallback_markup(content):
     """
     A simplest markup, build only paragraphs.
+    >>> fallback_markup("line one\\nline two\\n\\nnext block")
+    '<p>line one<br />\\nline two</p>\\n\\n<p>next block</p>'
+
+    >>> fallback_markup("url: http://pylucid.org END")
+    '<p>url: <a href="http://pylucid.org">pylucid.org</a> END</p>'
     """
-    import re
     content = content.replace("\r\n", "\n").replace("\r","\n")
-    blocks = re.split("\n{2,}", content)
+    blocks = BLOCK_RE.split(content)
     blocks = [line.replace("\n", "<br />\n") for line in blocks]
     content = "<p>" + "</p>\n\n<p>".join(blocks) + "</p>"
+    content = LINK_RE.sub(r'<a href="\g<url>">\g<title></a>', content)
     return content
 
@@ -156 +174 @@
 
 
-
+if __name__ == "__main__":
+    import doctest
+    doctest.testmod(
+#        verbose=True
+        verbose=False
+    )
+    print "DocTest end."