Ticket #115: genshi-textinclude.diff

genshi/template/directives.py

@@ -24 +24 @@
 __all__ = ['AttrsDirective', 'ChooseDirective', 'ContentDirective',
            'DefDirective', 'ForDirective', 'IfDirective', 'MatchDirective',
            'OtherwiseDirective', 'ReplaceDirective', 'StripDirective',
-           'WhenDirective', 'WithDirective']
+           'WhenDirective', 'WithDirective', 'IncludeDirective']
 __docformat__ = 'restructuredtext en'
 
 
@@ -676 +676 @@
 
     def __repr__(self):
         return '<%s>' % (self.__class__.__name__)
+
+
+class IncludeDirective(Directive):
+    """Implementation of the #include template directive for including
+    template output."""
+    __slots__ = ['include_ref', 'relative_to', 'loader']
+
+    def __init__(self, value, template, namespaces=None, lineno=-1, offset=-1):
+        Directive.__init__(self, None, template, namespaces, lineno, offset)
+        self.include_ref = value
+        self.relative_to = template.filepath
+        self.loader = template.loader
+        
+    def __call__(self, stream, ctxt, directives):
+        import genshi.template.text
+        template = self.loader.load(self.include_ref,
+                                    relative_to=self.relative_to,
+                                    cls=genshi.template.text.TextTemplate)
+        
+        return _apply_directives(template.generate(ctxt),
+                                 ctxt, directives)
+    def __repr__(self):
+        return '<%s "%s">' % (self.__class__.__name__, self.include_ref)

genshi/template/tests/text.py

@@ -13 +13 @@
 
 import doctest
 import unittest
+import shutil
+import os
+import tempfile
 
 from genshi.template.text import TextTemplate
-
+from genshi.template.loader import TemplateLoader
 
 class TextTemplateTestCase(unittest.TestCase):
     """Tests for text template processing."""
 
+    def setUp(self):
+        self.dirname = tempfile.mkdtemp(suffix='markup_test')
+
+    def tearDown(self):
+        shutil.rmtree(self.dirname)
+
     def test_escaping(self):
         tmpl = TextTemplate('\\#escaped')
         self.assertEqual('#escaped', str(tmpl.generate()))
@@ -74 +83 @@
 
 """, tmpl.generate(items=range(3)).render('text'))
 
-
+    def test_include(self):
+        file1 = open(os.path.join(self.dirname, 'tmpl1.txt'), 'w')
+        try:
+            file1.write("Included\n")
+        finally:
+            file1.close()
+
+        file2 = open(os.path.join(self.dirname, 'tmpl2.txt'), 'w')
+        try:
+            file2.write("""----- Included data below this line -----
+            #include tmpl1.txt
+            ----- Included data above this line -----""")
+        finally:
+            file2.close()
+
+        loader = TemplateLoader([self.dirname])
+        tmpl = loader.load('tmpl2.txt', cls=TextTemplate)
+        self.assertEqual("""----- Included data below this line -----
+Included
+            ----- Included data above this line -----""",
+                         tmpl.generate().render())
+        
 def suite():
     suite = unittest.TestSuite()
     suite.addTest(doctest.DocTestSuite(TextTemplate.__module__))

genshi/template/text.py

@@ -95 +95 @@
                     substream = stream[start_offset:]
                     stream[start_offset:] = [(SUB, ([directive], substream),
                                               (self.filepath, lineno, 0))]
+            elif command == 'include':
+                pos = (self.filename, lineno, 0)
+                directive = IncludeDirective, value.strip(), None, pos
+                stream.append((SUB, ([directive], []), pos))
             elif command != '#':
                 cls = self._dir_by_name.get(command)
                 if cls is None: