wongi-engine 0.4.0.pre.alpha1 → 0.4.0.pre.alpha3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf15effd33cba1faca7c6b2a6ce8b8a4730981a9b778fb5d41e11b4dce7803f8
-  data.tar.gz: 8d3cc0c99061e7097747b4339c55a83c11e79bb0edfbba4a0c95e4c850301595
+  metadata.gz: d3401b29a9b186b8594549d45feddda88e885dae9a03d42f7006ad7e6fecbd0b
+  data.tar.gz: c315eb40f0c2a05d6a5995016fd700b6ecdb7795588fa929b81b68d86722c481
 SHA512:
-  metadata.gz: 7140c583e23389df8f5c959b7ed31220782d72afcbd10f0883ba7314f24534656f1ca3fed33ed9d49a7962da8cbe7535f48bf160be88eef86d3798efe7ccece5
-  data.tar.gz: 3f0e9957b8497666a25c3ac933bcfe93495ed2c4cdac2f4eb27468c95401a107139f6a23840816241f94c0811edf69ab373818dd33def938d3ae9450505c68b5
+  metadata.gz: ac9b80adde1174fec2361b6411d500a2c5c3c4c2659bac11d42bc630b088ccede7e3bf7d407560d099206daec5da97b0379d4c949e9891c9981d2f5847a815aa
+  data.tar.gz: 03fa343a219317c31384446debde04894d00841bd6b780a45af31968fc5a1af8fb5ca04f2d6bf17bd445e046ab8de76828c797da47ac89f68715405e128a404a

data/.rubocop.yml

@@ -42,9 +42,6 @@ Naming/MethodParameterName:
 Layout/LineLength:
   Enabled: false
 
-RSpec:
-  Enabled: false
-
 Style/SafeNavigation:
   Enabled: false
 

data/README.md

@@ -11,7 +11,7 @@ Ruby >= 2.7 and JRuby are supported. Rubinius should work but isn't actively sup
 
 There is no API documentation, as most of the library's interfaces are for internal use only and would not be safe to use directly.
 
