Changeset 24:a4d4dbf7c524

Timestamp:

07/23/08 10:38:25 (5 years ago)

Author:

Nicolas Evrard <nicoe@…>

Branch:

default

Message:

- Better namespace support

• Fix width/height problem image in for loop
  

• Added tests for draw:image stuffs
  

Location:

relatorio

Files:

• templates/odt.py (modified) (7 diffs)
• tests/one.jpg (added)
• tests/test.odt (modified) (previous)
• tests/test_odt.py (modified) (5 diffs)
• tests/two.png (added)

relatorio/templates/odt.py

@@ -19 +19 @@
 ###############################################################################
 
-__revision__ = "$Id: odt.py 22 2008-07-17 18:21:49Z nicoe $"
+__revision__ = "$Id: odt.py 25 2008-07-23 10:38:25Z nicoe $"
 __metaclass__ = type
 
@@ -33 +33 @@
 from genshi.template import MarkupTemplate
 
-NS = {'text': 'urn:oasis:names:tc:opendocument:xmlns:text:1.0',
-      'table': 'urn:oasis:names:tc:opendocument:xmlns:table:1.0',
-      'draw': 'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0',
-      'xlink': 'http://www.w3.org/1999/xlink',
-      'py': 'http://genshi.edgewall.org/',
-      }
 GENSHI_TAGS = re.compile(r'''<(/)?(for|choose|otherwise|when|if|with)( (\w+)=["'](.*)["']|)>''')
 EXTENSIONS = {'image/png': 'png',
@@ -64 +58 @@
         bitstream.seek(0)
         self.zip.writestr(path, bitstream.read())
-        return {'{%s}href' % NS['xlink']: path}
+        return {'{http://www.w3.org/1999/xlink}href': path}
 
 
 class Template(MarkupTemplate):
+
+    def __init__(self, source, filepath=None, filename=None, loader=None,
+                 encoding=None, lookup='strict', allow_exec=True):
+        self.namespaces = {}
+        super(Template, self).__init__(source, filepath, filename, loader,
+                                       encoding, lookup, allow_exec)
 
     def _parse(self, source, encoding):
@@ -87 +87 @@
         tree = lxml.etree.parse(StringIO(content))
         root = tree.getroot()
+        self.namespaces = root.nsmap.copy()
+        self.namespaces['py'] = 'http://genshi.edgewall.org/'
 
         self._handle_placeholders(tree)
@@ -101 +103 @@
         # further processing.
         genshi_directives, placeholders = [], []
-        for statement in tree.xpath('//text:placeholder', namespaces=NS):
+        for statement in tree.xpath('//text:placeholder',
+                                    namespaces=self.namespaces):
             match_obj = GENSHI_TAGS.match(statement.text)
             if match_obj is not None:
@@ -150 +153 @@
                         break
 
-                genshi_node = lxml.etree.Element('{%s}%s' % (NS['py'],
+                genshi_node = lxml.etree.Element('{%s}%s' % (self.namespaces['py'],
                                                              directive),
                                                  attrib={attr: a_val},
-                                                 nsmap=NS)
+                                                 nsmap=self.namespaces)
                 can_append = False
                 for node in ancestor.iterchildren():
@@ -168 +171 @@
                 ancestor.remove(outermost_c_ancestor)
             else:
-                p.attrib['{%s}replace' % NS['py']] = directive
+                p.attrib['{%s}replace' % self.namespaces['py']] = directive
 
     def _handle_images(self, tree):
-        for draw in tree.xpath('//draw:frame', namespaces=NS):
-            d_name = draw.attrib['{%s}name' % NS['draw']]
+        for draw in tree.xpath('//draw:frame', namespaces=self.namespaces):
+            d_name = draw.attrib['{%s}name' % self.namespaces['draw']]
             if d_name.startswith('image: '):
                 attr_expr = "make_href(%s, '%s')" % (d_name[7:], d_name[7:])
                 attributes = {}
-                attributes['{%s}attrs' % NS['py']] = attr_expr
-                image_node = lxml.etree.Element('{%s}image' % NS['draw'],
+                attributes['{%s}attrs' % self.namespaces['py']] = attr_expr
+                image_node = lxml.etree.Element('{%s}image' % self.namespaces['draw'],
                                                 attrib=attributes,
-                                                nsmap=NS)
+                                                nsmap=self.namespaces)
                 draw.replace(draw[0], image_node)
 

relatorio/tests/test_odt.py

@@ -20 +20 @@
 ###############################################################################
 
-__revision__ = "$Id: test_odt.py 21 2008-07-17 16:46:24Z nicoe $"
+__revision__ = "$Id: test_odt.py 25 2008-07-23 10:38:25Z nicoe $"
 
 import os
@@ -32 +32 @@
 from genshi.template.eval import UndefinedError
 
-from templates.odt import Template, NS
+from templates.odt import Template
 
 def pseudo_gettext(string):
@@ -61 +61 @@
                      'hobbies': [u'Music', u'Dancing', u'DJing'],
                      'animals': [u'Felix da housecat', u'Dog eat Dog'],
+                     'images': [(file(os.path.join(thisdir, 'one.jpg')),
+                                 'image/jpeg'),
+                                (file(os.path.join(thisdir, 'two.png')),
+                                 'image/png')],
                      'footer': u'We sell stuffs'}
 
@@ -71 +75 @@
     def test_directives(self):
         "Testing the directives interpolation"
-        xml = '''<a xmlns="urn:a" xmlns:text="%s">
+        xml = '''<b:a xmlns:b="urn:b" xmlns:text="%s" xmlns:draw="urn:draw">
         <text:placeholder>&lt;foo&gt;</text:placeholder>
-        </a>''' % NS['text']
+        </b:a>''' % 'urn:text'
         parsed = self.oot.add_directives(xml) 
         root = lxml.etree.parse(StringIO(xml)).getroot()
@@ -112 +116 @@
         ok_('We sell stuffs' not in translated_xml)
         ok_('On vend des brols' in translated_xml)
+
+    def test_images(self):
+        "Testing the image replacement directive"
+        stream = self.oot.generate(**self.data)
+        rendered = stream.events.render()
+        content_idx = rendered.find('<?relatorio content.xml?>')
+        tree = lxml.etree.parse(StringIO(rendered[content_idx + 25:]))
+        root = tree.getroot()
+        images = root.xpath('//draw:frame', namespaces=self.oot.namespaces)
+        eq_(len(images), 2)
+        eq_(images[0].attrib['{%s}name' % self.oot.namespaces['draw']],
+            'image: img')
+        eq_(images[0].attrib['{%s}width' % self.oot.namespaces['svg']],
+            '1.732cm')
+        eq_(images[0].attrib['{%s}height' % self.oot.namespaces['svg']],
+            '1.513cm')
+        eq_(images[1].attrib['{%s}width' % self.oot.namespaces['svg']],
+            '1.732cm')
+        eq_(images[1].attrib['{%s}height' % self.oot.namespaces['svg']],
+            '1.513cm')