Changeset 13

Timestamp:

13/08/04 14:00:26 (4 years ago)

Author:

steve

Message:

Template.merge_to(namespace, fileobj)

Files:

• trunk/airspeed.py (modified) (4 diffs)
• trunk/airspeed_test.py (modified) (2 diffs)

trunk/airspeed.py

@@ -6 +6 @@
-
-class TemplateSyntaxError(Exception): pass
+
+
+"""
+VARIABLE_NAME   ->   '[a-zA-Z]+'
+TEXT            ->   '(?:[^\$#\\]|\\\\|\\\$|\\#)+'
+TEMPLATE        ->   BLOCK
+BLOCK           ->   TEXT
+                   | PLACEHOLDER
+                   | IF_DIRECTIVE
+                   | BLOCK_DIRECTIVE
+REFERENCE        ->  '\$'  VARIABLE_VALUE
+SILENT_REFERENCE ->  '\$!' VARIABLE_VALUE
+VARIABLE_VALUE   ->  VARIABLE_NAME
+                   | VARIABLE_NAME '\.' VARIABLE_VALUE
+
+
+"""
+
+
-
-class Tokeniser:
@@ -16 +35 @@
-    RE_FLAGS = re.IGNORECASE + re.DOTALL + re.MULTILINE
-    EXPRESSION = '(' + NAME_OR_CALL + '(?:\.' + NAME_OR_CALL + ')*)'
+    STRING_LITERAL = "'(?:\\\\|\\'|\\n|\\b|\\t)'"
-    PLACEHOLDER_PATTERN = re.compile('^\$(!?)({?)' + EXPRESSION + '(}?)' + REST, RE_FLAGS)
-    SET_PATTERN = re.compile('^#set[ \t]*\([ \t]*\$(' + NAME + ')[ \t]*=[ \t]*(\d+|"[^"]+")[ \t]*\)' + REST, RE_FLAGS)
@@ -218 +238 @@
-
-    def merge(self, namespace):
+        output = StringIO.StringIO()
+        self.merge_to(namespace, output)
+        return output.getvalue()
+
+    def merge_to(self, namespace, fileobj):
-        output = []
-        if not self.evaluator:
@@ -223 +248 @@
-            for token_type, token_value in Tokeniser().tokenise(self.content):
-                self.evaluator.feed(token_type, token_value)
-
-
-
-
+

trunk/airspeed_test.py

@@ -25 +25 @@
-    def test_silent_substitution_for_unmatched_values(self):
-        template = airspeed.Template("Hello $!name")
+        self.assertEquals("Hello world", template.merge({"name": "world"}))
-        self.assertEquals("Hello ", template.merge({}))
-        self.assertEquals("Hello world", template.merge({"name": "world"}))
-
-    def test_embed_substitution_value_in_braces_gets_handled(self):
@@ -139 +139 @@
-        self.assertEquals("Stuff and more stuff", template.merge({}))
-
+    def test_merge_to_stream(self):
+        template = airspeed.Template('Hello $name!')
+        from cStringIO import StringIO
+        output = StringIO()
+        template.merge_to({"name": "Chris"}, output)
+        self.assertEquals('Hello Chris!', output.getvalue())
+
+#    def test_else_block_evaluated_if_if_expression_false(self):
+#        template = airspeed.Template('#if ($value) true #else false #end')
+#        self.assertEquals(" false ", template.merge({}))
+
+
+#
+# TODO:
+#
+#  Escaped characters in string literals
+#  Directives inside string literals
+#  #else, #elseif
+#  Parameterised calls
+#  #parse, #include
+#  #macro
+#  map literals
+#  Escaped $, #
+#  Sub-object assignment:  #set( $customer.Behavior = $primate )
+#
+
+
-if __name__ == '__main__':
-    reload(airspeed)