[kupu-checkins] r35812 - in kupu/trunk/kupu/plone: . tests/input tests/output

[duncan at codespeak.net]

Author: duncan
Date: Fri Dec 15 17:18:07 2006
New Revision: 35812

Modified:
   kupu/trunk/kupu/plone/html2captioned.py
   kupu/trunk/kupu/plone/tests/input/simple.in
   kupu/trunk/kupu/plone/tests/output/simple.out
Log:
Transform patterns weren't allowing for newlines inside tags.

Modified: kupu/trunk/kupu/plone/html2captioned.py
==============================================================================
--- kupu/trunk/kupu/plone/html2captioned.py	(original)
+++ kupu/trunk/kupu/plone/html2captioned.py	Fri Dec 15 17:18:07 2006
@@ -43,7 +43,7 @@
      | width%s
      | .
      )*\>
-    )''' % (ATTR_CLASS, ATTR_WIDTH), re.VERBOSE)
+    )''' % (ATTR_CLASS, ATTR_WIDTH), re.VERBOSE | re.IGNORECASE | re.DOTALL)
 
 CLASS_PATTERN = re.compile('\s*class=("[^"]*captioned[^"]*"|[^" \/>]+)')
 ALT_PATTERN = re.compile('\\balt=("[^"]*"|[^" \/>]+)')
@@ -59,7 +59,7 @@
 </div>
 '''
 
-UID_PATTERN = re.compile('(?P<tag><(?:a|img) [^>]*(?:src|href)=")(?P<url>[^"]*resolveuid/(?P<uid>[^/"#? ]*))')
+UID_PATTERN = re.compile('(?P<tag><(?:a|img)\\s[^>]*(?:src|href)=")(?P<url>[^"]*resolveuid/(?P<uid>[^/"#? ]*))', re.DOTALL | re.IGNORECASE)
 
 class HTMLToCaptioned:
     """Transform which adds captions to images embedded in HTML"""

Modified: kupu/trunk/kupu/plone/tests/input/simple.in
==============================================================================
--- kupu/trunk/kupu/plone/tests/input/simple.in	(original)
+++ kupu/trunk/kupu/plone/tests/input/simple.in	Fri Dec 15 17:18:07 2006
@@ -1,3 +1,5 @@
 <div>Simple text containing an embedded image</div>
 <p><img class="image-left captioned" height="144" alt="picture alt text" src="resolveuid/104ede98d4c7c8eaeaa3b984f7395979" width="120"/></p>
 <p><img class="image-left captioned" height="144" alt="picture alt text" src="resolveuid/104ede98d4c7c8eaeaa3b984f7395979/image_thumb" width="120"/></p>
+<p><img class="image-left captioned"
+ height="144" alt="picture alt text" src="resolveuid/104ede98d4c7c8eaeaa3b984f7395979/image_thumb" width="120"/></p>

Modified: kupu/trunk/kupu/plone/tests/output/simple.out
==============================================================================
--- kupu/trunk/kupu/plone/tests/output/simple.out	(original)
+++ kupu/trunk/kupu/plone/tests/output/simple.out	Fri Dec 15 17:18:07 2006
@@ -9,3 +9,8 @@
   </div>
   <div class="image-caption">Test image caption</div>
 </div>
+<div class="image-left captioned" style="width:120px;">
+  <div style="width:120px;"><img height="144" src="[url for 104ede98d4c7c8eaeaa3b984f7395979]/image_thumb" width="120" alt="image 104ede98d4c7c8eaeaa3b984f7395979"/>
+  </div>
+  <div class="image-caption">Test image caption</div>
+</div>