-Instead, follow the [tutorial](http://ulfurinn.github.io/wongi-engine/) and stick to the constructs described in it.
+Instead, follow the [tutorial](https://ulfurinn.github.io/wongi-engine/) and stick to the constructs described in it.
 
 ## Upgrading
 

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

@@ -62,7 +62,8 @@ module Wongi::Engine
       # # TODO: optimise: only clean up if the value changed
       beta_deactivate_children(token: token)
 
-      candidates = select_wmes(alpha.template) { |asserted_wme| matches?(token, asserted_wme) }
+      template = specialize(alpha.template, tests, token)
+      candidates = select_wmes(template) { |asserted_wme| matches?(token, asserted_wme) }
 
       return if candidates.empty?
 

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

@@ -61,6 +61,15 @@ module Wongi::Engine
       rete.current_overlay.select(template)
     end
 
+    private def specialize(template, tests, token)
+      tests.each_with_object(template.dup) do |test, template|
+        var = test.variable
+        if token.has_var?(var)
+          template.public_send("#{test.field}=", token[var])
+        end
+      end
+    end
+
     def tokens
       overlay.node_tokens(self)
     end

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

@@ -65,7 +65,8 @@ module Wongi
 
         overlay.add_token(token)
 
-        select_wmes(alpha.template).each do |wme|
+        template = specialize(alpha.template, tests, token)
+        select_wmes(template).each do |wme|
           next unless matches?(token, wme)
 
           assignments = collect_assignments(wme)
@@ -93,7 +94,7 @@ module Wongi
       protected
 
       def matches?(token, wme)
-        @tests.each do |test|
+        tests.each do |test|
           return false unless test.matches?(token, wme)
         end
         true

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

@@ -25,7 +25,7 @@ module Wongi
         overlay.remove_token(token)
         return unless owner
 
-        ncc.ncc_activate owner if overlay.ncc_tokens_for(owner).empty?
+        ncc.ncc_activate(owner) if overlay.ncc_tokens_for(owner).empty?
       end
 
       def owner_for(token)

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

@@ -5,17 +5,16 @@ module Wongi
     class NegNode < BetaNode
       attr_reader :alpha, :tests
 
-      def initialize(parent, tests, alpha, unsafe)
+      def initialize(parent, tests, alpha)
         super(parent)
         @tests = tests
         @alpha = alpha
-        @unsafe = unsafe
       end
 
       def alpha_activate(wme, children: self.children)
         # p alpha_activate: {class: self.class, object_id:, wme:}
         tokens.each do |token|
-          next unless matches?(token, wme) && (@unsafe || !token.generated?(wme)) # feedback loop protection
+          next unless matches?(token, wme)
 
           # order matters for proper invalidation
           overlay.add_neg_join_result(NegJoinResult.new(token, wme))
@@ -44,7 +43,9 @@ module Wongi
         return if tokens.find { |t| t.duplicate? token }
 
         overlay.add_token(token)
-        select_wmes(alpha.template).each do |wme|
+
+        template = specialize(alpha.template, tests, token)
+        select_wmes(template).each do |wme|
           overlay.add_neg_join_result(NegJoinResult.new(token, wme)) if matches?(token, wme)
         end
         return if overlay.neg_join_results_for(token: token).any?
@@ -69,8 +70,6 @@ module Wongi
         end
       end
 
-      protected
-
       def matches?(token, wme)
         puts "matching #{wme} against #{token}" if debug?
         @tests.each do |test|

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

@@ -55,8 +55,10 @@ module Wongi
         return if tokens.find { |t| t.duplicate? token }
 
         overlay.add_token(token)
+
         match = false
-        select_wmes(alpha.template).each do |wme|
+        template = specialize(alpha.template, tests, token)
+        select_wmes(template).each do |wme|
           assignments = collect_assignments(wme)
           next unless matches? token, wme
 

data/lib/wongi-engine/compiler.rb

@@ -42,9 +42,9 @@ module Wongi::Engine
       node.tap(&:refresh)
     end
 
-    def neg_node(condition, tests, unsafe)
+    def neg_node(condition, tests)
       alpha = rete.compile_alpha(condition)
-      self.node = NegNode.new(node, tests, alpha, unsafe).tap do |node|
+      self.node = NegNode.new(node, tests, alpha).tap do |node|
         alpha.betas << node unless alpha_deaf
         node.refresh
       end

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

@@ -1,3 +1,5 @@
+require "set"
+
 module Wongi::Engine
   module DSL::Action
     class StatementGenerator < BaseAction
@@ -16,23 +18,45 @@ module Wongi::Engine
         subject, predicate, object = template.resolve!(token)
 
         wme = WME.new(subject, predicate, object)
-
-        origin = GeneratorOrigin.new(token, self)
+        wme = overlay.find(wme) || wme
 
         production.tracer.trace(action: self, wme: wme) if production.tracer
-        if (existing = overlay.find(wme))
-          # do not mark purely manual tokens as generated, because a circular rule such as the symmetric friend generator this would cause both sides to become self-sustaining
-          # TODO: but this may have to be smarter, because there may be more indirect ways of creating such a situation
-          if overlay.generated?(wme)
-            token.generated_wmes << existing
-            overlay.assert(existing, generator: origin)
-          end
-        else
+
+        if should_assert?(wme, token)
+          origin = GeneratorOrigin.new(token, self)
           token.generated_wmes << wme
           overlay.assert(wme, generator: origin)
         end
       end
 
+      private def should_assert?(wme, token)
+        considered_tokens = Set.new
+        tokens_to_consider = [token]
+        until tokens_to_consider.empty?
+          token = tokens_to_consider.shift
+          considered_tokens.add(token)
+
+          # self-affirming reasoning
+          return false if token.wme == wme
+
+          # asserting this WME would invalidate the match
+          return false if token.node.is_a?(NegNode) && token.node.matches?(token, wme)
+
+          if token.parent && !considered_tokens.include?(token.parent)
+            tokens_to_consider.push(token.parent)
+          end
+
+          if token.wme
+            overlay.generators(token.wme).each do |generator|
+              tokens_to_consider.push(generator.token) unless considered_tokens.include?(generator.token)
+            end
+          end
+        end
+
+        # we could not prove that the new WME should not be asserted
+        true
+      end
+
       def deexecute(token)
         origin = GeneratorOrigin.new(token, self)
 

data/lib/wongi-engine/dsl/clause/fact.rb

@@ -5,7 +5,6 @@ module Wongi::Engine
       attr_predicate :debug
 
       def initialize(s, p, o, options = {})
-        @unsafe = options[:unsafe] || false
         debug! if options[:debug]
         super(s, p, o)
       end
@@ -43,13 +42,11 @@ module Wongi::Engine
     end
 
     class Neg < Has
-      attr_reader :unsafe
-
       def compile(context)
         tests, assignment = parse_variables(context)
         raise DefinitionError, "Negative matches may not introduce new variables: #{assignment.variables}" unless assignment.root?
 
-        context.tap { |c| c.neg_node(self, tests, unsafe) }
+        context.tap { |c| c.neg_node(self, tests) }
       end
 
       def inspect

data/lib/wongi-engine/version.rb

@@ -1,5 +1,5 @@
 module Wongi
   module Engine
-    VERSION = "0.4.0-alpha1".freeze
+    VERSION = "0.4.0-alpha3".freeze
   end
 end

data/spec/action_class_spec.rb

@@ -23,7 +23,7 @@ describe 'action classes' do
     end
   end
 
-  it 'should have appropriate callbacks executed' do
+  it 'has appropriate callbacks executed' do
     executed = 0
     deexecuted = 0
 

data/spec/{rule_specs/aggregate_spec.rb → aggregate_spec.rb}

@@ -9,7 +9,7 @@ describe 'aggregate' do
   let(:production) { engine.productions[rule_name] }
 
   context 'generic clause' do
-    it 'should return a single token' do
+    it 'returns a single token' do
       engine << rule(rule_name) do
         forall {
           aggregate :_, :weight, :_, on: :object, function: :min, assign: :X

data/spec/{rule_specs/any_rule_spec.rb → any_rule_spec.rb}

@@ -6,7 +6,7 @@ describe "ANY rule" do
   let(:engine) { Wongi::Engine.create }
 
   context "with just one option" do
-    it "should act like a positive matcher" do
+    it "acts like a positive matcher" do
       engine << rule('one-option') {
         forall {
           any {
@@ -43,17 +43,17 @@ describe "ANY rule" do
       end
     end
 
-    it 'should fire on the first path' do
+    it 'fires on the first path' do
       engine << [:x, :path1, true]
       expect(production.tokens).to have(1).item
     end
 
-    it 'should fire on the second path' do
+    it 'fires on the second path' do
       engine << [:x, :path2, true]
       expect(production.tokens).to have(1).item
     end
 
-    it 'should fire twice on both paths at once and be retractable' do
+    it 'fires twice on both paths at once and be retractable' do
       engine << [:x, :path1, true]
       engine << [:x, :path2, true]
       expect(production.tokens).to have(2).items

data/spec/{filter_specs/assert_test_spec.rb → assert_test_spec.rb}

@@ -10,7 +10,7 @@ describe "ASSERT test" do
     @production = (engine << rule('test-rule', &block))
   end
 
-  it "should pass with a constant 'true'" do
+  it "passes with a constant 'true'" do
     test_rule {
       forall {
         assert { |_token|
@@ -22,7 +22,7 @@ describe "ASSERT test" do
     expect(production).to have(1).token
   end
 
-  it "should fail with a constant 'false'" do
+  it "fails with a constant 'false'" do
     test_rule {
       forall {
         assert { |_token|
@@ -34,7 +34,7 @@ describe "ASSERT test" do
     expect(production).to have(0).tokens
   end
 
-  it "should use the token with no arguments" do
+  it "uses the token with no arguments" do
     test_rule {
       forall {
         has :X, "is", :Y
@@ -50,7 +50,7 @@ describe "ASSERT test" do
     expect(production.tokens.first[:X]).to eq("resistance")
   end
 
-  it "should be retractable" do
+  it "is retractable" do
     test_rule {
       forall {
         has :X, "is", :Y
@@ -65,7 +65,7 @@ describe "ASSERT test" do
     expect(production).to have(0).tokens
   end
 
-  it "should use individual variables with arguments" do
+  it "uses individual variables with arguments" do
     test_rule {
       forall {
         has :X, "is", :Y

data/spec/{rule_specs/assign_spec.rb → assign_spec.rb}

@@ -4,7 +4,7 @@ describe "ASSIGN rule" do
   include Wongi::Engine::DSL
   let(:engine) { Wongi::Engine.create }
 
-  it "should assign simple expressions" do
+  it "assigns simple expressions" do
     production = engine << rule {
       forall {
         assign :X do
@@ -16,7 +16,7 @@ describe "ASSIGN rule" do
     expect(production.tokens.first[:X]).to eq(42)
   end
 
-  it 'should be available in the make section' do
+  it 'is available in the make section' do
     production = engine << rule {
       forall {
         has 1, 2, :X
@@ -32,7 +32,7 @@ describe "ASSIGN rule" do
     expect(production.tokens.first[:Y]).to be == 42
   end
 
-  it "should be able to access previous assignments" do
+  it "is able to access previous assignments" do
     production = engine << rule {
       forall {
         has 1, 2, :X
@@ -46,7 +46,7 @@ describe "ASSIGN rule" do
     expect(production.tokens.first[:Y]).to eq(10)
   end
 
-  it 'should be deactivatable' do
+  it 'is deactivatable' do
     prod = engine << rule {
       forall {
         has 1, 2, :X
@@ -62,7 +62,7 @@ describe "ASSIGN rule" do
     expect(prod).to have(0).tokens
   end
 
-  it 'should be evaluated once' do
+  it 'is evaluated once' do
     x = 0
     engine << rule {
       forall {
@@ -80,7 +80,7 @@ describe "ASSIGN rule" do
     expect(x).to be == 1
   end
 
-  it 'should handle booleans' do
+  it 'handles booleans' do
     engine << rule do
       forall {
         has :a, :b, :c

data/spec/{rule_specs/assuming_spec.rb → assuming_spec.rb}

@@ -4,7 +4,7 @@ describe Wongi::Engine::AssumingClause do
   include Wongi::Engine::DSL
   let(:engine) { Wongi::Engine.create }
 
-  it 'should include base rules' do
+  it 'includes base rules' do
     engine << rule(:base) {
       forall {
         has :x, :y, :Z
@@ -26,7 +26,7 @@ describe Wongi::Engine::AssumingClause do
     expect(result).to eq(1 => :a, 2 => :b)
   end
 
-  it 'should check for base rule\'s existence' do
+  it 'checks for base rule''s existence' do
     f = lambda {
       engine << rule {
         forall {
@@ -38,7 +38,7 @@ describe Wongi::Engine::AssumingClause do
     expect(&f).to raise_error Wongi::Engine::UndefinedBaseRule
   end
 
-  it 'should come first in a rule' do
+  it 'comes first in a rule' do
     f = lambda {
       engine << rule(:base) {
         forall {

data/spec/beta_node_spec.rb

@@ -6,7 +6,7 @@ describe Wongi::Engine::BetaNode do
   let(:engine) { Wongi::Engine.create }
 
   describe '#tokens' do
-    it 'should be enumerable' do
+    it 'is enumerable' do
       production = engine << rule {
         forall {
           has :x, :y, :Z

data/spec/bug_specs/issue_4_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe "issue 4" do
-  it "should correctly retract pre-added items from within a rule" do
+  it "correctlies retract pre-added items from within a rule" do
     engine = Wongi::Engine.create
 
     10.times { |i| engine << [i, :is_number, true] }
@@ -26,7 +26,7 @@ describe "issue 4" do
     expect(evens.size).to eq(10)
   end
 
-  it "should correctly retract post-added items from within a rule" do
+  it "correctlies retract post-added items from within a rule" do
     engine = Wongi::Engine.create
 
     engine.rule 'segregate' do
@@ -52,7 +52,7 @@ describe "issue 4" do
   end
 
   # cascaded processing affects this
-  it "should not retract later items from within a rule" do
+  it "does not retract later items from within a rule" do
     engine = Wongi::Engine.create
 
     10.times { |i| engine << [i, :is_number, true] }
@@ -85,7 +85,7 @@ describe "issue 4" do
     expect(odds.size).to eq(5)
   end
 
-  it "should not lose track when another rule affects a set" do
+  it "does not lose track when another rule affects a set" do
     engine = Wongi::Engine.create
 
     10.times { |i| engine << [i, :is_number, true] }

data/spec/dataset_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Wongi::Engine::Network do
   include Wongi::Engine::DSL
-  it 'should expose compiled productions' do
+  it 'exposes compiled productions' do
     ds = Wongi::Engine::Network.new
 
     ds << rule('test-rule') {

data/spec/generation_spec.rb

@@ -20,7 +20,7 @@ describe Wongi::Engine::DSL::Action::StatementGenerator do
   let(:production) { engine << transitive_rule }
 
   shared_examples 'generation' do
-    it 'should generate facts' do
+    it 'generates facts' do
       engine << %w[Alice relative Bob]
       engine << %w[Bob relative Dwight]
 
@@ -28,7 +28,7 @@ describe Wongi::Engine::DSL::Action::StatementGenerator do
       expect(engine.find(*%w[Alice relative Dwight])).not_to be_nil
     end
 
-    it 'should retrct generated facts' do
+    it 'retracts generated facts' do
       engine << %w[Alice relative Bob]
       engine << %w[Bob relative Dwight]
       engine.retract %w[Bob relative Dwight]
@@ -45,19 +45,19 @@ describe Wongi::Engine::DSL::Action::StatementGenerator do
         engine << %w[Claire relative Dwight]
       end
 
-      it 'should be created' do
+      it 'is created' do
         expect(production).to have(2).tokens
         expect(engine.find(*%w[Alice relative Dwight])).not_to be_nil
       end
 
-      it 'should remain after a single retraction' do
+      it 'remains after a single retraction' do
         engine.retract %w[Claire relative Dwight]
 
         expect(production).to have(1).token
         expect(engine.find(*%w[Alice relative Dwight])).not_to be_nil
       end
 
-      it 'should be destroyed after both retractions' do
+      it 'is destroyed after both retractions' do
         engine.retract %w[Claire relative Dwight]
         engine.retract %w[Alice relative Bob]
 
@@ -83,7 +83,7 @@ describe Wongi::Engine::DSL::Action::StatementGenerator do
 
     it_behaves_like 'generation'
 
-    it 'should not retract generated facts marked as manual', :wip do
+    it 'does not retract generated facts marked as manual', :wip do
       engine << %w[Alice relative Bob]
       engine << %w[Bob relative Dwight]
       engine << %w[Alice relative Dwight]
@@ -93,7 +93,7 @@ describe Wongi::Engine::DSL::Action::StatementGenerator do
       expect(engine.find(*%w[Alice relative Dwight])).not_to be_nil
     end
 
-    it 'should retract generated facts unmarked as manual', :wip do
+    it 'retracts generated facts unmarked as manual', :wip do
       engine << %w[Alice relative Bob]
       engine << %w[Bob relative Dwight]
       engine << %w[Alice relative Dwight]

data/spec/{filter_specs/greater_than_equality_test_spec.rb → greater_than_equality_test_spec.rb}

@@ -12,7 +12,7 @@ describe 'Greater Than Or Equal test' do
     @production = (engine << rule('test-rule', &block))
   end
 
-  it 'should interact with optional node correctly' do
+  it 'interacts with optional node correctly' do
     # before the fix, filters would try to piggy-back on optional templates
 
     test_rule do

data/spec/high_level_spec.rb

@@ -15,7 +15,7 @@ describe 'the engine' do
   let(:engine) { Wongi::Engine.create }
 
   context 'with a simple generative positive rule' do
-    it 'should generate wmes with an existing rule' do
+    it 'generates wmes with an existing rule' do
       engine << rule('symmetric') {
         forall {
           has :P, "symmetric", true
@@ -35,7 +35,7 @@ describe 'the engine' do
       expect(generated).to eq([Wongi::Engine::WME.new("Bob", "friend", "Alice")])
     end
 
-    it 'should generate wmes with an added rule' do
+    it 'generates wmes with an added rule' do
       engine << Wongi::Engine::WME.new("friend", "symmetric", true)
       engine << Wongi::Engine::WME.new("Alice", "friend", "Bob")
 
@@ -55,7 +55,7 @@ describe 'the engine' do
       expect(engine.facts.select { engine.current_overlay.manual?(_1) }.size).to eq(2)
     end
 
-    it 'should not get confused by recursive activations' do
+    it 'does not get confused by recursive activations' do
       engine << rule('reflexive') {
         forall {
           has :Predicate, "reflexive", true
@@ -76,7 +76,7 @@ describe 'the engine' do
     end
   end
 
-  it 'should check equality' do
+  it 'checks equality' do
     node = engine << rule('equality') {
       forall {
         fact :A, "same", :B
@@ -88,7 +88,7 @@ describe 'the engine' do
     expect(node.size).to eq(1)
   end
 
-  it 'should compare things' do
+  it 'compares things' do
     engine << rule('less') {
       forall {
         has :A, :age, :N1
@@ -121,7 +121,7 @@ describe 'the engine' do
     expect(items.size).to eq(1)
   end
 
-  it 'should use collectors' do
+  it 'uses collectors' do
     engine << rule('collector') {
       forall {
         has :X, :_, 42
@@ -139,7 +139,7 @@ describe 'the engine' do
     expect(collection.first).to eq("answer")
   end
 
-  it "should properly show error messages" do
+  it "properlies show error messages" do
     engine << rule("Error rule") {
       forall {
         has :_, :_, :TestNumber
@@ -156,7 +156,7 @@ describe 'the engine' do
     expect(error_messages).to eq(["An error has occurred"])
   end
 
-  it 'should use generic collectors' do
+  it 'uses generic collectors' do
     engine << rule('generic-collector') {
       forall {
         has :X, :_, 42
@@ -174,7 +174,7 @@ describe 'the engine' do
     expect(collection.first).to eq("answer")
   end
 
-  it 'should accept several rules' do
+  it 'accepts several rules' do
     expect {
       engine << rule('generic-collector') {
         forall {
@@ -196,7 +196,7 @@ describe 'the engine' do
     }.not_to raise_error
   end
 
-  it 'should process negative nodes' do
+  it 'processes negative nodes' do
     production = (engine << rule('negative') {
                     forall {
                       neg :_, :_, 42
@@ -220,14 +220,14 @@ describe 'the engine' do
       }
     end
 
-    it 'should run' do
+    it 'runs' do
       engine << ["answer", "is", 42]
       engine.execute "test-query", { X: "answer" }
       expect(engine.results["test-query"].size).to eq(1)
       expect(engine.results["test-query"].tokens.first[:Y]).to eq(42)
     end
 
-    it 'should run several times' do
+    it 'runs several times' do
       engine << ["answer", "is", 42]
       engine << %w[question is 6x9]
       engine.execute "test-query", { X: "answer" }

data/spec/{filter_specs/less_test_spec.rb → less_test_spec.rb}

@@ -10,7 +10,7 @@ describe "LESS test" do
     @production = (engine << rule('test-rule', &block))
   end
 
-  it "should interact with optional node correctly" do
+  it "interacts with optional node correctly" do
     # before the fix, filters would try to piggy-back on optional templates
 
     test_rule {

data/spec/{filter_specs/less_than_equality_test_spec.rb → less_than_equality_test_spec.rb}

@@ -12,7 +12,7 @@ describe 'Less Than Or Equal test' do
     @production = (engine << rule('test-rule', &block))
   end
 
-  it 'should interact with optional node correctly' do
+  it 'interacts with optional node correctly' do
     # before the fix, filters would try to piggy-back on optional templates
 
     test_rule do

data/spec/{rule_specs/maybe_rule_spec.rb → maybe_rule_spec.rb}

@@ -12,7 +12,7 @@ describe "MAYBE rule" do
     }
   }
 
-  it "should pass with existing facts" do
+  it "passes with existing facts" do
     production = engine << maybe_rule
 
     engine << [1, 2, 3]
@@ -24,7 +24,7 @@ describe "MAYBE rule" do
     expect(production.tokens.first[:Y]).to eq(5)
   end
 
-  it "should pass with missing facts" do
+  it "passes with missing facts" do
     production = engine << maybe_rule
 
     engine << [1, 2, 3]
@@ -35,7 +35,7 @@ describe "MAYBE rule" do
     expect(production.tokens.first[:Y]).to be_nil
   end
 
-  it "should pass with pre-added missing facts" do
+  it "passes with pre-added missing facts" do
     engine << [1, 2, 3]
 
     production = engine << maybe_rule
@@ -46,7 +46,7 @@ describe "MAYBE rule" do
     expect(production.tokens.first[:Y]).to be_nil
   end
 
-  it 'should pass with retracted facts' do
+  it 'passes with retracted facts' do
     prod = engine << maybe_rule
 
     engine << [1, 2, 3]
@@ -59,7 +59,7 @@ describe "MAYBE rule" do
     expect(prod.tokens.first[:Y]).to be_nil
   end
 
-  it 'should work with repeated activations' do
+  it 'works with repeated activations' do
     prod = engine << maybe_rule
 
     engine << [1, 2, 3]
@@ -77,7 +77,7 @@ describe "MAYBE rule" do
     }
   end
 
-  it 'should work with with overlays' do
+  it 'works with with overlays' do
     prod = engine << maybe_rule
 
     engine << [1, 2, 3]
@@ -96,7 +96,7 @@ describe "MAYBE rule" do
     expect(prod.tokens.first[:Y]).to be == 5
   end
 
-  it 'should handle retracted parent tokens' do
+  it 'handles retracted parent tokens' do
     prod = engine << maybe_rule
 
     engine << [1, 2, 3]

data/spec/{rule_specs/ncc_spec.rb → ncc_spec.rb}

@@ -29,7 +29,7 @@ describe Wongi::Engine::NccNode do
     }
   end
 
-  it 'should pass with a mismatching subchain' do
+  it 'passes with a mismatching subchain' do
     engine << ncc_rule
     production = engine.productions['ncc']
 
@@ -46,7 +46,7 @@ describe Wongi::Engine::NccNode do
     expect(production).to have(0).token
   end
 
-  it 'should remain consistent after retraction' do
+  it 'remains consistent after retraction' do
     engine << ncc_rule
     production = engine.productions['ncc']
 
@@ -81,7 +81,7 @@ describe Wongi::Engine::NccNode do
     expect(production).to have(0).tokens
   end
 
-  it 'should clean up correctly' do
+  it 'cleans up correctly' do
     engine.rule :rule1 do
       forall {
         has :light_kitchen, :value, :on
@@ -135,7 +135,7 @@ describe Wongi::Engine::NccNode do
     expect(engine.select(:light_bathroom, :last_user, :_).to_a).to be == [Wongi::Engine::WME.new(:light_bathroom, :last_user, :god)]
   end
 
-  it 'should clean up correctly with a different activation order' do
+  it 'cleans up correctly with a different activation order' do
     engine.rule :rule1 do
       forall {
         has :light_kitchen, :value, :on
@@ -191,7 +191,7 @@ describe Wongi::Engine::NccNode do
     expect(engine.select(:light_bathroom, :last_user, :_).to_a).to be == [Wongi::Engine::WME.new(:light_bathroom, :last_user, :god)]
   end
 
-  it 'should ncc-deactivate without destroying tokens' do
+  it 'ncc-deactivates without destroying tokens' do
     engine << rule {
       forall {
         has :Student, :is_a, :student
@@ -254,6 +254,29 @@ describe Wongi::Engine::NccNode do
     expect(prod).to have(1).tokens
   end
 
+  # TODO: this is probably pretty hard to fix, but it's good to fixate the behaviour
+  it "causes infinite loops" do
+    counter = 0
+    exception = StandardError.new
+
+    looping_rule = rule {
+      forall {
+        none {
+          has :a, :b, :c
+        }
+      }
+      make {
+        action {
+          counter += 1
+          raise exception if counter > 1
+        }
+        gen :a, :b, :c
+      }
+    }
+
+    expect { engine << looping_rule }.to raise_exception(exception)
+  end
+
   context "with overlays" do
     context 'should pass with a mismatching subchain' do
       specify "variation 1" do

data/spec/{rule_specs/negative_rule_spec.rb → negative_rule_spec.rb}

@@ -20,7 +20,7 @@ describe "negative rule" do
     expect(prod).to have(0).tokens
   end
 
-  it "should not introduce variables" do
+  it "does not introduce variables" do
     proc = lambda {
       engine << rule('one-option') {
         forall {
@@ -68,7 +68,7 @@ describe "negative rule" do
     expect(prod).to have(1).tokens
   end
 
-  it "should not create infinite feedback loops by default" do
+  it "does not create self-negating facts" do
     engine << rule('feedback') {
       forall {
         neg :a, :b, :_
@@ -78,28 +78,6 @@ describe "negative rule" do
       }
     }
 
-    engine.should have(1).facts
-  end
-
-  it "should create infinite feedback loops with unsafe option" do
-    counter = 0
-    exception = Class.new(StandardError)
-
-    proc = lambda {
-      engine << rule('feedback') {
-        forall {
-          neg :a, :b, :_, unsafe: true
-        }
-        make {
-          action {
-            counter += 1
-            raise exception if counter > 5
-          }
-          gen :a, :b, :c
-        }
-      }
-    }
-
-    expect(&proc).to raise_error(exception)
+    expect(engine).to have(0).facts
   end
 end

data/spec/network_spec.rb

@@ -3,15 +3,16 @@ require 'spec_helper'
 describe Wongi::Engine::Network do
   include Wongi::Engine::DSL
 
-  let(:engine) { Wongi::Engine.create }
   subject { engine }
 
-  it 'should assert facts' do
+  let(:engine) { Wongi::Engine.create }
+
+  it 'asserts facts' do
     subject << [1, 2, 3]
     expect(subject.select(:_, 2, :_)).to have(1).item
   end
 
-  it 'should retract facts' do
+  it 'retracts facts' do
     subject << [1, 2, 3]
     subject.retract [1, 2, 3]
     expect(subject.select(:_, 2, :_).count).to eq(0)

data/spec/overlay_spec.rb

@@ -102,6 +102,7 @@ describe Wongi::Engine::Overlay do
       allow(engine).to receive(:real_assert)
       allow(engine).to receive(:real_retract)
     end
+
     it "maintains visibility on each layer" do
       child1 = overlay.new_child
       child2 = child1.new_child
@@ -145,7 +146,7 @@ describe Wongi::Engine::Overlay do
     end
   end
 
-  it 'should be disposable' do
+  it 'is disposable' do
     production = engine << rule {
       forall {
         has 1, 2, :X
@@ -177,7 +178,7 @@ describe Wongi::Engine::Overlay do
     expect(production).to have(1).token
   end
 
-  it 'should generate into correct overlays' do
+  it 'generates into correct overlays' do
     production = engine << rule {
       forall {
         has 1, 2, :X

data/spec/ruleset_spec.rb

@@ -6,37 +6,37 @@ describe Wongi::Engine::Ruleset do
   end
 
   context 'initially' do
-    it 'should have no rules' do
+    it 'has no rules' do
       expect(Wongi::Engine::Ruleset.rulesets).to be_empty
     end
   end
 
   context 'when creating' do
-    it 'should not register itself when not given a name' do
+    it 'does not register itself when not given a name' do
       ruleset = Wongi::Engine::Ruleset.new
       expect(ruleset.name).to be_nil
       expect(Wongi::Engine::Ruleset.rulesets).to be_empty
     end
 
-    it 'should have a name' do
+    it 'has a name' do
       ruleset = Wongi::Engine::Ruleset.new 'testing-ruleset'
       expect(ruleset.name).to be == 'testing-ruleset'
     end
 
-    it 'should register itself when given a name' do
+    it 'registers itself when given a name' do
       ruleset = Wongi::Engine::Ruleset.new 'testing-ruleset'
       expect(Wongi::Engine::Ruleset.rulesets).not_to be_empty
       expect(Wongi::Engine::Ruleset[ruleset.name]).to be == ruleset
     end
   end
 
-  it 'should be able to clear registered rulesets' do
+  it 'is able to clear registered rulesets' do
     _ = Wongi::Engine::Ruleset.new 'testing-ruleset'
     Wongi::Engine::Ruleset.reset
     expect(Wongi::Engine::Ruleset.rulesets).to be_empty
   end
 
-  it 'should install creating rules into a rete' do
+  it 'installs creating rules into a rete' do
     rete = double 'rete'
 
     ruleset = Wongi::Engine::Ruleset.new

data/spec/simple_action_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Wongi::Engine::DSL::Action::SimpleAction do
   let(:engine) { Wongi::Engine.create }
 
-  it 'should work with blocks' do
+  it 'works with blocks' do
     count = 0
 
     engine.rule do

data/spec/wme_spec.rb

@@ -14,14 +14,14 @@ describe Wongi::Engine::WME do
   }
 
   context 'a new WME' do
-    it 'should initialize and expose members' do
+    it 'initializes and expose members' do
       expect(subject.subject).to be == "a"
       expect(subject.predicate).to be == "b"
       expect(subject.object).to be == "c"
     end
   end
 
-  it 'should compare instances' do
+  it 'compares instances' do
     wme1 = Wongi::Engine::WME.new "a", "b", "c"
     wme2 = Wongi::Engine::WME.new "a", "b", "c"
     wme3 = Wongi::Engine::WME.new "a", "b", "d"
@@ -30,11 +30,11 @@ describe Wongi::Engine::WME do
     expect(wme1).not_to be == wme3
   end
 
-  it 'should not match against non-templates' do
+  it 'does not match against non-templates' do
     expect { subject =~ [1, 2, 3] }.to raise_error(Wongi::Engine::Error)
   end
 
-  it 'should match against templates' do
+  it 'matches against templates' do
     t1 = Wongi::Engine::Template.new "a", :_, :_
     t2 = Wongi::Engine::Template.new "b", :_, :_
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wongi-engine
 version: !ruby/object:Gem::Version
-  version: 0.4.0.pre.alpha1
+  version: 0.4.0.pre.alpha3
 platform: ruby
 authors:
 - Valeri Sokolov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-14 00:00:00.000000000 Z
+date: 2022-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -152,25 +152,25 @@ files:
 - lib/wongi-engine/wme.rb
 - lib/wongi-engine/wme_match_data.rb
 - spec/action_class_spec.rb
+- spec/aggregate_spec.rb
 - spec/alpha_index_spec.rb
+- spec/any_rule_spec.rb
+- spec/assert_test_spec.rb
+- spec/assign_spec.rb
+- spec/assuming_spec.rb
 - spec/beta_node_spec.rb
 - spec/bug_specs/issue_4_spec.rb
 - spec/dataset_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/greater_than_equality_test_spec.rb
 - spec/high_level_spec.rb
+- spec/less_test_spec.rb
+- spec/less_than_equality_test_spec.rb
+- spec/maybe_rule_spec.rb
+- spec/ncc_spec.rb
+- spec/negative_rule_spec.rb
 - spec/network_spec.rb
 - spec/overlay_spec.rb
-- spec/rule_specs/aggregate_spec.rb
-- spec/rule_specs/any_rule_spec.rb
-- spec/rule_specs/assign_spec.rb
-- spec/rule_specs/assuming_spec.rb
-- spec/rule_specs/maybe_rule_spec.rb
-- spec/rule_specs/ncc_spec.rb
-- spec/rule_specs/negative_rule_spec.rb
 - spec/ruleset_spec.rb
 - spec/simple_action_spec.rb
 - spec/spec_helper.rb
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: A forward-chaining rule engine in pure Ruby.