Changeset 1034

Timestamp:

2008-05-30 14:24:28 (7 months ago)

Author:

gaspard

Message:

Implemented [set] to define parts/values that can be reused latter in the same scope:
<r:set var='entries_count' do='stat' find='count'/>
...
<r:show var='entries_count'/>
Implemented 'eval' parameter for [set] and [show]:
<r:show eval='entries_count * [d_price]'/>

Files:

• trunk/lib/parser/lib/parser.rb (modified) (4 diffs)
• trunk/lib/parser/lib/rules/zena.rb (modified) (12 diffs)
• trunk/lib/parser/test/parser_test.rb (modified) (3 diffs)
• trunk/test/helpers/zena_parser/basic.yml (modified) (1 diff)
• trunk/test/helpers/zena_parser/errors.yml (modified) (1 diff)

trunk/lib/parser/lib/parser.rb

@@ -282 +282 @@
-  
-  # Return a has of all descendants. Find a specific descendant with descendant['form'] for example.
-
-
+all_
+all_
-      d = {}
-      @blocks.each do |b|
@@ -299 +299 @@
-  end
-  
+  def descendants(key)
+    all_descendants[key] || []
+  end
+  
-  def ancestors
-    @ancestors ||= begin
@@ -309 +313 @@
-  end
-  
-
+all_
-  
-  # Return the last defined parent for the given key.
@@ -325 +329 @@
-  # Return the last defined descendant for the given key.
-  def descendant(key)
-(descendants[key] || []
+descendants(key
-  end
-  

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

@@ -122 +122 @@
-      end
-      @anchor_param = @params[:anchor]
-
+
-      true
-    end
@@ -128 +128 @@
-    def do_method(sym)
-      method = sym
+      pre, post = '', ''
+      
-      if method == :r_unknown
-        if @method =~ /^\[(.*)\]$/
@@ -142 +144 @@
-      if inc && inc.params[:part] == @name
-        @context["#{@name}_method".to_sym] = method_name = get_template_url[1..-1].gsub('/','_')
-=
-=
+<<
+<<
-        @context[:node] = 'node'
-        @context[:list] = 'list'
@@ -174 +176 @@
-      res ||= super(method)
-      
-
-
-
-
-
+
-    end
-    
@@ -195 +193 @@
-    def r_show
-      attribute = @params[:attr] || @params[:tattr]
-
+
+
+
+
+
+
-        attribute_method = "_(#{node_attribute(attribute, :else=>@params[:else])})"
-      elsif @params[:attr]
-
-
-
-
-
+
-      elsif @params[:date]
-        # date can be any attribute v_created_at or updated_at etc.
@@ -237 +236 @@
-      else  
-        return parser_error("missing attribute")
+      end
+      
+      if !@params[:date] && fmt = @params[:format]
+        begin
+          # test argument
+          sprintf(fmt, 123.45)
+        rescue ArgumentError
+          return parser_error("incorect format #{fmt.inspect}")
+        end
+        if fmt =~ /%[\d\.]*f/
+          modifier = ".to_f"
+        elsif fmt =~ /%[\d\.]*i/
+          modifier = ".to_i"
+        else
+          modifier = ''
+        end
+        attribute_method = "sprintf(#{fmt.inspect}, #{attribute_method}#{modifier})"
-      end
-      
@@ -322 +338 @@
-      do_list("@nodes")
-    end
+    
+    
+    def r_set
+      return parser_error("'var' missing") unless var_name = @params[:var]
+      return parser_error("bad value for 'var' (#{var_name.inspect})") unless var_name =~ /^[a-zA-Z_]+$/
+      return '' unless @context[:set]
+      if @params[:value]
+        out "<% set_#{var_name} = #{@params[:value].inspect} -%>"
+      elsif @params[:eval]
+        return unless eval_string = parse_eval_parameter(@params[:eval])
+        out "<% set_#{var_name} = #{eval_string} -%>"
+      else
+        out "<% set_#{var_name} = capture do %>"
+        out expand_with(:set => false) # do not propagate
+        out "<% end -%>"
+      end
+    end
+    
-    
-    # TODO: write a test (please)
@@ -703 +737 @@
-      set_fields = []
-      var_name   = base_class.to_s.underscore
-(descendants['input'] || []) + (descendants['select'] || []
+descendants('input') + descendants('select'
-        set_fields << "#{var_name}[#{tag.params[:name]}]"
-      end
@@ -873 +907 @@
-        add_btn = make(:void, :method=>'add_btn', :params=>@params.dup, :text=>'')
-        add_btn.blocks = blocks
-
+all_
-      end
-      
@@ -1162 +1196 @@
-        return expand_with(:in_if => false)
-      elsif cond == 'false'
-(descendants['else'] || descendants['elsif']
+descendant('else') || descendant('elsif'
-          return expand_with(:in_if=>true, :only=>['else', 'elsif'])
-        else
@@ -2270 +2304 @@
-    end
-    
+    def parse_eval_parameter(str)
+      # evaluate an expression. Can only contain vars, '(', ')', '*', '+', '/', '-', '[attr]'
+      # FIXME: SECURITY (audit this)
+      vars = @context[:vars] || []
+      parts = str.split(/\s+/)
+      res  = []
+      test = []
+      parts.each do |p|
+        if p =~ /\[([\w_]+)\]/
+          test << 1
+          res << (node_attribute($1) + '.to_f')
+        elsif p =~ /^[a-zA-Z_]+$/
+          unless vars.include?(p)
+            out parser_error("var #{p.inspect} not set in eval") 
+            return nil
+          end
+          test << 1
+          res  << "set_#{p}.to_f"
+        elsif ['(', ')', '*', '+', '/', '-'].include?(p)
+          res  << p
+          test << p
+        elsif p =~ /^[0-9\.]+$/
+          res  << p
+          test << p
+        else
+          out parser_error("bad argument #{p.inspect} in eval")
+          return nil
+        end
+      end
+      begin
+        begin
+          eval test.join(' ')
+        rescue
+          # rescue evaluation error
+          out parser_error("error in eval")
+          return nil
+        end
+        "(#{res.join(' ')})"
+      rescue SyntaxError => err
+        # rescue compilation error
+        out parser_error("compilation error in eval")
+        return nil
+      end
+    end
+    
-    def find_stored(klass, key)
-      @context["#{klass}_#{key}"]
@@ -2313 +2392 @@
-    def parser_error(message, tag=@method)
-      "<span class='parser_error'>[#{tag}] #{message}</span>"
+    end
+    
+    def expand_with(acontext={})
+      # set variables
+      context = nil
+      pre = ''
+      @blocks.each do |block|
+        next if block.kind_of?(String) || block.method != 'set'
+        @context[:vars] ||= []
+        context ||= @context.merge(acontext).merge(:set => true)
+        pre << expand_block(block, context)
+        @context[:vars] << block.params[:var]
+      end
+      
+      pre + super
-    end
-  end

trunk/lib/parser/test/parser_test.rb

@@ -96 +96 @@
-  end
-  
+  def test_all_descendants
+    block = @@test_parsers['zafu'].new(
+    "<r:pages><r:each><b do='test'/></r:each><r:add><p><i do='add_link'/><b do='title'/></p></r:add><b do='title'/></r:pages>", 
+    :helper=>ParserModule::DummyHelper.new(@@test_strings['basic']))
+    assert_equal ['add', 'add_link', 'each', 'pages', 'test', 'title'], block.all_descendants.keys.sort
+    assert_equal 2, block.all_descendants['title'].size
+    assert_equal ['add_link', 'title'], block.descendant('add').all_descendants.keys.sort
+  end
+  
-  def test_descendants
-    block = @@test_parsers['zafu'].new(
-    "<r:pages><r:each><b do='test'/></r:each><r:add><p><i do='add_link'/><b do='title'/></p></r:add><b do='title'/></r:pages>", 
-    :helper=>ParserModule::DummyHelper.new(@@test_strings['basic']))
-['add', 'add_link', 'each', 'pages', 'test', 'title'], block.descendants.keys.sort
-2, block.descendants['title'].size
-'add_link', 'title'], block.descendant('add').descendants.keys.sort
+2, block.descendants('title').size
+['test'], block.descendants('each')[0].descendants('test').map {|n| n.method}
+], block.descendants('each')[0].descendants('foo')
-  end
-  
@@ -118 +127 @@
-    "<r:pages><r:each><b do='test'/></r:each><r:add><p><i do='add_link'/><b do='title'/></p></r:add><b do='title'/></r:pages>", 
-    :helper=>ParserModule::DummyHelper.new(@@test_strings['basic']))
-
+all_
-      blocks.each do |b|
-
+all_
-        class << b
-          def public_descendants
@@ -132 +141 @@
-      end
-    end
-
-
+all_
+all_
-  end
-  

trunk/test/helpers/zena_parser/basic.yml

@@ -712 +712 @@
-do_not_set_parent_id_if_form_contains_parent_id:
-  src: "<r:children><r:each do='[name]'/><r:add/><r:form><r:select name='parent_id' nodes='projects in site'/><input name='v_title'/></r:form></r:children>"
-'\s+value='22'
+.\s+value
-
-select_nodes_in_ajax:

trunk/test/helpers/zena_parser/errors.yml

@@ -37 +37 @@
-  src: "<r:date select='<% puts \"mean\" %>'/>"
-  res: "<span class='parser_error'>[date] bad parameter '&lt;% puts \"mean\" %&gt;'</span>"
+
+show_var:
+  src: "<r:show var='boo'/>"
+  tem: "<span class='parser_error'>[show] var \"boo\" not set</span>"
+
+show_bad_sprintf:
+  src: "<p do='show' attr='name' format='%.2f %i hop'/>"
+  res: "<p><span class='parser_error'>[show] incorect format \"%.2f %i hop\"</span></p>"
+
+division_by_zero_in_eval:
+  src: "<r:set var='foo'>134</r:set><r:show eval='foo / 0'/>"
+  res: "<span class='parser_error'>[show] error in eval</span>"
+
+division_by_zero_in_eval_on_runtime:
+  src: "<r:set var='foo'>134</r:set><r:show eval='foo / ( 21 - [id].to_f )'/>"
+  res: "Infinity"
+
+bad_argument_list_in_eval:
+  src: "<r:show eval='3 * / * 5'/>"
+  res: "<span class='parser_error'>[show] compilation error in eval</span>"
+
+nil_value:
+  src: "<r:show eval='4 * [d_bob]'/>"
+  res: "0.0"
+
+mean_eval:
+  src: "<r:show eval='puts \"bad\"'/>"
+  tem: "<span class='parser_error'>[show] var \"puts\" not set in eval</span>"