fabulator 0.0.15 → 0.0.16

data/History.txt

@@ -1,3 +1,10 @@
+=== 0.0.16 2010-12-28
+
+* 3 minor enhancements:
+  * Template functions dedent their text.
+  * Functions can be immediately followed by predicates
+  * Actions defined in a library can have a f:select attribute now
+
 === 0.0.15 2010-12-09
 
 * 1 minor enhancement:

data/VERSION

@@ -1 +1 @@
-0.0.15
+0.0.16

data/features/functions.feature

@@ -173,7 +173,7 @@ Feature: Function calls and lists
   Scenario: Random numbers
     Given a context
      And the prefix f as "http://dh.tamu.edu/ns/fabulator/1.0#"
-    When I run the expression (f:random(5) < 5)
+    When I run the expression (f:random(5) < 6)
     Then I should get 1 item
      And item 0 should be [f:true()]
 

data/features/library.feature

@@ -38,6 +38,9 @@ Feature: Libraries
             <l:attribute l:name="foo" l:eval="false" />
             <f:value f:path="/actn4foo" f:select="f:eval($foo)" />
           </l:action>
+          <l:action l:name="test-select" l:has-select="true">
+            <f:value f:path="/test-select" f:select="f:eval($select)" />
+          </l:action>
           <l:template l:name="tmpl">
             Foo
           </l:template>
@@ -58,12 +61,14 @@ Feature: Libraries
         >
           <m:actn3 m:path="/actn3" />
           <m:actn4 m:foo="bar" />
+          <m:test-select f:select="123" />
         </f:application>
       """
     Then the expression (/actn3) should equal [3]
      And the expression (/actn4foo) should equal ['bar']
+     And the expression (/test-select) should equal [123]
      And the expression (m:fctn(3,2)) should equal [1]
      And the expression (m:fctn2(2,3)) should equal [1]
-     And the expression (f:normalize-space(m:tmpl())) should equal ['Foo']
-     And the expression (f:normalize-space(m:tmpl2('Foo'))) should equal ['Foo']
-     And the expression (f:normalize-space(m:tmpl3('Foo'))) should equal ['<p> Foo </p>']
+     And the expression (m:tmpl()) should equal ['Foo']
+     And the expression (m:tmpl2('Foo')) should equal ['Foo']
+     And the expression (f:normalize-space(m:tmpl3('Foo'))) should equal ['<p>Foo</p>']

data/features/paths.feature

@@ -89,3 +89,12 @@ Feature: Path expressions
      And item 1 should be ['ccc']
      And item 2 should be ['dd']
 
+  @array
+  Scenario: Predicates after function calls
+    Given a context
+     And the prefix f as "http://dh.tamu.edu/ns/fabulator/1.0#"
+    When I run the expression (f:split('The brown faux fox fur', ' ')[f:starts-with?(., 'f')])
+    Then I should get 3 items
+     And item 0 should be ['faux']
+     And item 1 should be ['fox']
+     And item 2 should be ['fur']

data/features/simple-statemachine.feature

@@ -226,11 +226,14 @@ Feature: Simple state machines
             </f:choose>
           </f:variable>
           <f:value f:path="/new-post/filter" f:select="$filter" />
+          <f:variable f:name="fillter" f:select="$filter" />
+          <f:value f:path="/new-post/fillter" f:select="$fillter" />
         </f:application>
       """
     Then the expression (/foo) should equal [3]
     Then the expression (/bar) should equal [3]
     Then the expression (/new-post/filter) should equal ['Markdown']
+    Then the expression (/new-post/fillter) should equal ['Markdown']
 
   @var
   Scenario: simple machine with a <variable /> and <value />

data/lib/fabulator/expr/parser.rb

@@ -1396,7 +1396,7 @@ module_eval(<<'.,.,', 'xsm_expression_parser.racc', 115)
 
 module_eval(<<'.,.,', 'xsm_expression_parser.racc', 116)
   def _reduce_63(val, _values, result)
