fabulator 0.0.5 → 0.0.6

data/History.txt

@@ -1,4 +1,12 @@
-=== 0.0.5
+=== 0.0.6 2010-08-27
+
+* 4 minor enhancement:
+  * Better regex for matching quoted strings in expressions
+  * Less duplication of compile-time contexts
+  * Template add_caption call can take a hash or a node context
+  * set_value can take a node as a source instead of only an expression
+
+=== 0.0.5 2010-08-18
 
 * 2 major enhancements:
   * unified predicate execution so numeric indexes and boolean logic

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/features/step_definitions/expression_steps.rb

@@ -71,7 +71,8 @@ Then /I should get the type (.*)/ do |t|
 end
 
 Then /I should get (\d+) items?/ do |count|
-  @result.length.should == count
+  #puts "result types: #{@result.collect{|r| r.class.name}.join(', ')}"
+  @result.size.should == count
 end
 
 Then /item (\d+) should be (\[.*\])/ do |i,t|

data/lib/fabulator/action_lib.rb

@@ -175,13 +175,13 @@ module Fabulator
             end
           end
         end
-        common = d1.keys & d2.keys
-        if ordered && common.include?(t2.join(''))
-          return d1[t2.join('')]
-        elsif !common.empty?
-          return d1[common.sort_by{ |c| d1[c][:w] * d2[c][:w] / d1[c][:path].size / d2[c][:path].size }.reverse.first]
-        end
+        r = self._select_type_path(d1, d2, t2, ordered)
+        return r unless r.nil?
       end
+      return self._select_type_path(d1, d2, t2, ordered)
+    end
+
+    def self._select_type_path(d1, d2, t2, ordered)
       common = d1.keys & d2.keys
       if ordered && common.include?(t2.join(''))
         return d1[t2.join('')]
@@ -205,7 +205,7 @@ module Fabulator
 
     def compile_action(e, c)
       if self.class.method_defined? "action:#{e.name}"
-        send "action:#{e.name}", e, c.merge(e)
+        send "action:#{e.name}", e, c   #.merge(e)
       end
     end
 

data/lib/fabulator/core/constraint.rb

@@ -66,8 +66,7 @@ module Fabulator
             return sense.call(paths) if select.nil?
             opts = @select.run(ctx).collect { |o| o.to_s } 
             if !opts.include?(ctx.root.to_s)
-              paths[0] -= [ ctx.root.path ]
-              paths[1] += [ ctx.root.path ]
+              invalidate_path(paths, ctx.root)
             end
             return sense.call(paths)
           when 'all':
@@ -94,8 +93,7 @@ module Fabulator
                 end
               end
               if !calc_values.include?(ctx.root.value)
-                paths[0] -= [ ctx.root.path ]
-                paths[1] += [ ctx.root.path ]
+                invalidate_path(paths, ctx.root)
               end
               return sense.call(paths)
             end
@@ -103,8 +101,7 @@ module Fabulator
             fl = (@params['floor'].run(ctx) rescue nil)
             ce = (@params['ceiling'].run(ctx) rescue nil)
             if !fl.nil? && fl > c.value || !ce.nil? && ce < c.value
-              paths[0] -= [ c.path ]
-              paths[1] += [ c.path ]
+              invalidate_path(paths, c)
             end
             return sense.call(r)
           else
@@ -112,6 +109,13 @@ module Fabulator
         end
       end
     end
+
+  protected
+
+    def invalidate_path(paths, root)
+      paths[0] -= [ root.path ]
+      paths[1] += [ root.path ]
+    end
   end
   end
 end

data/lib/fabulator/core/group.rb

@@ -1,7 +1,7 @@
 module Fabulator
   module Core
   class Group < Fabulator::Action
-    attr_accessor :name, :params, :tags
+    attr_accessor :name, :params, :tags, :required_params
 
     namespace Fabulator::FAB_NS
 
@@ -91,33 +91,6 @@ module Fabulator
       end
       ret
     end
-
-    def test_constraints(context)
-      passed = [ ]
-      failed = [ ]
-      @context.with(context) do |ctx|
-        roots = self.get_context(ctx)
-        roots.each do |root|
-          @params.each do |param|
-            p_ctx = param.get_context(ctx.with_root(root))
-            if !p_ctx.nil? && !p_ctx.empty?
-              p_ctx.each do |p|
-                @constraints.each do |c|
-                  r = c.test_constraint(ctx.with_root(p))
-                  passed += r[0]
-                  failed += r[1]
-                end
-              end
-            end
-          end
-        end
-      end
-      if failed.empty?
-        return [ passed.uniq, [] ]
-      else
-        return [ (passed - failed).uniq, failed ]
-      end
-    end
   end
   end
 end

data/lib/fabulator/core/parameter.rb

@@ -16,6 +16,10 @@ module Fabulator
       [ @name ]
     end
 
+    def names
+      [ @name ]
+    end
+
     def compile_xml(xml, context)
       super
 
@@ -101,28 +105,6 @@ module Fabulator
       return res
     end
 
-    def test_constraints(context)
-      @context.with(context) do |ctx|
-        me = ctx.traverse_path(@name)
-        return [ [ me.collect{ |m| m.path } ], [] ] if @constraints.empty?
-        paths = [ [], [] ]
-        if @all_constraints
-          @constraints.each do |c|
-            p =  c.test_constraints(ctx, me)
-            paths[0] += p[0]
-            paths[1] += p[1]
-          end
-          return [ (paths[0] - paths[1]).uniq, paths[1].uniq ]
-        else
-          @constraints.each do |c|
-            p = c.test_constraints(ctx, me)
-            paths[0] += p[0]
-            paths[1] += p[1]
-          end
-          return [ paths[0].uniq, (paths[1] - paths[0]).uniq ]
-        end
-      end
-    end
   end
   end
 end

data/lib/fabulator/core/transition.rb

@@ -39,28 +39,7 @@ module Fabulator
         case e.name
 # TODO: handle parameters when inheriting
           when 'params':
-            p_ctx = @context.merge(e)
-            @select = p_ctx.get_select('/')
-
-            e.each_element do |ee|
-              next unless ee.namespaces.namespace.href == FAB_NS
-              case ee.name
-                when 'group':
-                  if !inheriting
-                    g = Group.new.compile_xml(ee, p_ctx)
-                    @params << g
-                  else
-                    tags = (ee.attributes.get_attribute_ns(FAB_NS, 'tag').value rescue '').split(/\s+/)
-                  end
-                when 'param':
-                  if !inheriting
-                    p = Parameter.new.compile_xml(ee, p_ctx)
-                    @params << p
-                  else
-                    tags = (ee.attributes.get_attribute_ns(FAB_NS, 'tag').value rescue '').split(/\s+/)
-                  end
-              end
-            end
+            @params << Group.new.compile_xml(e, @context)
         end
       end
       self
@@ -126,10 +105,10 @@ module Fabulator
         res[:valid].delete(k)
       end
 
-      res[:score] = (res[:valid].size+1)*(params.size)
-      res[:score] = res[:score] / (res[:missing].size + 1)
-      res[:score] = res[:score] / (res[:invalid].size + 1)
-      res[:score] = res[:score] / (res[:unknown].size + 1)
+      res[:score] = (res[:valid].size+1)*(params.size) /
+                    (res[:missing].size + 1) /
+                    (res[:invalid].size + 1) /
+                    (res[:unknown].size + 1)
       return res
     end
 

data/lib/fabulator/expr/context.rb

@@ -239,17 +239,18 @@ module Fabulator
       v = parser.parse(v,self) if v.is_a?(String)
     end
         
-    return [] if p.nil?
-        
+    #return [] if p.nil?
+    p = [ self.root ] if p.nil?
+
     p = [ p ] unless p.is_a?(Array)
           
     ret = [ ]
 
     p.each do |pp|
-      tgts = pp.run(self, true)
+      tgts = pp.is_a?(Fabulator::Expr::Node) ? [ pp ] : pp.run(self, true)
       src = nil
       if !v.nil?
-        src = v.run(self)
+        src = v.is_a?(Fabulator::Expr::Node) ? [ v ] : v.run(self)
       end 
 
       tgts.each do |tgt|
@@ -305,7 +306,9 @@ module Fabulator
     else
       root_context = root_context.first
     end
-    if d.is_a?(Array)
+    if d.is_a?(Fabulator::Expr::Node)
+      self.set_value(p, d)
+    elsif d.is_a?(Array)
       node_name = root_context.name
       root_context = root_context.parent
       # get rid of empty children so we don't have problems later
@@ -322,7 +325,7 @@ module Fabulator
       d.each_pair do |k,v|
         bits = k.split('.')
         c = self.with_root(root_context).traverse_path(bits,true).first
-        if v.is_a?(Hash) || v.is_a?(Array)
+        if v.is_a?(Hash) || v.is_a?(Array) || v.is_a?(Fabulator::Expr::Node)
           self.with_root(c).merge_data(v)
         else
           c.value = v

data/lib/fabulator/expr/node.rb

@@ -84,59 +84,6 @@ module Fabulator
         node
       end
 
-      def merge_data(d,p = nil)
-        # we have a hash or array based on root (r)
-        if p.nil?
-          root_context = [ self ]
-        else
-          root_context = self.traverse_path(p,true)
-        end
-        if root_context.size > 1
-          # see if we need to prune
-          new_rc = [ ]
-          root_context.each do |c|
-            if c.children.size == 0 && c.value.nil?
-              c.parent.prune(c) if c.parent
-            else
-              new_rc << c
-            end
-          end
-          if new_rc.size > 0
-            raise "Unable to merge data into multiple places simultaneously"
-          else
-            root_context = new_rc
-          end
-        else
-          root_context = root_context.first
-        end
-        if d.is_a?(Array)
-          node_name = root_context.name
-          root_context = root_context.parent
-          # get rid of empty children so we don't have problems later
-          root_context.children.each do |c|
-            if c.children.size == 0 && c.name == node_name && c.value.nil?
-              c.parent.prune(c)
-            end
-          end
-          d.each do |i|
-            c = root_context.create_child(node_name)
-            c.merge_data(i)
-          end
-        elsif d.is_a?(Hash)
-          d.each_pair do |k,v|
-            bits = k.split('.')
-            c = root_context.traverse_path(bits,true).first
-            if v.is_a?(Hash) || v.is_a?(Array)
-              c.merge_data(v)
-            else
-              c.value = v
-            end
-          end
-        else
-          c = root_context.parent.create_child(root_context.name, d)
-        end
-      end
-
       def parent=(p)
         @parent = p
         @axis = p.axis

data/lib/fabulator/expr/parser.rb

@@ -9,7 +9,7 @@ module Fabulator
   module Expr
     class Parser < Racc::Parser
 
-module_eval(<<'...end xsm_expression_parser.racc/module_eval...', 'xsm_expression_parser.racc', 179)
+module_eval(<<'...end xsm_expression_parser.racc/module_eval...', 'xsm_expression_parser.racc', 187)
   require 'fabulator/expr'
   require 'rational'
   require 'bigdecimal'
@@ -41,6 +41,7 @@ module_eval(<<'...end xsm_expression_parser.racc/module_eval...', 'xsm_expressio
     :axis_name => %r{(?:attribute|child|child-or-self|descendant|descendant-or-self|method|self)},
     :namespace_name => %r{(?:context|global|local|session|universal)},
     :number => %r{(-?\d+(?:\.\d+)?|\.\d+)},
+    :literal => %r{((?:"(?:[^\\"]*(?:\\.[^\\"]*)*)")|(?:'(?:[^\\']*(?:\\.[^\\']*)*)'))},
   }
 
   @@regex[:axis] = %r{(#{@@regex[:ncname]})\s*(?=::)}
@@ -88,7 +89,7 @@ module_eval(<<'...end xsm_expression_parser.racc/module_eval...', 'xsm_expressio
     == & && ||
   }.split(/\s*/), '[', ',', '$' ].each { |t| @@preceding_tokens[t] = true }
 
-  @@regex[:general] = Regexp.compile(%{^(?:#{@@regex[:function_name]}|#{@@regex[:axis]}|#{@@regex[:name_colon_star]}|#{@@regex[:qname]}|('[^']*'|"[^"]*")|#{@@regex[:number]}|#{@@regex[:dollar_qname]}|#{@@regex[:dollar_int]}|(#{@@regex[:simple_tokens]}))})
+  @@regex[:general] = Regexp.compile(%{^(?:#{@@regex[:function_name]}|#{@@regex[:axis]}|#{@@regex[:name_colon_star]}|#{@@regex[:qname]}|#{@@regex[:literal]}|#{@@regex[:number]}|#{@@regex[:dollar_qname]}|#{@@regex[:dollar_int]}|(#{@@regex[:simple_tokens]}))})
 
   def next_token  
     @token = nil
@@ -1410,21 +1411,28 @@ module_eval(<<'.,.,', 'xsm_expression_parser.racc', 158)
   end
 .,.,
 
-module_eval(<<'.,.,', 'xsm_expression_parser.racc', 159)
+module_eval(<<'.,.,', 'xsm_expression_parser.racc', 160)
   def _reduce_90(val, _values, result)
-     result = Fabulator::Expr::Function.new(@context, val[0], val[1]) 
+            result = Fabulator::Expr::Function.new(@context, val[0], val[1]) 
+#          when 'any' : Fabulator::Expr::AnyExpr.new(@context, val[1])
+#          when 'all' : Fabulator::Expr::AllExpr.new(@context, val[1])
+#          when 'one' : Fabulator::Expr::OneExpr.new(@context, val[1])
+#          when 'none': Fabulator::Expr::NoneExpr.new(@context, val[1])
+#          else Fabulator::Expr::Function.new(@context, val[0], val[1]) 
+#        end
+    
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'xsm_expression_parser.racc', 161)
+module_eval(<<'.,.,', 'xsm_expression_parser.racc', 169)
   def _reduce_91(val, _values, result)
      result = Fabulator::Expr::List.new(val[1]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'xsm_expression_parser.racc', 164)
+module_eval(<<'.,.,', 'xsm_expression_parser.racc', 172)
   def _reduce_92(val, _values, result)
      result = [ ] 
     result
@@ -1433,14 +1441,14 @@ module_eval(<<'.,.,', 'xsm_expression_parser.racc', 164)
 
 # reduce 93 omitted
 
-module_eval(<<'.,.,', 'xsm_expression_parser.racc', 167)
+module_eval(<<'.,.,', 'xsm_expression_parser.racc', 175)
   def _reduce_94(val, _values, result)
      result = [ val[0] ] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'xsm_expression_parser.racc', 168)
+module_eval(<<'.,.,', 'xsm_expression_parser.racc', 176)
   def _reduce_95(val, _values, result)
      result = val[0] + [ val[2] ] 
     result
@@ -1449,14 +1457,14 @@ module_eval(<<'.,.,', 'xsm_expression_parser.racc', 168)
 
 # reduce 96 omitted
 
-module_eval(<<'.,.,', 'xsm_expression_parser.racc', 171)
+module_eval(<<'.,.,', 'xsm_expression_parser.racc', 179)
   def _reduce_97(val, _values, result)
      result = val[0].to_s 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'xsm_expression_parser.racc', 172)
+module_eval(<<'.,.,', 'xsm_expression_parser.racc', 180)
   def _reduce_98(val, _values, result)
      result = val[1] 
     result

data/lib/fabulator/expr/predicates.rb

@@ -55,15 +55,5 @@ module Fabulator
         return possible
       end
     end
-
-    class IndexPredicate
-      def initialize(l)
-        @indices = l
-      end
-
-      def run(context)
-        @indices.collect { |e| e.run(context).collect{ |i| i.to([FAB_NS, 'numeric']).value.to_i } }.flatten
-      end
-    end
   end
 end

data/lib/fabulator/template/parse_result.rb

@@ -95,18 +95,25 @@ module Fabulator::Template
       each_form_element do |el|
         id = el_id(el)
         next if id == ''
-        next unless captions.has_key?(id)
+        caption = nil
+        if captions.is_a?(Hash)
+          caption = captions[id]
+        else
+          caption = captions.traverse_path(id.split('.')).first.to_s
+        end
+
+        next if caption.nil?
 
         is_grid = false
         if el.name == 'grid'
         else
-          caption = el.find_first('./caption')
-          if caption.nil?
-            el << text_node('caption', captions[id]) 
+          cap = el.find_first('./caption')
+          if cap.nil?
+            el << text_node('caption', caption)
           else
-            caption.content = captions[id]
-            caption.parent << text_node('caption', captions[id])
-            caption.remove!
+            cap.content = caption
+            cap.parent << text_node('caption', caption)
+            cap.remove!
           end
         end
       end

data/xsm_expression_parser.racc

@@ -157,7 +157,15 @@ rule
     | tuple
     | LITERAL { result = Fabulator::Expr::Literal.new(val[0], [ Fabulator::FAB_NS, 'string' ]) }
     | NUMBER { result = Fabulator::Expr::Literal.new(val[0] =~ /\./ ? val[0].to_d.to_r : val[0].to_i.to_r, [ Fabulator::FAB_NS, 'numeric' ]) }
-    | FUNCTION_NAME list { result = Fabulator::Expr::Function.new(@context, val[0], val[1]) }
+    | FUNCTION_NAME list { 
+        result = Fabulator::Expr::Function.new(@context, val[0], val[1]) 
+#          when 'any' : Fabulator::Expr::AnyExpr.new(@context, val[1])
+#          when 'all' : Fabulator::Expr::AllExpr.new(@context, val[1])
+#          when 'one' : Fabulator::Expr::OneExpr.new(@context, val[1])
+#          when 'none': Fabulator::Expr::NoneExpr.new(@context, val[1])
+#          else Fabulator::Expr::Function.new(@context, val[0], val[1]) 
+#        end
+    }
 
   list: LP opt_args RP { result = Fabulator::Expr::List.new(val[1]) }
 
@@ -207,6 +215,7 @@ end
     :axis_name => %r{(?:attribute|child|child-or-self|descendant|descendant-or-self|method|self)},
     :namespace_name => %r{(?:context|global|local|session|universal)},
     :number => %r{(-?\d+(?:\.\d+)?|\.\d+)},
+    :literal => %r{((?:"(?:[^\\"]*(?:\\.[^\\"]*)*)")|(?:'(?:[^\\']*(?:\\.[^\\']*)*)'))},
   }
 
   @@regex[:axis] = %r{(#{@@regex[:ncname]})\s*(?=::)}
@@ -254,7 +263,7 @@ end
     == & && ||
   }.split(/\s*/), '[', ',', '$' ].each { |t| @@preceding_tokens[t] = true }
 
-  @@regex[:general] = Regexp.compile(%{^(?:#{@@regex[:function_name]}|#{@@regex[:axis]}|#{@@regex[:name_colon_star]}|#{@@regex[:qname]}|('[^']*'|"[^"]*")|#{@@regex[:number]}|#{@@regex[:dollar_qname]}|#{@@regex[:dollar_int]}|(#{@@regex[:simple_tokens]}))})
+  @@regex[:general] = Regexp.compile(%{^(?:#{@@regex[:function_name]}|#{@@regex[:axis]}|#{@@regex[:name_colon_star]}|#{@@regex[:qname]}|#{@@regex[:literal]}|#{@@regex[:number]}|#{@@regex[:dollar_qname]}|#{@@regex[:dollar_int]}|(#{@@regex[:simple_tokens]}))})
 
   def next_token  
     @token = nil

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fabulator
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - James Smith
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-18 00:00:00 +00:00
+date: 2010-08-27 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency