wongi-engine 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3f9d2adf82d8e36010a2ea956c308d58c073673cba49013352c420ed69180e5
-  data.tar.gz: 792ee293fce552b92c516f17749253fe9c6ba6c72f8b8e4c751b32b7f87902a6
+  metadata.gz: 5d9f803da98de1a0ec47f26a1adc83940f6ef2d3e8dbfc3dbfb9527c9efe4daf
+  data.tar.gz: 3d1ace03974a04999b3e4f969c64d0bad2b4da99dc11606db06b1723d056b881
 SHA512:
-  metadata.gz: 319936296084020880b58d775a241eaa575bfce12246fac060e8150a0ff97a30aa7558653c771548616b7a1d0da450fa625dc11ce9ceca490cdf8affd2005231
-  data.tar.gz: 8f7397d233f1eb4cd714c0c69caa866cd18dd42a3304bc19c263662bafb122382b9be50ffd101bb9dacf50a9c4ce11804b4071dfefefeda6d72a38d60074b8f0
+  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/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/version.rb

@@ -1,5 +1,5 @@
 module Wongi
   module Engine
-    VERSION = "0.3.5"
+    VERSION = "0.3.6"
   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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wongi-engine
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Valeri Sokolov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-20 00:00:00.000000000 Z
+date: 2021-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -175,7 +175,7 @@ homepage: https://github.com/ulfurinn/wongi-engine
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -190,9 +190,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: A forward-chaining rule engine in pure Ruby.
 test_files: