fabulator-grammar 0.0.5 → 0.0.6

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.0.6 2010-12-08
+
+* 1 minor enhancement:
+  * Compute the regex for character sets/classes as they are built since
+    BitSet objects don't survive YAML serialization
+
 === 0.0.5 2010-10-26
 
 * 1 minor enhancement:

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/features/library.feature

@@ -31,8 +31,8 @@ Feature: Grammars embedded in libraries
           </g:grammar>
         </l:library>
       """
-    Then the expression (m:something?('a0A')) should equal [f:true()]
-     And the expression (m:something?('a0a')) should equal [f:false()] 
+    Then the expression (m:something?('a0A')) should be true
+     And the expression (m:something?('a0a')) should be false
      And the expression (m:something('a0A')/NUMBER) should equal ['0']
      And the expression (m:something2('a0A')/foo) should equal ['0']
 
@@ -73,11 +73,31 @@ Feature: Grammars embedded in libraries
             <f:value-of f:select="$1 - $2" />
           </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
@@ -85,6 +105,8 @@ Feature: Grammars embedded in libraries
         <f:application xmlns:f="http://dh.tamu.edu/ns/fabulator/1.0#"
                        xmlns:m="http://example.com/ns/grammar"
         >
+          <m:actn3 m:path="/actn3" />
+          <m:actn4 m:foo="bar" />
           <f:view f:name="start">
             <f:goes-to f:view="step1">
               <f:params>
@@ -116,6 +138,8 @@ Feature: Grammars embedded in libraries
         </f:application>
       """
     Then it should be in the 'start' state  
+     And the expression (/actn3) should equal [3]
+     And the expression (/actn4foo) should equal ['bar']
     When I run it with the following params:
       | key   | value         |
       | foo   | bar  a0a  que   |
@@ -139,3 +163,6 @@ Feature: Grammars embedded in libraries
     Then it should be in the 'stop' state
      And the expression (/bar) should equal ['a0B']
      And the expression (m:fctn(3,2)) 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/step_definitions/expression_steps.rb

@@ -98,6 +98,14 @@ Then /the (expression \(.*\)) should equal (\[.*\])/ do |x, y|
   a.first.value.should == b.first.value
 end
 
+Then /the (expression \(.*\)) should be true/ do |x|
+  x.run(@context).first.value.should == true
+end
+
+Then /the (expression \(.*\)) should be false/ do |x|
+  x.run(@context).first.value.should == false
+end
+
 Then /the (expression \(.*\)) should be nil/ do |x|
   x.run(@context).first.should == nil
 end

data/lib/fabulator/grammar/actions/grammar.rb

@@ -73,7 +73,7 @@ module Fabulator
       nom.gsub!(/\?$/, '')
       ret = matching ? strings.collect{ |s| self.match(context, nom, s) } :
                        strings.collect{ |s| self.parse(context, nom, s) }
-      #ret -= [ nil ]
+      ret -= [ nil ]
       if matching
         ret = ret.collect{ |r| context.root.anon_node(!!r, [FAB_NS, 'boolean']) }
       else

data/lib/fabulator/grammar/expr/char_set.rb

@@ -30,6 +30,7 @@ module Fabulator::Grammar::Expr
           }
         end
       end
+      self.compute_regex
     end
 
     def set
@@ -38,20 +39,27 @@ module Fabulator::Grammar::Expr
 
     def or(c)
       @set = @set | c.set
+      self.compute_regex
       self
     end
 
     def but_not(c)
       @set = @set - c.set
+      self.compute_regex
       self
     end
 
 # for now, we restrict ourselves to 8-bit characters
     def universal
       @set.on(0..0xff)
+      self.compute_regex
     end
 
     def to_regex
+      @regex
+    end
+
+    def compute_regex
       # want a compact set of ranges for the regex
       set_def = ''
       @set.to_ary.each do |r|
@@ -62,9 +70,9 @@ module Fabulator::Grammar::Expr
         end
       end
       if set_def == ''
-        return %r{.}
+        @regex = %r{.}
       else
-        %r{[#{set_def}]}
+        @regex = %r{[#{set_def}]}
       end
     end
   end
@@ -89,6 +97,7 @@ module Fabulator::Grammar::Expr
 
     def initialize(cs)
       @set = BitSet.new.on(@@charsets[cs.downcase] || [])
+      self.compute_regex
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fabulator-grammar
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - James Smith
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-26 00:00:00 +00:00
+date: 2010-12-08 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency