ruler 1.2.0 → 1.4.2

data/Gemfile

@@ -12,3 +12,4 @@ group :development do
   gem "rcov", ">= 0"
   gem "mocha"
 end
+gem 'uuid'

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.4.2

data/lib/ruler.rb

@@ -1,3 +1,5 @@
+require 'rubygems'
+require 'uuid'
 # This module provides a set of methods to manage and run sets of facts and rules.
 # These rules take an array of fact names and all of the facts are true
 # the block passed to the rule is executed.  By default, only one rule can fire in a given ruleset.
@@ -17,6 +19,12 @@ end
 class BadNotCall < RulerError
 end
 
+class BadFact < RulerError
+end
+
+class UnknownFact < RulerError
+end
+
 module Ruler
 # This module uses thread local storage and should be threadsafe. 
 #
@@ -55,10 +63,17 @@ module Ruler
 # puts result
 
   def ruleset singletary = true,&blk
-    Thread.current[:singletary] = singletary
-    Thread.current[:rulematched] = nil
-    Thread.current[:working_memory] = {}
-    yield
+    @rulesetids ||= []
+    @rulesetids << UUID.generate
+    puts "Ruleset: #{@rulesetids.last} of #{@rulesetids.length}" if @DEBUG
+    Thread.current[@rulesetids.last] = {:singletary => singletary, :rulematched => nil, :working_memory => {}}
+    _rval = nil
+    begin
+      _rval = yield
+    ensure
+      @rulesetids.pop
+    end
+    _rval
   end
 
 # multi_ruleset is a helper function to define rulesets that allow
@@ -79,16 +94,21 @@ module Ruler
 # will never be used.
   def fact name, dval = nil, &blk
     if dval.nil?
-      Thread.current[:working_memory][name] = {:value => yield }
+      _res = begin 
+               yield 
+             rescue 
+               raise BadFact.new($!)
+             end
+      Thread.current[@rulesetids.last][:working_memory][name] = {:value =>  _res }
     else
-      Thread.current[:working_memory][name] = {:value => dval }
+      Thread.current[@rulesetids.last][:working_memory][name] = {:value => dval }
     end
   end
 
 # a dynamic_fact is evaulated every time the fact is checked.  Unlike a normal fact, which 
 # is only evaluated once, dynamic facts are evaluated once for each rule they appear in
   def dynamic_fact name, &blk
-    Thread.current[:working_memory][name] = {:transient => true, :block => blk }
+    Thread.current[@rulesetids.last][:working_memory][name] = {:transient => true, :block => blk }
   end
 
 # allows for a fact to be NOT another fact.  notf cannot be used with a dynamic_fact
@@ -96,10 +116,10 @@ module Ruler
 #     fact :one, 10 == 10
 #     fact :notfone, not(:one)
   def notf name
-    if Thread.current[:working_memory][name][:transient]
+    if Thread.current[@rulesetids.last][:working_memory][name][:transient]
       raise BadNotCall.new("Cannot call notf on dynamic fact")
     else
-      not(Thread.current[:working_memory][name][:value])
+      not(Thread.current[@rulesetids.last][:working_memory][name][:value])
     end
   end
 
@@ -116,7 +136,8 @@ module Ruler
 # there is no check to see if fact names are valid,  and facts can be (re)defined
 #inside of rules.  Fact names are false if they are not defined.
   def rule vlist,docstr = nil,&blk
-    dbg = lambda {|va|  puts Thread.current[:working_memory][va][:transient].nil? ? "|=-\t#{va} = #{Thread.current[:working_memory][va][:value]}" : "|=-\t#{va} = #{Thread.current[:working_memory][va][:block].call()}" }
+    conditional_call = lambda {|n| begin Thread.current[@rulesetids.last][:working_memory][n][:transient].nil? ? Thread.current[@rulesetids.last][:working_memory][n][:value] : Thread.current[@rulesetids.last][:working_memory][n][:block].call() rescue false end }
+    dbg = lambda {|va|  puts begin "|=-\t#{va} = #{conditional_call.call(va)}" rescue "|>=- ERROR: #{$!}" end }
     if @DEBUG
       puts "---------------------------------------"
       puts vlist.join(" & ")
@@ -124,11 +145,10 @@ module Ruler
       vlist.each {|v| dbg.call(v) }
       puts "---------------------------------------"
     end
-    if Thread.current[:singletary] && Thread.current[:rulematched]
-      Thread.current[:rulematched]
+    if Thread.current[@rulesetids.last][:singletary] && Thread.current[@rulesetids.last][:rulematched]
+      Thread.current[@rulesetids.last][:rulematched]
     else
-      conditional_call = lambda {|n| Thread.current[:working_memory][n][:transient].nil? ? Thread.current[:working_memory][n][:value] : Thread.current[:working_memory][n][:block].call() }
-      Thread.current[:rulematched] = if vlist.inject(true) {|k,v| k ? k && conditional_call.call(v) : false }
+      Thread.current[@rulesetids.last][:rulematched] = if vlist.inject(true) {|k,v| raise UnknownFact.new("Fact: #{v} is unknown") if Thread.current[@rulesetids.last][:working_memory][v].nil? ;k ? k && conditional_call.call(v) : false }
                                        yield 
                                      end
     end
@@ -138,11 +158,11 @@ module Ruler
 # a rule that should fire if no others fire. You cannot have a default rule if you allow more
 # than one match.  The BadDefaultRule exception is raised.
   def default_rule &blk
-    raise BadDefaultRule.new("Can't have a default rule when multiple matches are allowed") unless Thread.current[:singletary]
-    if Thread.current[:singletary] && !Thread.current[:rulematched]
+    raise BadDefaultRule.new("Can't have a default rule when multiple matches are allowed") unless Thread.current[@rulesetids.last][:singletary]
+    if Thread.current[@rulesetids.last][:singletary] && !Thread.current[@rulesetids.last][:rulematched]
       yield
     else
-      Thread.current[:rulematched]
+      Thread.current[@rulesetids.last][:rulematched]
     end
   end
 end

data/spec/ruler_spec.rb

@@ -170,6 +170,35 @@ I think.
       end
     end
   end
+
+  def test_twelve
+    ruleset do
+      fact :one do
+        raise StandardError.new("This Should be Caught")
+      end
+    end
+  end
+
+  def test_thirteen
+    ruleset do
+      fact :one,true
+      fact :two, test_one
+      
+      rule [:one,:two] do
+        "Nested Works"
+      end
+    end
+  end
+
+  def test_fourteen
+    ruleset do
+      fact :one, true
+      rule [:noe] do
+        "Should Break"
+      end
+    end
+  end
+        
 end
 
 describe Rules do
@@ -231,5 +260,20 @@ describe Rules do
     lambda { r.test_eleven }.should raise_error
   end
 
+  it "should catch an exception thrown in a fact" do
+    r = Rules.new
+    lambda {r.test_twelve}.should raise_error(BadFact)
+  end
+
+  it "should support nested rulesets" do
+    r = Rules.new
+    r.test_thirteen.should == "Nested Works"
+  end
+
+  it "should thrown an error if an unknown fact is checked" do
+    r = Rules.new
+    lambda { r.test_fourteen }.should raise_error(UnknownFact)
+  end
+
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruler
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 3
   prerelease: false
   segments: 
   - 1
+  - 4
   - 2
-  - 0
-  version: 1.2.0
+  version: 1.4.2
 platform: ruby
 authors: 
 - Joshua Smith
@@ -15,12 +15,26 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-31 00:00:00 -05:00
+date: 2011-02-01 00:00:00 -05:00
 default_executable: example.rb
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
   version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: uuid
+  requirement: *id001
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -32,11 +46,11 @@ dependencies:
         - 0
         version: 2.3.0
   name: rspec
-  requirement: *id001
+  requirement: *id002
   type: :development
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -48,11 +62,11 @@ dependencies:
         - 0
         version: 1.0.0
   name: bundler
-  requirement: *id002
+  requirement: *id003
   type: :development
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -64,11 +78,11 @@ dependencies:
         - 2
         version: 1.5.2
   name: jeweler
-  requirement: *id003
+  requirement: *id004
   type: :development
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -78,11 +92,11 @@ dependencies:
         - 0
         version: "0"
   name: rcov
-  requirement: *id004
+  requirement: *id005
   type: :development
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -92,7 +106,7 @@ dependencies:
         - 0
         version: "0"
   name: mocha
-  requirement: *id005
+  requirement: *id006
   type: :development
 description: Ruler module implements a DSL that makes it easy to write a set of facts and rules.  If you have some tricky conditional logic, Ruler can help clear it up.
 email: kognate@gmail.com