fabulator 0.0.14 → 0.0.15

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.0.15 2010-12-09
+
+* 1 minor enhancement:
+  * Fixed bug causing <variable /> elements to ignore actions when no
+    select attribute
+
 === 0.0.14 2010-12-09
 
 * 1 major enhancement:

data/VERSION

@@ -1 +1 @@
-0.0.14
+0.0.15

data/features/library.feature

@@ -0,0 +1,69 @@
+@library
+Feature: Libraries
+
+  @library
+  Scenario: Using a actions and functions in a library
+    Given a context
+     And the prefix m as "http://example.com/ns/library"
+     And the prefix f as "http://dh.tamu.edu/ns/fabulator/1.0#"
+    Given the library
+      """
+        <l:library
+                   xmlns:l="http://dh.tamu.edu/ns/fabulator/library/1.0#"
+                   xmlns:f="http://dh.tamu.edu/ns/fabulator/1.0#"
+                   l:ns="http://example.com/ns/library"
+                   xmlns:my="http://example.com/ns/library"
+        >
+          <l:mapping l:name="double">
+            <f:value-of f:select=". * 2" />
+          </l:mapping>
+          <l:function l:name="fctn">
+            <f:value-of f:select="$1 - $2" />
+          </l:function>
+          <l:function l:name="fctn2">
+            <f:value-of f:select="my:fctn($2, $1)" />
+          </l:function>
+          <l:action l:name="actn" l:has-actions="true">
+            <l:attribute l:name="foo" />
+            <f:value-of f:select="f:eval($actions) * 3" />
+          </l:action>
+          <l:action l:name="actn2" l:has-actions="true">
+            <my:actn><f:value-of f:select="f:eval($actions) * 5" /></my:actn>
+          </l:action>
+          <l:action l:name="actn3">
+            <l:attribute l:name="path" l:eval="true" />
+            <f:value f:path="f:eval($path)" f:select="3" />
+          </l:action>
+          <l:action l:name="actn4">
+            <l:attribute l:name="foo" l:eval="false" />
+            <f:value f:path="/actn4foo" f:select="f:eval($foo)" />
+          </l:action>
+          <l:template l:name="tmpl">
+            Foo
+          </l:template>
+          <l:template l:name="tmpl2">
+            <f:value-of f:select="$1" />
+          </l:template>
+          <l:template l:name="tmpl3">
+            <p>
+            <f:value-of f:select="$1" />
+            </p>
+          </l:template>
+        </l:library>
+      """
+     And the statemachine
+      """
+        <f:application xmlns:f="http://dh.tamu.edu/ns/fabulator/1.0#"
+                       xmlns:m="http://example.com/ns/library"
+        >
+          <m:actn3 m:path="/actn3" />
+          <m:actn4 m:foo="bar" />
+        </f:application>
+      """
+    Then the expression (/actn3) should equal [3]
+     And the expression (/actn4foo) should equal ['bar']
+     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>']

data/features/simple-statemachine.feature

@@ -214,10 +214,23 @@ Feature: Simple state machines
               </f:otherwise>
             </f:choose>
           </f:value>
+          <f:value f:path="/post/filter" f:select="'Markdown'" />
+          <f:variable f:name="filter">
+            <f:choose>
+              <f:when f:test="/post/filter = 'nil'">
+                <f:value-of f:select="''" />
+              </f:when>
+              <f:otherwise>
+                <f:value-of f:select="/post/filter" />
+              </f:otherwise>
+            </f:choose>
+          </f:variable>
+          <f:value f:path="/new-post/filter" f:select="$filter" />
         </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']
 
   @var
   Scenario: simple machine with a <variable /> and <value />

data/features/step_definitions/xml_steps.rb

@@ -11,6 +11,19 @@ Given /the statemachine/ do |doc_xml|
   @sm.init_context(@context)
 end
 
+Given /the library/ do |doc_xml|
+  @context ||= Fabulator::Expr::Context.new
+  @compiler ||= Fabulator::Compiler.new
+
+  if @library.nil?
+    @library = @compiler.compile(doc_xml)
+  else
+    @library.compile_xml(doc_xml, @context)
+  end
+
+  @library.register_library
+end
+
 When /I run it with the following params:/ do |param_table|
   params = { }
   param_table.hashes.each do |hash|

data/lib/fabulator/core/actions/variables.rb

@@ -28,14 +28,14 @@ module Fabulator
   class Variable < Fabulator::Action
     namespace Fabulator::FAB_NS
     attribute :name, :eval => false, :static => true
-    has_select
+    has_select nil
     has_actions
 
     def run(context, autovivify = false)
       return [] if self.name.nil?
       res = [ ]
       @context.with(context) do |ctx|
-        if @select
+        if !@select.nil?
           res = self.select(ctx)
         else
           res = self.run_actions(ctx)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fabulator
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 0
-  - 14
-  version: 0.0.14
+  - 15
+  version: 0.0.15
 platform: ruby
 authors: 
 - James Smith
@@ -115,6 +115,7 @@ files:
 - VERSION
 - features/functions.feature
 - features/group-params.feature
+- features/library.feature
 - features/loops.feature
 - features/paths.feature
 - features/primitives.feature