Changeset 1709

Timestamp:

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

Author:

JensDiemer

Message:

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

Location:

trunk/pylucid

Files:

• media/PyLucid/internal_page/blog/display_blog.html (modified) (1 diff)
• PyLucid/plugins_internal/blog/blog.py (modified) (3 diffs)
• PyLucid/plugins_internal/blog/models.py (modified) (2 diffs)
• PyLucid/tools/content_processors.py (modified) (3 diffs)

trunk/pylucid/media/PyLucid/internal_page/blog/display_blog.html

@@ -55 +55 @@
                       </div>
 
-                      <pre>{{ comment.content }}</pre>
+                      {{ comment.html_content }}
 
                       <small><p class="dateinfo">

trunk/pylucid/PyLucid/plugins_internal/blog/blog.py

@@ -28 +28 @@
 from django.http import HttpResponse
 from django.core.mail import send_mail
-#from django.utils.safestring import mark_safe
 #from django.utils.encoding import force_unicode
 from django.utils.translation import ugettext as _
@@ -94 +93 @@
         # Change the page title.
         self.current_page.title = self.preferences["blog_title"]
-
 
     def _add_comment_admin_urls(self, comments):
@@ -131 +129 @@
                 else:
                     comments = comments.filter(is_public = True).all()
+
                 entry.all_comments = comments
             else:

trunk/pylucid/PyLucid/plugins_internal/blog/models.py

@@ -20 +20 @@
 from django.contrib.auth.models import User
 from django.utils.translation import ugettext as _
+from django.utils.html import strip_tags
+from django.utils.safestring import mark_safe
 
-from PyLucid.tools.content_processors import apply_markup
+from PyLucid.tools.content_processors import apply_markup, fallback_markup
 from PyLucid.models.Page import MARKUPS
 
@@ -66 +68 @@
         null=True, blank=True
     )
+
+    def html_content(self):
+        """
+        returns the content as html used a simple markup.
+        """
+        safe_content = strip_tags(self.content)
+        content = fallback_markup(safe_content)
+        return mark_safe(content)
 
     class Admin:

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."