Changeset 1761

Timestamp:

09/11/08 11:38:30 (2 months ago)

Author:

JensDiemer

Message:

-patch the creole markup, so it don't clashes with django template tags.
-Add a unitest and merge some parts from the tinxTextile markup test.

Location:

trunk/pylucid_project

Files:

• media/PyLucid/internal_page/page_admin/markup_help_creole.html (modified) (1 diff)
• PyLucid/system/markups/creole.py (modified) (1 diff)
• PyLucid/system/markups/creole2html.py (modified) (2 diffs)
• tests/markup_creole.py (added)
• tests/markup_tinyTextile.py (moved) (moved from trunk/pylucid_project/tests/test_tinyTextile.py) (6 diffs)
• tests/utils/unittest_addons.py (added)

trunk/pylucid_project/media/PyLucid/internal_page/page_admin/markup_help_creole.html

@@ -15 +15 @@
 <hr />
 
+<p>Please note:<br />
+The Creole <b>image tag is more strict than the original</b>,
+because it should not match on django template tags!<br />
+It matches only if...
+</p>
+<ol>
+    <li>...image target ends with a picture extention</li>
+    <li>...separator &gt;|&lt; and the image text exist</li>
+</ol>
+
+
+<hr />
+
 <h2 class="noanchor">Usefull links:</h2>
 <ul id="links">

trunk/pylucid_project/PyLucid/system/markups/creole.py

@@ -44 +44 @@
             ]]
         )'''
+
+    #--------------------------------------------------------------------------    
+    # PyLucid Patch:
+    # The image rule should not match on django template tags! So we make it
+    # more restricted.
+    # It matches only if...
+    # ...image target ends with a picture extention
+    # ...separator >|< and the image text exist
     image = r'''(?P<image>
             {{
-            (?P<image_target>.+?) \s*
-            ([|] \s* (?P<image_text>.+?) \s*)?
+            (?P<image_target>.+?\.jpg|\.jpeg|\.gif|\.png) \s*
+            (\| \s* (?P<image_text>.+?) \s*)?
             }}
-        )'''
+        )(?i)'''
+    #--------------------------------------------------------------------------
+
     macro = r'''(?P<macro>
             <<

trunk/pylucid_project/PyLucid/system/markups/creole2html.py

@@ -184 +184 @@
 
 if __name__=="__main__":
-    #~ import sys
-    #~ document = Parser(unicode(sys.stdin.read(), 'utf-8', 'ignore')).parse()
-    #~ sys.stdout.write(HtmlEmitter(document).emit().encode('utf-8', 'ignore'))
-
     """
     http://code.google.com/p/creoleparser/source/browse/trunk/creoleparser/tests.py
@@ -194 +190 @@
     http://djikiki.googlecode.com/svn/trunk/djikiki/creole/
     """
-
-    test1 = u"""
-== Textauszeichnung
-
-Das ist **fett** und //kursiv//.
-Und noch eine Zeile...
-
-== Links
-
-Ein [[Interner Link ]] und ein normaler Link:
-[[http://domain.tld/page/| Link Text]]
-
-----
-
-Bilder mit {{Image.jpg|Ein Bild}} toll.
-
-Eine Liste:
- * eins
- * zwei
- ** drei
- ### Nummer 1
- ### Nummer 2
-
-== Tabelle
-
-  |= Item|= Size|= Price |
-  | fish | **big**  |cheap   |
-  | crab | small|expesive|
-
-  |= Item|= Size|= Price
-  | fish | big  |//cheap//
-  | crab | small|**very\\expesive**
-
-== preformatted
-
-{{{
-== [[NoWiki]]:
-//**don't** format//
-
-Good work!
-}}}"""
-
-
-    test2 = u"""= Top-level heading (1)
-== This a test for creole 0.1 (2)
-=== This is a Subheading (3)
-==== Subsub (4)
-===== Subsubsub (5)
-
-The ending equal signs should not be displayed:
-
-= Top-level heading (1) =
-== This a test for creole 0.1 (2) ==
-=== This is a Subheading (3) ===
-==== Subsub (4) ====
-===== Subsubsub (5) =====
-
-
-You can make things **bold** or //italic// or **//both//** or //**both**//.
-
-Character formatting extends across line breaks: **bold,
-this is still bold. This line deliberately does not end in star-star.
-
-Not bold. Character formatting does not cross paragraph boundaries.
-
-You can use [[internal links]] or [[http://www.wikicreole.org|external links]],
-give the link a [[internal links|different]] name.
-
-Here's another sentence: This wisdom is taken from [[Ward Cunningham's]]
-[[http://www.c2.com/doc/wikisym/WikiSym2006.pdf|Presentation at the Wikisym 06]].
-
-Here's a external link without a description: [[http://www.wikicreole.org]]
-
-Be careful that italic links are rendered properly:  //[[http://my.book.example/|My Book Title]]// 
-
-Free links without braces should be rendered as well, like http://www.wikicreole.org/ and http://www.wikicreole.org/users/~example. 
-
-Creole1.0 specifies that http://bar and ftp://bar should not render italic,
-something like foo://bar should render as italic.
-
-You can use this to draw a line to separate the page:
-----
-
-You can use lists, start it at the first column for now, please...
-
-unnumbered lists are like
-* item a
-* item b
-* **bold item c**
-
-blank space is also permitted before lists like:
-  *   item a
- * item b
-* item c
- ** item c.a
-
-or you can number them
-# [[item 1]]
-# item 2
-# // italic item 3 //
-    ## item 3.1
-  ## item 3.2
-
-up to five levels
-* 1
-** 2
-*** 3
-**** 4
-***** 5
-
-* You can have
-multiline list items
-* this is a second multiline
-list item
-
-You can use nowiki syntax if you would like do stuff like this:
-
-{{{
-Guitar Chord C:
-
-||---|---|---|
-||-0-|---|---|
-||---|---|---|
-||---|-0-|---|
-||---|---|-0-|
-||---|---|---|
-}}}
-
-Note: if you look at the source code of the above, you see the escape char (tilde, ~ )
-being used to escape the closing triple curly braces. This is to do nowiki nesting in this
-wiki which doesn't follow Creole 1.0 yet (closing triple curly braces should be indented
-by one space).
-
-You can also use it inline nowiki {{{ in a sentence }}} like this.
-
-!!! Escapes 
-Normal Link: http://wikicreole.org/ - now same link, but escaped: ~http://wikicreole.org/ 
-
-Normal asterisks: ~**not bold~**
-
-a tilde alone: ~
-
-a tilde escapes itself: ~~xxx
-
-!! Creole 0.2 
-
-This should be a flower with the ALT text "this is a flower" if your wiki supports ALT text on images:
-
-[{ImagePro src='Red-Flower.jpg' caption='here is a red flower' }]
-
-!! Creole 0.4 
-
-Tables are done like this:
-
-||header col1||header col2
-|col1|col2
-|you         |can         
-|also        |align\\ it. 
-
-You can format an address by simply forcing linebreaks:
-
-My contact dates:\\
-Pone: xyz\\
-Fax: +45\\
-Mobile: abc
-
-!! Creole 0.5 
-
-|| Header title               || Another header title     
-| {{{ //not italic text// }}} | {{{ **not bold text** }}} 
-| ''italic text''             | __  bold text __          
-
-!! Creole 1.0 
-
-If interwiki links are setup in your wiki, this links to the WikiCreole page about Creole 1.0 test cases: [WikiCreole:Creole1.0TestCases].
+    
+    txt = """
+== Headline
+
+This is **bold**...
+Wow...
+
+The current page name: >{{ PAGE.name }}< great?
+Some {% lucidTag page_update_list count=10 %} text.
+
+a [[www.google.de|Google]] link
+a ((/image.jpg|My Image)) image
+a {{/image.jpg|My Image}} image
+
+no image: {{ foo|bar }}!
+A picture [[http://google.com | {{ campfire.JPG | campfire.jpg }} ]] as a link.
 
 """
 
-    document = Parser(test2).parse()
+    document = Parser(txt).parse()
     print HtmlEmitter(document).emit()
-
-

trunk/pylucid_project/tests/markup_tinyTextile.py

@@ -17 +17 @@
 """
 
-import sys, re, difflib, unittest, traceback
+import sys, re, unittest
 
 import tests
 from tests.utils.FakeRequest import get_fake_context
+from tests.utils import unittest_addons
 
 from PyLucid.system.markups.tinyTextile import TinyTextileParser
@@ -36 +37 @@
 VERBOSE = 2
 
+unittest_addons.VERBOSE = VERBOSE
 
 #_____________________________________________________________________________
@@ -41 +43 @@
 
 
-class textileFailure(Exception):
-    """
-    Special error class: Try to display markup errors in a better way.
-    """
-    def _format_output(self, txt):
-        txt = txt.split("\\n")
-        if VERBOSE == 1:
-            txt = "".join(['%s\\n\n' % i for i in txt])
-        elif VERBOSE == 2:
-            txt = "".join(['%s\n' % i for i in txt])
-        return txt
-
-    def _diff(self, block1, block2):
-        d = difflib.Differ()
-
-        block1 = block1.replace("\\n", "\\n\n").split("\n")
-        block2 = block2.replace("\\n", "\\n\n").split("\n")
-
-        diff = d.compare(block1, block2)
-
-        result = ["%2s %s\n" % (line, i) for line, i in enumerate(diff)]
-        return "".join(result)
-
-    def __str__(self):
-        try:
-            msg = self.args[0]
-
-            # strip ' out
-            if msg.startswith("u'"):
-                msg = msg[2:-1]
-            else:
-                msg = msg[1:-1]
-
-            try:
-                block1, block2 = msg.split("' != '")
-            except ValueError:
-                msg = self._format_output(msg)
-                return (
-                    "Format error in output\n"
-                    "Info:\n%s"
-                ) % msg
-
-            #~ block1 = block1.rstrip("\\n")
-            #~ block2 = block2.rstrip("\\n")
-            diff = self._diff(block1, block2)
-
-            block1 = self._format_output(block1)
-            block2 = self._format_output(block2)
-
-            return (
-                "\n\n---[Output:]---\n%s\n"
-                "---[not equal to:]---\n%s"
-                "\n---[diff:]---\n%s"
-            ) % (block1, block2, diff)
-        except:
-            etype, value, tb = sys.exc_info()
-            msg = traceback.format_exc(tb)
-            return msg
-
-
-#_____________________________________________________________________________
-
-
-
-class tinyTextileTest(unittest.TestCase):
-
-    # Use the own error class from above
-    failureException = textileFailure
+class tinyTextileTest(unittest_addons.MarkupTest):
 
     def setUp(self):
@@ -118 +53 @@
         """ delete the out buffer """
         self.out.data = []
-
-    #_________________________________________________________________________
-
-    def _prepare_text(self, txt):
-        """
-        prepare the multiline, indentation text.
-        """
-        txt = txt.splitlines()
-        assert txt[0]=="", "First must be empty!"
-        txt = txt[1:] # Skip the first line
-
-        # get the indentation level from the first line
-        count = False
-        for count, char in enumerate(txt[0]):
-            if char!=" ":
-                break
-
-        assert count != False, "second line is empty!"
-
-        # remove indentation from all lines
-        txt = [i[count:] for i in txt]
-
-        #~ txt = re.sub("\n {2,}", "\n", txt)
-        txt = "\n".join(txt)
-
-        # strip *one* newline at the begining...
-        if txt.startswith("\n"): txt = txt[1:]
-        # and strip *one* newline at the end of the text
-        if txt.endswith("\n"): txt = txt[:-1]
-        #~ print repr(txt)
-        #~ print "-"*79
-        return txt
 
     #_________________________________________________________________________
@@ -198 +101 @@
     #_________________________________________________________________________
 
-    def testSelf(self):
-        out1 = self._prepare_text("""
-            one line
-            line two""")
-        self.assertEqual(out1, "one line\nline two")
-
-        out2 = self._prepare_text("""
-            one line
-            line two
-        """)
-        self.assertEqual(out2, "one line\nline two")
-
-        out3 = self._prepare_text("""
-            one line
-
-            line two
-        """)
-        self.assertEqual(out3, "one line\n\nline two")
-
-        out4 = self._prepare_text("""
-            one line
-                line two
-
-        """)
-        self.assertEqual(out4, "one line\n    line two\n")
-
-        out5 = self._prepare_text("""
-            one line
-                line two
-            dritte Zeile
-        """)
-        self.assertEqual(out5, "one line\n    line two\ndritte Zeile")
-
-    #_________________________________________________________________________
-
     def testTextile_text1(self):
         out_string = self._parse("text")
@@ -239 +107 @@
     def testTextile_text2(self):
         self.assertTinyTextile(r"""
-            two lines\\in one line
-        """, """
-            <p>two lines<br />in one line</p>\n
+            Force\\linebreak
+        """, """
+            <p>Force<br />linebreak</p>\n
         """)