fabulator 0.0.4 → 0.0.5

data/History.txt

@@ -1,6 +1,14 @@
+=== 0.0.5
+
+* 2 major enhancements:
+  * unified predicate execution so numeric indexes and boolean logic
+    work based on run-time evaluation results
+  * position(), first(), and last() should work in predicates
+  * correctly escape default values
+
 === 0.0.4 2010-08-16
 
-* 5 minor enhancements
+* 5 minor enhancements:
   * Add RedCloth gem dependence to gem spec
   * f:string-length() returns 0 for nil values
   * f:dump() now shows attributes
@@ -8,19 +16,19 @@
   * minor bug fixes in template tags
   * tempate form XML element 'file' is now 'asset'
 
-* 1 major enhancement
+* 1 major enhancement:
   * add_default_values() should now work for parsed templates
   * to_html() can now return form contents only
   * parsed templates will be returned as a string if they are not 
 
 === 0.0.3 2010-08-10
 
-* 1 minor enhancement
+* 1 minor enhancement:
   * Add libxslt-ruby gem dependence to gem spec
 
 === 0.0.2 2010-08-10
 
-* 3 major enhancement:
+* 3 major enhancements:
   * Introduce '*' suffix to indicate a consolidation of a reduction
   * Reduction functions can now have a corresponding consolidation
     function.  The reduction will be a fallback for an undefined

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/features/paths.feature

@@ -31,6 +31,7 @@ Feature: Path expressions
     Then I should get 1 item
       And item 0 should be [5]
 
+  @numpred
   Scenario: Finding the third and fifth odd numbers
     Given a context
       And that [/a] is set to [1 .. 10]
@@ -39,6 +40,7 @@ Feature: Path expressions
       And item 0 should be [5]
       And item 1 should be [9]
 
+  @numpred
   Scenario: Using an expression to name a node test
     Given a context
       And that [/a] is set to [1 .. 10]
@@ -48,6 +50,7 @@ Feature: Path expressions
       And item 0 should be [5]
       And item 1 should be [9]
 
+  @numpred
   Scenario: Using an expression to name a node test
     Given a context
       And that [/a] is set to [1 .. 10]
@@ -55,3 +58,34 @@ Feature: Path expressions
     Then I should get 2 items
       And item 0 should be [5]
       And item 1 should be [9]
+
+  @pred
+  Scenario: Using an expression to name a node test
+    Given a context
+     And the prefix f as "http://dh.tamu.edu/ns/fabulator/1.0#"
+     And that [/a/a] is set to ['a']
+     And that [/a/b] is set to ['bb']
+     And that [/a/c] is set to ['ccc']
+     And that [/a/d] is set to ['dd']
+     And that [/a/e] is set to ['e']
+    When I run the expression (/a/*[f:string-length(.) > 1])
+    Then I should get 3 items
+     And item 0 should be ['bb']
+     And item 1 should be ['ccc']
+     And item 2 should be ['dd']
+
+  @pred
+  Scenario: Using an expression to name a node test
+    Given a context
+     And the prefix f as "http://dh.tamu.edu/ns/fabulator/1.0#"
+     And that [/a/a] is set to ['a']
+     And that [/a/b] is set to ['bb']
+     And that [/a/c] is set to ['ccc']
+     And that [/a/d] is set to ['dd']
+     And that [/a/e] is set to ['e']
+    When I run the expression (/a/*[f:not(f:string-length(.) < 2)])
+    Then I should get 3 items
+     And item 0 should be ['bb']
+     And item 1 should be ['ccc']
+     And item 2 should be ['dd']
+

data/features/templates.feature

@@ -121,5 +121,33 @@ Feature: Templates
   <form>
     <textline id="foo"><caption>Foo</caption><default>FooDefault</default></textline>
   </form>
+</view>
+       """
+
+  @def
+  Scenario: Rendering a form with defaults
+   Given a context
+     And the prefix f as "http://dh.tamu.edu/ns/fabulator/1.0#"
+     And the template
+       """
+<view>
+  <form id='foo'>
+    <textline id='bar'><caption>Foo</caption></textline>
+    <textline id='baz'><caption>Boo</caption></textline>
+  </form>
+</view>
+       """
+   When I render the template
+    And I set the defaults to:
+      | path    | default       |
+      | foo/bar | FooDefault    |
+      | foo/baz | this & that   |
+   Then the rendered text should equal
+       """
+<view>
+  <form id="foo">
+    <textline id="bar"><caption>Foo</caption><default>FooDefault</default></textline>
+    <textline id="baz"><caption>Boo</caption><default>this &amp; that</default></textline>
+  </form>
 </view>
        """

data/lib/fabulator/expr/context.rb

@@ -366,6 +366,17 @@ module Fabulator
     yield ctx
   end
 
+  def with_roots(items, &block)
+    idx = 1
+    items.each do |i|
+      ctx = self.with_root(i)
+      ctx.position = idx
+      ctx.last = idx == items.size
+      yield ctx
+      idx += 1
+    end
+  end
+
   def run_filter(ns, name)
     handler = Fabulator::ActionLib.namespaces[ns]
     return [] if handler.nil?

data/lib/fabulator/expr/for_expr.rb

@@ -19,8 +19,11 @@ module Fabulator
         result = [ ]
         return result if @var.nil? || @expr.nil?
 
+        count = 1
         @var.each_binding(context, autovivify) do |b|
+          b.position = count
           result = result + @expr.run(b)
+          count += 1
         end
         return result
       end

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', 176)
+module_eval(<<'...end xsm_expression_parser.racc/module_eval...', 'xsm_expression_parser.racc', 179)
   require 'fabulator/expr'
   require 'rational'
   require 'bigdecimal'
@@ -1373,19 +1373,19 @@ module_eval(<<'.,.,', 'xsm_expression_parser.racc', 145)
 
 module_eval(<<'.,.,', 'xsm_expression_parser.racc', 146)
   def _reduce_83(val, _values, result)
-     result = Fabulator::Expr::IndexPredicate.new(val[1]) 
+     result = val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'xsm_expression_parser.racc', 150)
+module_eval(<<'.,.,', 'xsm_expression_parser.racc', 153)
   def _reduce_84(val, _values, result)
      result = Fabulator::Expr::Var.new(val[0]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'xsm_expression_parser.racc', 151)
+module_eval(<<'.,.,', 'xsm_expression_parser.racc', 154)
   def _reduce_85(val, _values, result)
      result = val[1] 
     result
@@ -1396,35 +1396,35 @@ module_eval(<<'.,.,', 'xsm_expression_parser.racc', 151)
 
 # reduce 87 omitted
 
-module_eval(<<'.,.,', 'xsm_expression_parser.racc', 154)
+module_eval(<<'.,.,', 'xsm_expression_parser.racc', 157)
   def _reduce_88(val, _values, result)
      result = Fabulator::Expr::Literal.new(val[0], [ Fabulator::FAB_NS, 'string' ]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'xsm_expression_parser.racc', 155)
+module_eval(<<'.,.,', 'xsm_expression_parser.racc', 158)
   def _reduce_89(val, _values, result)
      result = Fabulator::Expr::Literal.new(val[0] =~ /\./ ? val[0].to_d.to_r : val[0].to_i.to_r, [ Fabulator::FAB_NS, 'numeric' ]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'xsm_expression_parser.racc', 156)
+module_eval(<<'.,.,', 'xsm_expression_parser.racc', 159)
   def _reduce_90(val, _values, result)
      result = Fabulator::Expr::Function.new(@context, val[0], val[1]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'xsm_expression_parser.racc', 158)
+module_eval(<<'.,.,', 'xsm_expression_parser.racc', 161)
   def _reduce_91(val, _values, result)
      result = Fabulator::Expr::List.new(val[1]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'xsm_expression_parser.racc', 161)
+module_eval(<<'.,.,', 'xsm_expression_parser.racc', 164)
   def _reduce_92(val, _values, result)
      result = [ ] 
     result
@@ -1433,14 +1433,14 @@ module_eval(<<'.,.,', 'xsm_expression_parser.racc', 161)
 
 # reduce 93 omitted
 
-module_eval(<<'.,.,', 'xsm_expression_parser.racc', 164)
+module_eval(<<'.,.,', 'xsm_expression_parser.racc', 167)
   def _reduce_94(val, _values, result)
      result = [ val[0] ] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'xsm_expression_parser.racc', 165)
+module_eval(<<'.,.,', 'xsm_expression_parser.racc', 168)
   def _reduce_95(val, _values, result)
      result = val[0] + [ val[2] ] 
     result
@@ -1449,14 +1449,14 @@ module_eval(<<'.,.,', 'xsm_expression_parser.racc', 165)
 
 # reduce 96 omitted
 
-module_eval(<<'.,.,', 'xsm_expression_parser.racc', 168)
+module_eval(<<'.,.,', 'xsm_expression_parser.racc', 171)
   def _reduce_97(val, _values, result)
      result = val[0].to_s 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'xsm_expression_parser.racc', 169)
+module_eval(<<'.,.,', 'xsm_expression_parser.racc', 172)
   def _reduce_98(val, _values, result)
      result = val[1] 
     result

data/lib/fabulator/expr/predicates.rb

@@ -14,16 +14,40 @@ module Fabulator
         return possible if @predicates.nil? || @predicates.empty?
         @predicates.each do |p|
           n_p = [ ]
-          if p.is_a?(Fabulator::Expr::IndexPredicate)
-            n_p = p.run(context).collect{ |i| possible[i-1] }
-          else
-            possible.each do |c|
-              res = p.run(context.with_root(c))
-              if res.is_a?(Array)
-                n_p << c if !res.empty? && !!res.first.value
-              else
-                n_p << c if !!res.value
+          context.with_roots(possible) do |ctx|
+            if p.is_a?(Array)
+              res = p.collect{ |pp| pp.run(ctx) }.flatten
+            else
+              res = p.run(ctx)
+            end
+            if res.is_a?(Array)
+              res -= [ nil ]
+              if !res.empty?
+                # if all boolean and one is true, then keep
+                # if numeric, then keep if position == number
+                # if string and non-blank, then keep
+                unified_type = Fabulator::ActionLib.unify_types(res.collect{ |r| r.vtype })
+                case unified_type.join('') 
+                  when FAB_NS+'boolean':
+                    if res.select{ |r| r.to([FAB_NS, 'boolean']).value }.size > 0
+                      n_p << ctx.root
+                    end
+                  when FAB_NS+'numeric':
+                    if res.select{ |r| r.to([FAB_NS,'numeric']).value == ctx.position }.size > 0
+                      n_p << ctx.root
+                    end
+                  when FAB_NS+'string':
+                    if res.select{ |r| r.to_s.size > 0 }.size > 0
+                      n_p << ctx.root
+                    end
+                  else # default for now is to convert to boolean
+                    if res.select{ |r| r.to([FAB_NS, 'boolean']).value }.size > 0
+                      n_p << ctx.root
+                    end
+                end
               end
+            else
+              n_p << ctx.root if !!res.value
             end
           end
           possible = n_p

data/lib/fabulator/template/parse_result.rb

@@ -47,20 +47,20 @@ module Fabulator::Template
             end
             if direction == 'both' 
               l.collect{|ll| ll.value}.each do |v|
-                el << XML::Node.new('default', v)
+                el << text_node('default', v)
               end
             elsif direction == 'row' || direction == 'column'
               el.find("./#{direction}").each do |div|
                 id = (div.attributes['id'].to_s rescue '')
                 next if id == ''
                 l.collect{|c| context.with_root(c).traverse_path(id)}.flatten.collect{|c| c.value}.each do |v|
-                  div << XML::Node.new('default', v)
+                  div << text_node('default', v)
                 end
               end
             end
           else
             l.collect{|ll| ll.value}.each do |v|
-              el << XML::Node.new('default', v)
+              el << text_node('default', v)
             end
           end
         end
@@ -83,10 +83,10 @@ module Fabulator::Template
         next unless errors.has_key?(id)
         if errors[id].is_a?(Array)
           errors[id].each do |e|
-            el << XML::Node.new('error', e)
+            el << text_node('error', e) 
           end
         else
-          el << XML::Node.new('error', errors[id])
+          el << text_node('error', errors[id])
         end
       end
     end
@@ -102,9 +102,11 @@ module Fabulator::Template
         else
           caption = el.find_first('./caption')
           if caption.nil?
-            el << XML::Node.new('caption', captions[id])
+            el << text_node('caption', captions[id]) 
           else
             caption.content = captions[id]
+            caption.parent << text_node('caption', captions[id])
+            caption.remove!
           end
         end
       end
@@ -158,5 +160,11 @@ protected
       ids << own_id
       ids.collect{|i| i.to_s}.join('/')
     end
+
+    def text_node(n,t)
+      e = XML::Node.new(n)
+      e << t
+      e
+    end
   end
 end

data/xsm_expression_parser.racc

@@ -144,7 +144,10 @@ rule
     | predicates predicate { result = val[0] + [ val[1] ] }
 
   predicate: LB expr RB { result = val[1] }
-    | LB num_list RB { result = Fabulator::Expr::IndexPredicate.new(val[1]) }
+    | LB num_list RB { result = val[1] }
+
+      #Fabulator::Expr::IndexPredicate.new(val[1]) 
+    
 
     #| '<' expr '>'
   primary_expr:

metadata

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