ruler 1.0.0 → 1.2.0

data/Rakefile

@@ -16,7 +16,7 @@ Jeweler::Tasks.new do |gem|
   gem.homepage = "http://github.com/BlueFrogGaming/ruler"
   gem.license = "MIT"
   gem.summary = %Q{Ruby DSL to help with rules and facts}
-  gem.description = %Q{Longer description of your gem}
+  gem.description = %Q{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.}
   gem.email = "kognate@gmail.com"
   gem.authors = ["Joshua Smith"]
   # Include your dependencies below. Runtime dependencies are required when using your gem,

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.2.0

data/bin/example.rb

@@ -1,4 +1,4 @@
-
+#!/usr/bin/env ruby
 require 'rubygems'
 require 'lib/ruler'
 

data/lib/ruler.rb

@@ -8,7 +8,13 @@
 # Copyright:: (c) 2011 Blue Frog Gaming, All Rights Reserved
 # License:: This file has no public license.  
 
-class BadDefaultRule < StandardError
+class RulerError < StandardError
+end
+
+class BadDefaultRule < RulerError
+end
+
+class BadNotCall < RulerError
 end
 
 module Ruler
@@ -73,19 +79,28 @@ module Ruler
 # will never be used.
   def fact name, dval = nil, &blk
     if dval.nil?
-      Thread.current[:working_memory][name] = yield
+      Thread.current[:working_memory][name] = {:value => yield }
     else
-      Thread.current[:working_memory][name] = dval
+      Thread.current[: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 }
+  end
 
-# allows for a fact to be NOT another fact.  
+# allows for a fact to be NOT another fact.  notf cannot be used with a dynamic_fact
 # for example:
 #     fact :one, 10 == 10
 #     fact :notfone, not(:one)
   def notf name
-    not(Thread.current[:working_memory][name])
+    if Thread.current[:working_memory][name][:transient]
+      raise BadNotCall.new("Cannot call notf on dynamic fact")
+    else
+      not(Thread.current[:working_memory][name][:value])
+    end
   end
 
 # a rule takes a list of fact names and a block.  Rules are evaluated in the order
@@ -101,7 +116,7 @@ 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 "|=-\t#{va} = #{Thread.current[:working_memory][va]}" }
+    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()}" }
     if @DEBUG
       puts "---------------------------------------"
       puts vlist.join(" & ")
@@ -112,8 +127,8 @@ module Ruler
     if Thread.current[:singletary] && Thread.current[:rulematched]
       Thread.current[:rulematched]
     else
-      
-      Thread.current[:rulematched] = if vlist.inject(true) {|k,v| k ? k && Thread.current[:working_memory][v] : false }
+      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 }
                                        yield 
                                      end
     end

data/spec/ruler_spec.rb

@@ -137,6 +137,39 @@ I think.
       end
     end
   end
+
+  def test_ten 
+    #@DEBUG = true
+    ruleset do
+      dynamic_fact :one do
+        self.checking_method
+      end
+      
+      fact :wrong, false
+
+      rule [:one, :wrong] do
+        false
+      end
+
+      rule [:one, :one, :wrong] do
+        false
+      end
+    end
+  end
+
+  def test_eleven
+    ruleset do
+      dynamic_fact :one do 
+        true
+      end
+      
+      fact :two, notf(:one)
+      
+      default_rule do
+        true
+      end
+    end
+  end
 end
 
 describe Rules do
@@ -187,5 +220,16 @@ describe Rules do
     lambda { r.test_nine.should}.should raise_error
   end
 
+  it "should call dynamic rules each time they are evaluated" do
+    r = Rules.new
+    r.expects(:checking_method).times(3).returns(true)
+    r.test_ten.should be(nil)
+  end
+
+  it "should throw an exception if a dyanmic fact is declared in a notf" do
+    r = Rules.new
+    lambda { r.test_eleven }.should raise_error
+  end
+
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruler
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 31
   prerelease: false
   segments: 
   - 1
+  - 2
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Joshua Smith
@@ -94,7 +94,7 @@ dependencies:
   name: mocha
   requirement: *id005
   type: :development
-description: Longer description of your gem
+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
 executables: 
 - example.rb