fabulator 0.0.13 → 0.0.14

data/History.txt

@@ -1,3 +1,11 @@
+=== 0.0.14 2010-12-09
+
+* 1 major enhancement:
+  * Added implementation classes for 'and' and 'or' in expressions
+
+* 1 minor enhancement:
+  * Fleshed out basic test environment to enable future unit testing
+
 === 0.0.13 2010-12-08
 
 * 7 minor enhancements:

data/VERSION

@@ -1 +1 @@
-0.0.13
+0.0.14

data/features/functions.feature

@@ -160,6 +160,7 @@ Feature: Function calls and lists
     When I run the expression (f:not(f:true()))
     Then I should get 1 item
       And item 0 should be [f:false()]
+
   @ns
   Scenario: Negating logic
     Given a context

data/features/simple-control.feature

@@ -11,3 +11,17 @@ Feature: Simple Flow Control
    When I run the expression (if ( 1 = 0 ) then 'foo' else 'bar')
    Then I should get 1 item
      And item 0 should be ['bar']
+
+  @conj
+  Scenario: Or
+   Given a context
+   When I run the expression (if ( 1 = 0 or 2 * 2 = 4 ) then 'foo' else 'bar')
+   Then I should get 1 item
+     And item 0 should be ['foo']
+
+  @conj
+  Scenario: And
+   Given a context
+   When I run the expression (if ( 1 = 0 and 2 * 2 = 4 ) then 'foo' else 'bar')
+   Then I should get 1 item
+     And item 0 should be ['bar']

data/lib/fabulator/expr/bin_expr.rb

@@ -118,6 +118,26 @@ module Fabulator
       end
     end
 
+    class AndExpr < BoolBinExpr
+      def op
+        :and
+      end
+
+      def calculate(a,b)
+        a && b
+      end
+    end
+
+    class OrExpr < BoolBinExpr
+      def op
+        :or
+      end
+
+      def calculate(a,b)
+        a || b
+      end
+    end
+
     class MpyExpr < BinExpr
       def op
         :times

data/test/{test_fabulator.rb → fabulator/state_machine_test.rb}

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.dirname(__FILE__) + '/../test_helper.rb'
 require 'fabulator'
 
 class TestFabulator < Test::Unit::TestCase
@@ -8,7 +8,8 @@ class TestFabulator < Test::Unit::TestCase
   
   test 'compile trivial application' do
     doc = LibXML::XML::Document.string('<f:application xmlns:f="http://dh.tamu.edu/ns/fabulator/1.0#" />')
-    sm = Fabulator::Core::StateMachine.new.compile_xml(doc)
+    sm = Fabulator::Core::Structurals::StateMachine.new
+    sm.compile_xml(doc)
     assert_equal sm.states.keys.size, 1, "No states defined automatically"
     assert_equal sm.states.keys.first, 'start', "Default state is not 'start'"
     start = sm.states.values.first

data/test/test_helper.rb

@@ -1,6 +1,7 @@
+require 'rubygems'
 require 'stringio'
 require 'test/unit'
-require 'xml/libxml'
+#require 'xml/libxml'
 #require 'fabulator'
 
 # already required by Rakefile

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fabulator
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 0
-  - 13
-  version: 0.0.13
+  - 14
+  version: 0.0.14
 platform: ruby
 authors: 
 - James Smith
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-08 00:00:00 +00:00
+date: 2010-12-09 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -182,12 +182,12 @@ files:
 - lib/fabulator/template/standard_tags.rb
 - lib/fabulator/template/taggable.rb
 - lib/fabulator/version.rb
-- test/test_fabulator.rb
+- test/cucumber.rb
+- test/fabulator/state_machine_test.rb
 - 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
 licenses: []
@@ -223,6 +223,6 @@ signing_key:
 specification_version: 3
 summary: XML-based state machine description language and engine.
 test_files: 
-- test/test_fabulator.rb
 - test/test_helper.rb
 - test/cucumber.rb
+- test/fabulator/state_machine_test.rb