fabulator 0.0.12 → 0.0.13

data/History.txt

@@ -1,3 +1,15 @@
+=== 0.0.13 2010-12-08
+
+* 7 minor enhancements:
+  * Fixed f:substring and f:starts-with?
+  * Added f:random(n) to return a random integer in (1,n)
+  * Fix escaping of single and double quotes in expressions
+  * Fix where we look for non-inherited attributes in actions defined
+    in a library
+  * Fix handling of attributes that need to be passed through f:eval
+  * Fix template interaction with libraries that don't have form elements
+  * Fix recording of actions that act as connections to structural elements
+
 === 0.0.12 2010-12-03
 
 * 1 major enhancement:

data/VERSION

@@ -1 +1 @@
-0.0.12
+0.0.13

data/features/functions.feature

@@ -167,3 +167,19 @@ Feature: Function calls and lists
     When I run the expression (let xmlns:ff:="http://dh.tamu.edu/ns/fabulator/1.0#"; ff:not(ff:true()))
     Then I should get 1 item
       And item 0 should be [f:false()]
+
+  @rand
+  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)
+    Then I should get 1 item
+     And item 0 should be [f:true()]
+
+  @strings
+  Scenario: Starts with
+    Given a context
+     And the prefix f as "http://dh.tamu.edu/ns/fabulator/1.0#"
+    When I run the expression (f:starts-with?('$bar', '$'))
+    Then I should get 1 item
+     And item 0 should be [f:true()]

data/features/simple-statemachine.feature

@@ -191,6 +191,34 @@ Feature: Simple state machines
      And the expression (/foo) should equal ['bar']
      And the expression (/bar) should equal ['baz']
 
+  @choose
+  Scenario: simple machine with a <choose />
+    Given the statemachine
+      """
+        <f:application xmlns:f="http://dh.tamu.edu/ns/fabulator/1.0#">
+          <f:choose>
+            <f:when f:test="f:true()">
+              <f:value f:path="/foo" f:select="3" />
+            </f:when>
+            <f:otherwise>
+              <f:value f:path="/foo" f:select="2" />
+            </f:otherwise>
+          </f:choose>
+          <f:value f:path="/bar">
+            <f:choose>
+              <f:when f:test="f:true()">
+                <f:value-of f:select="3" />
+              </f:when>
+              <f:otherwise>
+                <f:value-of f:select="2" />
+              </f:otherwise>
+            </f:choose>
+          </f:value>
+        </f:application>
+      """
+    Then the expression (/foo) should equal [3]
+    Then the expression (/bar) should equal [3]
+
   @var
   Scenario: simple machine with a <variable /> and <value />
     Given the statemachine

data/lib/fabulator/core/lib.rb

@@ -165,6 +165,15 @@ module Fabulator
       arg.to(NUMERIC).value.to_d.floor.to_r
     end
 
+    mapping 'random' do |ctx, arg|
+      v = arg.to(NUMERIC).value.to_i
+      if v <= 0
+        (0.0).to_d.to_r
+      else
+        (1.0*rand(v) + 1.0).floor.to_r
+      end
+    end
+
     reduction 'sum', { :scaling => :log } do |ctx, args|
       zero = TagLib.find_op(args.first.vtype, :zero)
       if(zero && zero[:proc])
@@ -297,9 +306,9 @@ module Fabulator
       first = args[1].first.value
       if args.size == 3
         last = args[2].first.value
-        return [ args[0].collect{ |src| src.value.to_s.substr(first-1, last-1) } ]
+        return [ args[0].collect{ |src| s = src.value.to_s; s.length > first + last - 2 ? s[first-1, s.length-1] : s[first-1, first + last - 2] } ]
       else
-        return [ args[0].collect{ |src| src.value.to_s.substr(first-1) } ]
+        return [ args[0].collect{ |src| s = src.value.to_s; s[first-1, s.length-1] } ]
       end
     end
 
@@ -334,7 +343,7 @@ module Fabulator
 
     function 'starts-with?' do |ctx, args|
       tgt = (args[1].first.to_s rescue '')
-      tgt_len = tgt.size - 1
+      tgt_len = tgt.size
       return args[0].collect{ |a| (a.to_s[0,tgt_len] == tgt rescue false) }
     end
 
@@ -358,7 +367,21 @@ module Fabulator
 
       return args[0].collect{ |a| a.to_s.include?(tgt) ? (a.to_s.split(tgt))[-1] : "" }
     end
-    
+
+    function 'index-of' do |ctx, args|
+      tgt = (args[1].first.to_s rescue ' ')
+      start = (args[2].first.to(NUMERIC, ctx).value.to_i rescue 0)
+      ret = [ ]
+      args[0].collect{ |a| 
+        as = a.to_s
+        ret << as.index(tgt, start)
+        while !ret.last.nil?
+          ret << as.index(tgt, ret.last)
+        end
+        ret -= [ nil ]
+      }
+      ret
+    end
 
     ###
     ### Regexes
@@ -433,11 +456,11 @@ module Fabulator
     mapping 'eval' do |ctx, arg|
       p = Fabulator::Expr::Parser.new
       if arg.vtype.join('') == FAB_NS+'expression'
-        return arg.value.run(ctx)
+        return arg.value.run(ctx, true)
       else
         e = arg.to_s
         pe = e.nil? ? nil : p.parse(e,ctx)
-        return pe.nil? ? [] : pe.run(ctx)
+        return pe.nil? ? [] : pe.run(ctx, true)
       end
     end
 

data/lib/fabulator/expr/context.rb

@@ -286,13 +286,14 @@ module Fabulator
       src = nil
       if !v.nil?
         src = v.is_a?(Fabulator::Expr::Node) ? [ v ] : ( v.is_a?(Array) ? v : v.run(self) )
+        src = src.select{ |s| !s.value.nil? || s.children.count > 0 }
       end 
 
       tgts.each do |tgt|
         tgt.prune
         if src.nil? || src.empty?
-          tgt.value = nil
-          ret << tgt
+          #tgt.value = nil
+          #ret << tgt
         elsif src.size == 1
           tgt.copy(src.first)
           ret << tgt

data/lib/fabulator/expr/parser.rb

