fabulator 0.0.6 → 0.0.7

data/lib/fabulator/template/standard_tags.rb

@@ -31,7 +31,7 @@ module Fabulator::Template
       tag.locals.context = c.with_root(i)
       res = res + tag.expand
     end
-    res
+    res.nil? ? '' : res
   end
             
   desc %{
@@ -46,7 +46,8 @@ module Fabulator::Template
     selection = tag.attr['select']
     c = tag.locals.context || tag.globals.context
     items = c.nil? ? [] : c.eval_expression(selection)
-    items.collect{|i| i.to([Fabulator::FAB_NS, 'html']).value }.join('')
+    res = items.collect{|i| i.to([Fabulator::FAB_NS, 'html']).value }.join('')
+    res.nil? ? '' : res
   end
 
   desc %{
@@ -58,7 +59,7 @@ module Fabulator::Template
     @chosen.unshift false
     ret = tag.expand
     @chosen.shift
-    ret
+    ret.nil? ? '' : ret
   end
     
   desc %{

data/xsm_expression_parser.racc

@@ -223,7 +223,7 @@ end
   @@regex[:qname] = %r{((?:#{@@regex[:ncname]}:)?#{@@regex[:ncname]})}
   @@regex[:dollar_qname] = %r{\$#{@@regex[:qname]}}
   @@regex[:dollar_int] = %r{\$([0-9]+)}
-  @@regex[:function_name] = %r{#{@@regex[:qname]}\*?\s*(?=\([^:])}
+  @@regex[:function_name] = %r{#{@@regex[:qname]}\??\*?\s*(?=\([^:])}
 
   @@ops = {
     '..' => :DOT_DOT,

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fabulator
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - James Smith
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-27 00:00:00 +00:00
+date: 2010-09-07 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,6 +82,22 @@ dependencies:
         version: 4.2.0
   type: :runtime
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 3
+        - 0
+        version: 2.3.0
+  type: :runtime
+  version_requirements: *id005
 description: The fabulator library provides a state machine implementation of a core set of semantics for building data-driven applications using a simple XML language coupled with an XQuery-like expression language.
 email: jgsmith@tamu.edu
 executables: []
@@ -90,7 +106,6 @@ extensions: []
 
 extra_rdoc_files: 
 - README.rdoc
-- TODO
 files: 
 - History.txt
 - Manifest.txt
@@ -111,11 +126,9 @@ files:
 - features/support/env.rb
 - features/templates.feature
 - features/types.feature
-- features/xsm-inheritance.feature
 - init.rb
 - lib/fabulator.rb
 - lib/fabulator/action.rb
-- lib/fabulator/action_lib.rb
 - lib/fabulator/context.rb
 - lib/fabulator/core.rb
 - lib/fabulator/core/actions.rb
@@ -149,6 +162,13 @@ files:
 - lib/fabulator/expr/step.rb
 - lib/fabulator/expr/unary_expr.rb
 - lib/fabulator/expr/union_expr.rb
+- lib/fabulator/lib.rb
+- lib/fabulator/lib/action.rb
+- lib/fabulator/lib/attribute.rb
+- lib/fabulator/lib/lib.rb
+- lib/fabulator/lib/structural.rb
+- lib/fabulator/structural.rb
+- lib/fabulator/tag_lib.rb
 - lib/fabulator/template.rb
 - lib/fabulator/template/context.rb
 - lib/fabulator/template/parse_result.rb
@@ -160,7 +180,6 @@ files:
 - test/test_helper.rb
 - xslt/form.xsl
 - xsm_expression_parser.racc
-- TODO
 - test/cucumber.rb
 has_rdoc: true
 homepage: http://github.com/jgsmith/ruby-fabulator

data/TODO

@@ -1,7 +0,0 @@
-Consolidation:
-
-  take a series of elements and combine them, preserving attributes
-
-  how do we know which elements are identical?
-
-  use eq on type?

data/features/xsm-inheritance.feature

@@ -1,46 +0,0 @@
-@isa
-Feature: IS-A State machine inheritance
-
-  Scenario: simple machine with just one state and no transitions
-    Given the statemachine
-      """
-        <f:application xmlns:f="http://dh.tamu.edu/ns/fabulator/1.0#" />
-      """
-      And the statemachine
-      """
-        <f:application xmlns:f="http://dh.tamu.edu/ns/fabulator/1.0#">
-          <f:view f:name="start">
-            <f:goes-to f:view="stop">
-              <f:params>
-                <f:param f:name="foo"/>
-              </f:params>
-            </f:goes-to>
-          </f:view>
-          <f:view f:name="stop" />
-        </f:application>
-      """
-    Then it should be in the 'start' state
-    When I run it with the following params:
-      | key   | value |
-      | foo   | bar   |
-    Then it should be in the 'stop' state
-     And the expression (/foo) should equal ['bar']
-    When I run it with the following params:
-      | key   | value |
-      | foo   | bar   |
-    Then it should be in the 'stop' state
-     And the expression (/foo) should equal ['bar']
-
-  Scenario: simple machine with just one state and no transitions
-    Given the statemachine
-      """
-        <f:application xmlns:f="http://dh.tamu.edu/ns/fabulator/1.0#">
-          <f:value f:path="/foo" f:select="'bar'" />
-        </f:application>
-      """
-      And the statemachine
-      """
-        <f:application xmlns:f="http://dh.tamu.edu/ns/fabulator/1.0#"/>
-      """
-    Then it should be in the 'start' state
-     And the expression (/foo) should equal ['bar']