-     result = Fabulator::Expr::PathExpr.new(val[0], val[1], val[2]) 
+     result = ((val[1].nil? || val[1].empty?) && (val[2].nil? || val[2].empty?)) ? val[0] : Fabulator::Expr::PathExpr.new(val[0], val[1], val[2]) 
     result
   end
 .,.,

data/lib/fabulator/expr/path_expr.rb

@@ -3,7 +3,7 @@ module Fabulator
     class PathExpr
       def initialize(pe, predicates, segment)
         @primary_expr = pe
-        @predicates = predicates
+        @predicates = Fabulator::Expr::Predicates.new(nil, predicates)
         @segment = (segment.is_a?(Array) ? segment : [ segment ]) - [nil]
       end
 
@@ -24,15 +24,8 @@ module Fabulator
 
         possible.each do |e|
           next if e.nil?
-          not_pass = false
-          @predicates.each do |p|
-            if !p.test(context.with_root(e))
-              not_pass = true
-              break
-            end
-          end
-          next if not_pass
-          pos = [ e ]
+          pos = @predicates.run(context.with_root(e), autovivify)
+          next if pos.empty?
           @segment.each do |s|
             pos = pos.collect{ |p| 
               s.run(context.with_root(p), autovivify) 

data/lib/fabulator/expr/predicates.rb

@@ -10,7 +10,7 @@ module Fabulator
         # we want to run through all of the predicates and return true if
         # they all return true
         result = [ ]
-        possible = @axis.run(context, autovivify)
+        possible = @axis.nil? ? [ context.root ] : @axis.run(context, autovivify)
         return possible if @predicates.nil? || @predicates.empty?
         @predicates.each do |p|
           n_p = [ ]

data/lib/fabulator/lib/action.rb

@@ -24,6 +24,10 @@ module Fabulator
         end
         ret
       end
+
+      def has_select?
+        @has_select
+      end
     end
 
     class ActionRef
@@ -54,7 +58,9 @@ module Fabulator
             ctx.set_var('actions', ctx.root.anon_node( @actions, [ FAB_NS, 'expression' ]))
           end
           if action.has_select?
-            ctx.set_var('select', ctx.root.anon_node( @select, [ FAB_NS, 'expression' ]))
+            v = @context.attribute(Fabulator::FAB_NS, 'select', { :eval => true })
+
+            ctx.set_var('select', ctx.root.anon_node( v, [ FAB_NS, 'expression' ]))
           end
           ret = action.run(ctx)
         end

data/lib/fabulator/lib/function.rb

@@ -103,6 +103,14 @@ module Fabulator
             end
           end
         end
+        s.gsub!(/^\s+/, '')
+        s.gsub!(/\s+$/, '')
+# we want to see if we need to remove a whitespace prefix
+        indent = s.
+                 split(/[\x0a\0x0d]/).
+                 map{|l| (v=l[/^([\s]+)/].to_s.length; v==0)? nil : v }.
+                 compact.min
+        s.gsub!(/^#{' '*indent.to_i}/, '')
         s = @wrapper.first + s + @wrapper.last
         return [ context.root.anon_node(s, [ FAB_NS, 'string' ]) ]
       end

data/xsm_expression_parser.racc

@@ -114,7 +114,7 @@ rule
     | union_expr_x PIPE path_expr { result = val[0] + [ val[2] ] }
 
   path_expr: location_path { result = Fabulator::Expr::PathExpr.new(nil, [], val[0]) } #result = Fabulator::Expr::PathExpr.new(nil, [], val[0]) }
-    | primary_expr predicates segment { result = Fabulator::Expr::PathExpr.new(val[0], val[1], val[2]) }
+    | primary_expr predicates segment { result = ((val[1].nil? || val[1].empty?) && (val[2].nil? || val[2].empty?)) ? val[0] : Fabulator::Expr::PathExpr.new(val[0], val[1], val[2]) }
 
   segment:
     | SLASH relative_location_path { result = val[1] }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fabulator
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 63
   prerelease: false
   segments: 
   - 0
   - 0
-  - 15
-  version: 0.0.15
+  - 16
+  version: 0.0.16
 platform: ruby
 authors: 
 - James Smith
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-09 00:00:00 +00:00
+date: 2010-12-28 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency