wongi-engine 0.3.2 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 31288187561162fa80c551275812a33dac1b1ce0
-  data.tar.gz: d296f211ba4575ccab21182d03d9588e2910482f
+SHA256:
+  metadata.gz: 5d9f803da98de1a0ec47f26a1adc83940f6ef2d3e8dbfc3dbfb9527c9efe4daf
+  data.tar.gz: 3d1ace03974a04999b3e4f969c64d0bad2b4da99dc11606db06b1723d056b881
 SHA512:
-  metadata.gz: c63c6fa2e5ff49de30f6c6761c20df5c8d1935e51a460e8a9c8f4ae898e710a88810e630c127dd18ec83c73a490d718f4076b48b367961f08343f8bfba61bcc2
-  data.tar.gz: 404bbafd48cb571a8baaa657d6af5c4cec93492f54321e61e863f009e3aed867b1165b4e1c5afff9422803de7451c7ed25ba8c9d9721ebb1c9c63cccb60b428f
+  metadata.gz: e7d0c9d09716e02cb60256f048b97d04742733e8587c110a8e3b80b0f641e0bc213f8a3baea543f89a3f4f454a7f9f987321b66b0ed6decd530d7ec568cdbe11
+  data.tar.gz: e5e3f2158f9975ad23aa7c4115886c17c4b92529967d97395f39c7a28d608dcf2adc7827cecdc9b6bcb1dd8200699c9ad61c8997e638c07cb15534bdbaa61701

data/.travis.yml

@@ -1,10 +1,13 @@
 language: ruby
 rvm:
-- 2.1.10
-- 2.2.6
-- 2.3.3
-- 2.4.0
-- jruby-9.0
+- 2.1
+- 2.2
+- 2.3
+- 2.4
+- 2.5
+- 2.6
+- 2.7
+- jruby
 sudo: false
 notifications:
   hipchat:

data/lib/wongi-engine/beta/ncc_node.rb

@@ -58,7 +58,7 @@ module Wongi
       def refresh_child child
         tokens.each do |token|
           if token.ncc_results.empty?
-            child.beta_activate Token.new( child, t, nil, { } )
+            child.beta_activate Token.new( child, token, nil, { } )
           end
         end
       end

data/lib/wongi-engine/beta/production_node.rb

@@ -1,6 +1,6 @@
 module Wongi
   module Engine
-    
+
     class ProductionNode < BetaMemory
 
       attr_accessor :tracer

data/lib/wongi-engine/compiler.rb

@@ -49,7 +49,7 @@ module Wongi::Engine
     def join_node(condition, tests, assignment)
       alpha = rete.compile_alpha(condition)
       beta_memory
-      self.node = if existing = node.children.find { |n| n.is_a?(JoinNode) && n.equivalent?(alpha, tests, assignment) }
+      self.node = if existing = node.children.find { |n| n.is_a?(JoinNode) && n.equivalent?(alpha, tests, assignment) && !n.children.map(&:class).include?(Wongi::Engine::OrNode) }
         existing
       else
         JoinNode.new(node, tests, assignment).tap do |join|

data/lib/wongi-engine/dsl/action/simple_action.rb

@@ -32,7 +32,7 @@ module Wongi::Engine
         elsif @deaction.respond_to? :call
           @deaction.call token
         elsif @deaction.respond_to? :deexecute
-          @deaction.execute token
+          @deaction.deexecute token
         end
       end
 
@@ -43,7 +43,7 @@ module Wongi::Engine
         elsif @reaction.respond_to? :call
           @reaction.call token, newtoken
         elsif @reaction.respond_to? :reexecute
-          @reaction.execute token, newtoken
+          @reaction.reexecute token, newtoken
         end
       end
 

data/lib/wongi-engine/dsl.rb

@@ -81,9 +81,15 @@ module Wongi::Engine::DSL
     clause :less
     accept Wongi::Engine::LessThanTest
 
+    clause :lte
+    accept Wongi::Engine::LessThanOrEqualTest
+
     clause :greater
     accept Wongi::Engine::GreaterThanTest
 
+    clause :gte
+    accept Wongi::Engine::GreaterThanOrEqualTest
+
     clause :assert, :dynamic
     accept Wongi::Engine::AssertingTest
 

data/lib/wongi-engine/filter/greater_than_or_equal_test.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+module Wongi::Engine
+  class GreaterThanOrEqualTest < FilterTest
+    attr_reader :x, :y
+
+    def initialize(x, y)
+      @x = x
+      @y = y
+    end
+
+    def passes?(token)
+      x = if Template.variable? @x
+            token[@x]
+          else
+            @x
+      end
+
+      y = if Template.variable? @y
+            token[@y]
+          else
+            @y
+      end
+
+      return false if x == :_ || y == :_
+      x >= y
+    end
+
+    def ==(other)
+      super && x == other.x && y == other.y
+    end
+  end
+end

data/lib/wongi-engine/filter/less_than_or_equal_test.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+module Wongi::Engine
+  class LessThanOrEqualTest < FilterTest
+    attr_reader :x, :y
+
+    def initialize(x, y)
+      @x = x
+      @y = y
+    end
+
+    def passes?(token)
+      x = if Template.variable? @x
+            token[@x]
+          else
+            @x
+      end
+
+      y = if Template.variable? @y
+            token[@y]
+          else
+            @y
+      end
+
+      return false if x == :_ || y == :_
+      x <= y
+    end
+
+    def ==(other)
+      super && x == other.x && y == other.y
+    end
+  end
+end

data/lib/wongi-engine/filter.rb

@@ -3,4 +3,6 @@ require 'wongi-engine/filter/equality_test'
 require 'wongi-engine/filter/inequality_test'
 require 'wongi-engine/filter/asserting_test'
 require 'wongi-engine/filter/less_than_test'
-require 'wongi-engine/filter/greater_than_test'
+require 'wongi-engine/filter/greater_than_test'
+require 'wongi-engine/filter/less_than_or_equal_test'
+require 'wongi-engine/filter/greater_than_or_equal_test'

data/lib/wongi-engine/version.rb

@@ -1,5 +1,5 @@
 module Wongi
   module Engine
-    VERSION = "0.3.2"
+    VERSION = "0.3.6"
   end
 end

data/spec/action_class_spec.rb

@@ -0,0 +1,62 @@
+require 'spec_helper'
+
+
+describe 'action classes' do
+
+	include Wongi::Engine::DSL
+
+  let :engine do
+  	Wongi::Engine.create
+  end
+
+  let :action_class do
+  	Class.new do
+  		class << self
+  			attr_accessor :execute_body
+  			attr_accessor :deexecute_body
+  		end
+
+  		def execute(token)
+  			self.class.execute_body.call(token)
+  		end
+
+  		def deexecute(token)
+  			self.class.deexecute_body.call(token)
+  		end
+  	end
+  end
+
+  it 'should have appropriate callbacks executed' do
+
+  	executed = 0
+  	deexecuted = 0
+
+  	klass = action_class
+
+  	klass.execute_body = lambda do |token|
+  		executed += 1
+  	end
+  	klass.deexecute_body = lambda do |token|
+  		deexecuted += 1
+  	end
+
+  	engine << rule {
+  		forall {
+  			has :A, :x, :B
+  		}
+  		make {
+  			action klass
+  		}
+  	}
+
+  	engine << [1, :x, 2]
+  	expect(executed).to be == 1
+  	expect(deexecuted).to be == 0
+
+  	engine.retract [1, :x, 2]
+  	expect(executed).to be == 1
+  	expect(deexecuted).to be == 1
+
+  end
+
+end

data/spec/filter_specs/greater_than_equality_test_spec.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'Greater Than Or Equal test' do
+  before :each do
+    @engine = Wongi::Engine.create
+  end
+
+  attr_reader :engine
+
+  attr_reader :production
+
+  def test_rule(&block)
+    @production = (engine << rule('test-rule', &block))
+  end
+
+  it 'should interact with optional node correctly' do
+    # before the fix, filters would try to piggy-back on optional templates
+
+    test_rule do
+      forall do
+        has :Number, :assign_check, :_
+        gte :Number, 6
+      end
+    end
+
+    engine << [6, :assign_check, nil]
+    engine << [7, :assign_check, nil]
+    engine << [5, :assign_check, nil]
+    expect(@production.size).to eq(2)
+  end
+end

data/spec/filter_specs/less_than_equality_test_spec.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'Less Than Or Equal test' do
+  before :each do
+    @engine = Wongi::Engine.create
+  end
+
+  attr_reader :engine
+
+  attr_reader :production
+
+  def test_rule(&block)
+    @production = (engine << rule('test-rule', &block))
+  end
+
+  it 'should interact with optional node correctly' do
+    # before the fix, filters would try to piggy-back on optional templates
+
+    test_rule do
+      forall do
+        has :Number, :assign_check, :_
+        lte :Number, 6
+      end
+    end
+
+    engine << [5, :assign_check, nil]
+    engine << [6, :assign_check, nil]
+    engine << [7, :assign_check, nil] #should not pass
+    expect(@production.size).to eq(2)
+  end
+end

data/spec/rule_specs/any_rule_spec.rb

@@ -106,4 +106,73 @@ describe "ANY rule" do
     end
   end
 
+  describe "ordering rules" do
+    let :any_stale_pastry_rule do
+      rule do
+        forall {
+          # has :A, :name, :Name # uncomment this line will make test pass
+          any {
+            option {
+              has :A, :name, 'Donut'
+            }
+            option {
+              has :A, :name, 'Cookie'
+            }
+          }
+          has :A, :condition, 'stale' # moving this line above 'any' will make test pass
+        }
+        make {
+          collect :A, :stale_pastries
+        }
+      end
+    end
+
+    let :fresh_donut_rule do
+      rule do
+        forall {
+          has :A, :name, 'Donut'
+          has :A, :condition, 'fresh'
+        }
+        make {
+          collect :A, :fresh_donuts
+        }
+      end
+    end
+
+    let :fresh_cookie_rule do
+      rule do
+        forall {
+          # swapping the following lines will make test pass
+          has :A, :name, 'Cookie'
+          has :A, :condition, 'fresh'
+        }
+        make {
+          collect :A, :fresh_cookies
+        }
+      end
+    end
+
+    before do
+      engine << any_stale_pastry_rule # commenting this rule, or moving it to end of rules will make test pass
+
+      engine << fresh_donut_rule
+      engine << fresh_cookie_rule # commenting this rule will make test pass
+
+      engine << [:donut, :name, 'Donut']
+      engine << [:donut, :condition, 'fresh']
+    end
+
+    it 'has no fresh cookies' do
+      # this expectation fails; the collection contains [:donut]!
+      expect(engine.collection(:fresh_cookies)).to match_array([])
+    end
+
+    it 'has one fresh donut' do
+      expect(engine.collection(:fresh_donuts)).to match_array([:donut])
+    end
+
+    it 'has no stale pastries' do
+      expect(engine.collection(:stale_pastries)).to match_array([])
+    end
+  end
 end

data/spec/rule_specs/ncc_spec.rb

@@ -255,4 +255,20 @@ describe Wongi::Engine::NccNode do
     expect(engine.find "StudentA", :passes_for, "CourseC").to be_nil
   end
 
+  specify 'regression #71' do
+    prod = engine << rule {
+      forall {
+        none {
+          has "TestSet", :contains, :B
+          has "MatchSet", :contains, :B
+        }
+      }
+    }
+    engine << ["TestSet", :contains, "not matching"]
+    engine << ["MatchSet", :contains, "match 1"]
+    engine << ["MatchSet", :contains, "match 2"]
+
+    expect(prod).to have(1).tokens
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wongi-engine
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.6
 platform: ruby
 authors:
 - Valeri Sokolov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-10-21 00:00:00.000000000 Z
+date: 2021-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -131,8 +131,10 @@ files:
 - lib/wongi-engine/filter/asserting_test.rb
 - lib/wongi-engine/filter/equality_test.rb
 - lib/wongi-engine/filter/filter_test.rb
+- lib/wongi-engine/filter/greater_than_or_equal_test.rb
 - lib/wongi-engine/filter/greater_than_test.rb
 - lib/wongi-engine/filter/inequality_test.rb
+- lib/wongi-engine/filter/less_than_or_equal_test.rb
 - lib/wongi-engine/filter/less_than_test.rb
 - lib/wongi-engine/graph.rb
 - lib/wongi-engine/network.rb
@@ -144,12 +146,15 @@ files:
 - lib/wongi-engine/version.rb
 - lib/wongi-engine/wme.rb
 - lib/wongi-engine/wme_match_data.rb
+- spec/action_class_spec.rb
 - spec/beta_node_spec.rb
 - spec/bug_specs/issue_4_spec.rb
 - spec/dataset_spec.rb
 - spec/dsl_spec.rb
 - spec/filter_specs/assert_test_spec.rb
+- spec/filter_specs/greater_than_equality_test_spec.rb
 - spec/filter_specs/less_test_spec.rb
+- spec/filter_specs/less_than_equality_test_spec.rb
 - spec/generation_spec.rb
 - spec/high_level_spec.rb
 - spec/network_spec.rb
@@ -170,7 +175,7 @@ homepage: https://github.com/ulfurinn/wongi-engine
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -185,18 +190,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: A forward-chaining rule engine in pure Ruby.
 test_files:
+- spec/action_class_spec.rb
 - spec/beta_node_spec.rb
 - spec/bug_specs/issue_4_spec.rb
 - spec/dataset_spec.rb
 - spec/dsl_spec.rb
 - spec/filter_specs/assert_test_spec.rb
+- spec/filter_specs/greater_than_equality_test_spec.rb
 - spec/filter_specs/less_test_spec.rb
+- spec/filter_specs/less_than_equality_test_spec.rb
 - spec/generation_spec.rb
 - spec/high_level_spec.rb
 - spec/network_spec.rb