@@ -296,15 +296,16 @@ module_eval(<<'...end xsm_expression_parser.racc/module_eval...', 'xsm_expressio
           end
         elsif !res[6].nil?
           s = res[6]
-          s = s[1..s.length-2]
           @curpos = @curpos + s.length
           @col = @col + s.length
+          s = s[1..s.length-2]
           s.gsub!(/\\n/, "\n")
+          s.gsub!(/\\'/, "'")
+          s.gsub!(/\\"/, '"')
+          @line += s.split(/\n/).count
           @curpos = @curpos - s.length
           @col = @col - s.length
           @token = [ :LITERAL, s ]
-          @curpos = @curpos + 2  # the quotes
-          @col = @col + 2
         elsif !res[7].nil?
           @token = [ :NUMBER, res[7] ]
         elsif !res[8].nil?

data/lib/fabulator/lib/action.rb

@@ -11,6 +11,7 @@ module Fabulator
 
       attribute :name, :static => true
       attribute 'has-actions', :static => true, :as => :has_actions, :type => :boolean
+      attribute 'has-select', :static => true, :as => :has_select, :type => :boolean
 
       contains :attribute
 
@@ -31,7 +32,7 @@ module Fabulator
         @action = defining_action
         @actions = actions
         @static_attributes = { }
-        @context.get_action(@action.first, @action.last).attributes.collect{ |a| a.is_static? }.each do |a|
+        @context.get_action(@action.first, @action.last).attributes.select{ |a| a.is_static? }.each do |a|
           @static_attributes[a.name] = a.value(@context)
         end
       end
@@ -44,14 +45,17 @@ module Fabulator
           end
 # These can be passed to f:eval to get their value
           action = ctx.get_action(@action.first, @action.last)
-          action.attributes.collect{ |a| !a.is_static? }.each do |attr|
-            ctx.set_var(attr.name, attr.value(ctx))
+          action.attributes.select{ |a| !a.is_static? }.each do |attr|
+            ctx.set_var(attr.name, attr.value(@context))
           end
           # we can f:eval($actions) in whatever current context we have
           if action.has_actions?
             @actions.use_context(context)
             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' ]))
+          end
           ret = action.run(ctx)
         end
         ret

data/lib/fabulator/lib/attribute.rb

@@ -7,13 +7,18 @@ module Fabulator
       attribute :ns, :static => true, :inherited => true
       attribute :static, :static => true, :type => :boolean
       attribute :eval, :static => true, :type => :boolean
+      attribute :inherited, :static => true, :type => :boolean
 
       def is_static?
         @static
       end
 
       def value(context)
-        context.attribute(@ns, @name, { :static => @static, :eval => @eval })
+        v = context.attribute(@ns, @name, { :static => @static, :eval => @eval, :inherited => @inherited })
+        if @eval || !@static
+          v = context.root.anon_node(v, [ FAB_NS, 'expression' ])
+        end
+        v
       end
     end
   end

data/lib/fabulator/lib/lib.rb

@@ -139,8 +139,8 @@ module Fabulator
   protected
 
     def setup(xml)
-      ns = xml.attributes.get_attribute_ns(FAB_LIB_NS, 'ns').value
-      Fabulator::TagLib.namespaces[ns] = self
+      @ns = xml.attributes.get_attribute_ns(FAB_LIB_NS, 'ns').value
+      Fabulator::TagLib.namespaces[@ns] = self
 
       self.init_attribute_storage
     

data/lib/fabulator/tag_lib.rb

@@ -347,6 +347,8 @@ module Fabulator
         if block
           define_method("action:#{name.to_s}", block)
         elsif !klass.nil?
+          Fabulator::TagLib.structural_classes[self.name] ||= {}
+          Fabulator::TagLib.structural_classes[self.name][name.to_sym] = klass
           action(name) { |e,c|
             r = klass.new
             r.compile_xml(e,c)

data/lib/fabulator/template/parse_result.rb

@@ -13,8 +13,10 @@ module Fabulator::Template
       interactives = { }
 
       Fabulator::TagLib.namespaces.each_pair do |ns, ob|
-        structurals[ns] = ob.presentation.structurals
-        interactives[ns] = ob.presentation.interactives
+        x = ob.presentation.structurals || []
+        structurals[ns] = x unless x.nil? || x.empty?
+        x = ob.presentation.interactives || []
+        interactives[ns] = x unless x.nil? || x.empty?
       end
 
       @namespaces = { }
@@ -28,12 +30,14 @@ module Fabulator::Template
       interactive_xpaths = []
       interesting_xpaths = [ ]
       @fab_prefix = ''
+
       @namespaces.keys.each do |p|
         @fab_prefix = p if @namespaces[p] == Fabulator::FAB_NS
         structural_xpaths += structurals[@namespaces[p]].collect{ |e| "ancestor::#{p}:#{e}" }
         interactive_xpaths += interactives[@namespaces[p]].collect{ |e| "//#{p}:#{e}" }
         interesting_xpaths += structurals[@namespaces[p]].collect{ |e| "//#{p}:#{e}" }
       end
+
       @structural_xpath = structural_xpaths.join("[@id != ''] | ") + "[@id != '']"
       @interactive_xpath = interactive_xpaths.join(" | ")
 

data/xsm_expression_parser.racc

@@ -480,15 +480,16 @@ end
           end
         elsif !res[6].nil?
           s = res[6]
-          s = s[1..s.length-2]
           @curpos = @curpos + s.length
           @col = @col + s.length
+          s = s[1..s.length-2]
           s.gsub!(/\\n/, "\n")
+          s.gsub!(/\\'/, "'")
+          s.gsub!(/\\"/, '"')
+          @line += s.split(/\n/).count
           @curpos = @curpos - s.length
           @col = @col - s.length
           @token = [ :LITERAL, s ]
-          @curpos = @curpos + 2  # the quotes
-          @col = @col + 2
         elsif !res[7].nil?
           @token = [ :NUMBER, res[7] ]
         elsif !res[8].nil?

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fabulator
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 0
-  - 12
-  version: 0.0.12
+  - 13
+  version: 0.0.13
 platform: ruby
 authors: 
 - James Smith
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-03 00:00:00 +00:00
+date: 2010-12-08 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency