Changeset 1187

Timestamp:

2008-09-23 16:27:36 (4 months ago)

Author:

gaspard

Message:

commit b9b31762052b0cef2a98b665ad04ac197bf1fa55
Author: Gaspard Bucher <gaspard@teti.ch>

Enabled variables defined by [set] in test conditions.

Files:

• trunk/lib/parser/lib/rules/zena.rb (modified) (4 diffs)
• trunk/test/helpers/zena_parser/eval.yml (modified) (1 diff)

trunk/lib/parser/lib/rules/zena.rb

@@ -141 +141 @@
-        # do='[text]
-        @method = 'show'
-var_or_attr
+attr_or_date
-      elsif @method =~ /^\{(.*)\}$/
-        # do='{v_text}'
@@ -258 +258 @@
-
-    def r_show
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-        end
-      end
@@ -2729 +2727 @@
-    
-    def node_attribute(str, opts={})
+      if @context[:vars] && @context[:vars].include?(str)
+        return "set_#{str}"
+      end
+      
-      return "(params[:s] || @node[:zip]).to_i" if str == 'start.id'
-      attribute, att_node, klass = get_attribute_and_node(str)
@@ -2734 +2736 @@
-      return "params[:#{$1}]" if attribute =~ /^param:(\w+)$/
-      return current_date if attribute == 'current_date'
+      
-      
-      att_node  ||= opts[:node]       || node

trunk/test/helpers/zena_parser/eval.yml

@@ -46 +46 @@
-  src: "<r:set var='name'>12345</r:set><b do='[name]'/>"
-  res: "<b>12345</b>"
+
+test_var:
+  src: "<r:set var='hours'>3</r:set><r:if test='hours gt 0'>you have: <r:show attr='hours'/></r:if>"
+  res: "you have: 3"