Changeset 1837

Timestamp:

03/03/09 13:46:01 (13 months ago)

Author:

JensDiemer

Message:

New in blog plugin: Markup preview + unittest for this

Location:

trunk/pylucid_project

Files:

• media/PyLucid/internal_page/blog/edit_blog_entry.css (modified) (1 diff)
• media/PyLucid/internal_page/blog/edit_blog_entry.html (modified) (2 diffs)
• PyLucid/plugins_internal/blog/blog.py (modified) (4 diffs)
• tests/plugin_admin_blog.py (modified) (3 diffs)

trunk/pylucid_project/media/PyLucid/internal_page/blog/edit_blog_entry.css

@@ -8 +8 @@
     border: 1px solid #000;
     background-color: #FFF;
+}
+/* -------------------------------------------------------------------------- */
+#blog_preview {
+    background-color: #EEE;
+}
+#blog_preview, #blog_preview legend {
+    border-color: #A00;
 }
 /* -------------------------------------------------------------------------- */

trunk/pylucid_project/media/PyLucid/internal_page/blog/edit_blog_entry.html

@@ +1 @@
+{% if preview_content %}
+<fieldset id="blog_preview">
+<legend><strong>{% trans 'preview' %}</strong></span>
+</legend>
+{{ preview_content }}
+</fieldset>
+{% endif %}
+
 <fieldset><legend>{{ legend }}</legend>
 <form method="post" action=".">
@@ -12 +20 @@
 </ul>
 <input type="submit" name="save" value="{% trans 'save' %}" />
+<input type="submit" name="preview" value="{% trans 'preview' %}" />
 <input onclick="self.location.href='{{ url_abort }}'" name="abort" value="{% trans 'abort' %}" type="reset" />
 </form>

trunk/pylucid_project/PyLucid/plugins_internal/blog/blog.py

@@ -28 +28 @@
 from django.http import HttpResponse
 from django.core.mail import send_mail
-#from django.utils.encoding import force_unicode
 from django.utils.translation import ugettext as _
-#from django import forms
-#from django.forms import ValidationError
-#from django.contrib.syndication.feeds import Feed, FeedDoesNotExist
 
 # from PyLucid
-from PyLucid.tools.utils import escape
+from PyLucid.tools.syndication_feed import FeedFormat, FEED_FORMAT_INFO
+from PyLucid.tools.content_processors import apply_markup
 from PyLucid.system.BasePlugin import PyLucidBasePlugin
 from PyLucid.tools.utils import escape_django_tags
 from PyLucid.system.page_msg import PageMessages
-#from PyLucid.tools.forms_utils import InternalURLField
-from PyLucid.tools.syndication_feed import FeedFormat, FEED_FORMAT_INFO
+from PyLucid.tools.utils import escape
 
 # from blog plugin
@@ -285 +281 @@
         }
 
+        if blog_obj == None: # a new blog entry should be created
+            context["legend"] = _("Create a new blog entry")
+        else:
+            context["legend"] = _("Edit a existing blog entry")
+
         if self.request.method == 'POST':
             form = BlogEntryForm(self.request.POST)
             #self.page_msg(self.request.POST)
-            if form.is_valid():
+            if form.is_valid() and "preview" in self.request.POST:
+                # Do only a preview of the blog content with the markup
+                preview_content = apply_markup(
+                    content   = form.cleaned_data["content"],
+                    context   = self.context,
+                    markup_no = form.cleaned_data["markup"],
+                )
+                context["preview_content"] = preview_content
+            elif form.is_valid():
+                # Save the new/edited blog entry
                 new_tags = form.cleaned_data.pop("new_tags") # ListCharField
 
@@ -324 +334 @@
         else:
             if blog_obj == None:
-                context["legend"] = _("Create a new blog entry")
                 form = BlogEntryForm(
                     initial={"markup": self.preferences["default_markup"],}
                 )
             else:
-                context["legend"] = _("Edit a existing blog entry")
                 form = BlogEntryForm(instance=blog_obj)
 
@@ -487 +495 @@
         Send notify emails.
         """
+        #self.page_msg(self.request.POST)
         content = clean_data["content"]
-
         try:
             mail_title = self._check_comment_submit(blog_entry, content)

trunk/pylucid_project/tests/plugin_admin_blog.py

@@ -37 +37 @@
 # Run test with:
 PAGE_ID = 1
+
+
+BLOG_POST_DATA1 = {
+    u'headline': u'A unittest blog entry', 
+    u'markup': u'6', # Creole
+    u'content': u'The unittest blog content',
+    u'is_public': u'on', 
+    u'new_tags': u'unittest blog tags',
+}
+
 
 class TestPluginBlog(tests.TestCase):
@@ -103 +113 @@
         )
         
+    def test_blog_entry_preview(self):
+        """
+        Test the markup preview
+        """
+        self.login("staff")
+        
+        post_data = {
+            u'headline': u'preview test', 
+            u'markup': u'6', # Creole
+            u'content': u'[[url|title]]\n*list1\n*list2',
+            u'preview': u'preview'
+        }
+        
+        # Create a new blog entry
+        response = self.client.post(self.add_entry_url, post_data)
+        self.failUnlessEqual(response.status_code, 200)
+        self.assertResponse(
+            response,
+            must_contain=(
+                '<p><a href="url">title</a></p>',
+                "<li>list1</li>", "<li>list2</li>",
+                "preview",
+                "Create a new blog entry",
+                "save", "preview", "abort",
+            ),
+            must_not_contain=("Traceback", "Error",),
+        )
+        
     def test_create_new_blog_entry(self):
         """
@@ -110 +148 @@
         """
         self.login("staff")
-         
+        
+        post_data = BLOG_POST_DATA1.copy()
+        post_data.update({u'save': u'save'})
+        
         # Create a new blog entry
-        response = self.client.post(
-            self.add_entry_url,
-            {
-                u'headline': u'A unittest blog entry', 
-                u'markup': u'6', # Creole
-                u'content': u'The unittest blog content',
-                u'is_public': u'on', 
-                u'new_tags': u'unittest blog tags',
-                u'save': u'save',
-            }
-        )
+        response = self.client.post(self.add_entry_url, post_data)
         self.failUnlessEqual(response.status_code, 200)
         self.assertResponse(