Changeset 18

Timestamp:

17/08/04 21:39:57 (4 years ago)

Author:

steve

Message:

elseif

Files:

• trunk/airspeed.py (modified) (6 diffs)
• trunk/airspeed_test.py (modified) (1 diff)

trunk/airspeed.py

@@ -73 +73 @@
-
-class Text(_Element):
-
-
-
+
+
+
+
+
+
+
-
-    def evaluate(self, namespace, stream):
-        stream.write(self.text)
+
-
-
@@ -226 +231 @@
-    def evaluate(self, namespace, stream): pass
-
-
+Directive
-    START = re.compile(r'^#if\b\s*(.*)$', re.S + re.I)
+    START_ELSEIF = re.compile(r'^#elseif\b\s*(.*)$', re.S + re.I)
-    START_ELSE = re.compile(r'^#else(.*)$', re.S + re.I)
-    else_block = Null()
@@ -235 +241 @@
-        self.condition, text = self.next_element(Condition, text)
-        self.block, text = self.next_element(Block, text)
+        self.elseif_conditions = []
+        while True:
+            m = self.START_ELSEIF.match(text)
+            if not m: break
+            text = m.group(1)
+            elseif_condition, text = self.require_next_element(Condition, text, 'condition')
+            elseif_block, text = self.require_next_element(Block, text, 'block')
+            self.elseif_conditions.append((elseif_condition, elseif_block))
-        m = self.START_ELSE.match(text)
-        if m:
-            self.else_block, text = self.require_next_element(Block, m.group(1), 'block')
-
+lse, #elseif or #e
-
-    def evaluate(self, namespace, stream):
@@ -244 +258 @@
-            self.block.evaluate(namespace, stream)
-        else:
+            for elseif, block in self.elseif_conditions:
+                if elseif.calculate(namespace):
+                    block.evaluate(namespace, stream)
+                    return
-            self.else_block.evaluate(namespace, stream)
-
-
-
+Directive
-    START = re.compile(r'^#set\s*\(\s*\$([a-z_][a-z0-9_]*)\s*=\s*(.*)$', re.S + re.I)
-.*)$', re.S
+?:[ \t]*\r?\n)?(.*)$', re.S + re.M
-    def __init__(self, text):
-        ## Could be cleaner b/c syntax error if no '('
@@ -260 +278 @@
-
-
-
+Directive
-    START = re.compile(r'^#foreach\s*\(\s*\$([a-z_][a-z0-9_]*)\s*in\s*(.*)$', re.S + re.I)
-    CLOSING_PATTERN = re.compile(r'^\s*\)(.*)$', re.S)
@@ -298 +316 @@
-        while text:
-            child = None
-, Set, Foreach
+Directive, SetDirective, ForeachDirective
-                try:
-                    child, text = self.next_element(child_type, text)

trunk/airspeed_test.py

@@ -186 +186 @@
-        self.assertEquals("48", template.merge(locals()))
-
+    def test_velocity_style_escaping(self): # example from Velocity docs
+        template = airspeed.Template('''\
+#set( $email = "foo" )
+$email
+\\$email
+\\\\$email
+\\\\\\$email''')
+        self.assertEquals('''\
+foo
+$email
+\\foo
+\\$email''', template.merge({}))
+
+#    def test_velocity_style_escaping_when_var_unset(self): # example from Velocity docs
+#        template = airspeed.Template('''\
+#$email
+#\$email
+#\\$email
+#\\\$email''')
+#        self.assertEquals('''\
+#$email
+#\$email
+#\\$email
+#\\\$email''', template.merge({}))
+
+    def test_true_elseif_evaluated_when_if_is_false(self):
+        template = airspeed.Template('#if ($value1) one #elseif ($value2) two #end')
+        value1, value2 = False, True
+        self.assertEquals(' two ', template.merge(locals()))
+
+    def test_false_elseif_skipped_when_if_is_true(self):
+        template = airspeed.Template('#if ($value1) one #elseif ($value2) two #end')
+        value1, value2 = True, False
+        self.assertEquals(' one ', template.merge(locals()))
+
+    def test_first_true_elseif_evaluated_when_if_is_false(self):
+        template = airspeed.Template('#if ($value1) one #elseif ($value2) two #elseif($value3) three #end')
+        value1, value2, value3 = False, True, True
+        self.assertEquals(' two ', template.merge(locals()))
+
+    def test_illegal_to_have_elseif_after_else(self):
+        template = airspeed.Template('#if ($value1) one #else two #elseif($value3) three #end')
+        self.assertRaises(airspeed.TemplateSyntaxError, template.merge, {})
+
+    def test_else_evaluated_when_if_and_elseif_are_false(self):
+        template = airspeed.Template('#if ($value1) one #elseif ($value2) two #else three #end')
+        value1, value2 = False, False
+        self.assertEquals(' three ', template.merge(locals()))
-#
-# TODO:
-#
-#  Escaped characters in string literals
-#  Directives inside string literals
+#  Math expressions
+#  Gobbling up whitespace (tricky!)
-#  #elseif
-#  Parameterised calls
-#  #parse, #include
-#  #macro
-
-Escaped $, #
+, range literals, list literals
+Comparative operators >=, ==, !=, <=, !
-#  Sub-object assignment:  #set( $customer.Behavior = $primate )
-#  Q. What is scope of #set ($customer.Name = 'john')  ???
-
+  Scope of #set across if/elseif/else?
-
-