wongi-engine 0.2.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fdcab85b1479a151cff39d50b422743ba3555ec
-  data.tar.gz: 5d7cbe8c7a6280b45a16945d38ab99d192821a76
+  metadata.gz: b61e762202c7ce3d0abda3c806736d35ff540fdc
+  data.tar.gz: 1661ab89b84bff2380fd7514be8380066fc92358
 SHA512:
-  metadata.gz: 37d9260e2109b969b58770c15931e9cfb72a4a0c52c8051a16000f6fb5ce2b3b98f3d0c8c969d08ca6d1ad3172343f554e74dd001230c904e668548e6585f3a6
-  data.tar.gz: d6ec3764500423d2b36997f08f6db4aa2adb55be4cd4c28283e1c1a73bb13dad1194a457081a51a58cedba71742bd09fbd4734d109bf2affac4b2d31dab01473
+  metadata.gz: aaf20be03f915512942d39b2b12863d581a9875c481c7321e2e515504b9c20d93a5be66abbeec84be600b6c8c6766c2615c2fc43eed8764d7ca8464796ffa434
+  data.tar.gz: eda9d3711b0b62331cb195989159352b96d0a5eaaf0d6366292971e81264a990949fb076109bb0d6fc402d9e2fd15714f83c51387763613453defe663825e0a7

data/.hgtags

@@ -11,3 +11,4 @@ b8b5d5ac7b39ce11d9bb86e61fcb04b227aca02d v0.2.7
 a2f9d52603db027baced51f673daf46b8fe8745a v0.2.9
 a2f9d52603db027baced51f673daf46b8fe8745a v0.2.9
 da4529420721bdd153839261e624b3738e7355e9 v0.2.9
+6db5e2b3978269c475ec03f45bdfb477ca70b427 v0.3.0

data/.travis.yml

@@ -1,12 +1,9 @@
 language: ruby
 rvm:
-- 1.9.3
-- 2.0
-- 2.1
-- 2.2
-- 2.3.0
-- rbx-2.5.8
-- rbx-3.14
+- 2.1.10
+- 2.2.6
+- 2.3.3
+- 2.4.0
 - jruby-9.0
 sudo: false
 notifications:

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.3.0
+
+* Breaking change: the content of `forall` and `make` is no longer evaluated in the rule context. Instead, the rule is accessible as `rule`.
+* Added `assign` to the `make` section
+
 ## 0.2.9
 
 * fixed a bug preventing variables being bound to `false` and `nil`

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

@@ -0,0 +1,15 @@
+module Wongi::Engine
+  module DSL::Action
+    class AssignAction < SimpleAction
+      def initialize(var, &action)
+        @var = var
+        @action = action
+      end
+
+      def execute(token)
+        value = super
+        token.set(@var, value)
+      end
+    end
+  end
+end

data/lib/wongi-engine/dsl/any_rule.rb

@@ -13,7 +13,7 @@ module Wongi::Engine
 
     def option &block
       var = VariantRule.new
-      var.instance_eval &block
+      var.forall &block
       variants << var
     end
 

data/lib/wongi-engine/dsl/builder.rb

@@ -10,7 +10,10 @@ module Wongi::Engine::DSL
     def build &definition
       instance_eval &definition
       @clauses.each do |c|
-        Generated.create_dsl_method c
+        Wongi::Engine::DSL.sections[c[:section]] ||= Class.new do
+          include Generated
+        end
+        Wongi::Engine::DSL.sections[c[:section]].create_dsl_method(c)
       end
     end
     

data/lib/wongi-engine/dsl/generated.rb

@@ -1,42 +1,47 @@
 module Wongi::Engine::DSL
   module Generated
 
-    def self.create_dsl_method extension
+    module ClassMethods
+      def create_dsl_method extension
 
-      section = extension[:section]
-      clause = extension[:clause]
-      action = extension[:action]
-      body = extension[:body]
-      acceptor = extension[:accept]
+        clause = extension[:clause]
+        action = extension[:action]
+        body = extension[:body]
+        acceptor = extension[:accept]
 
-      define_method clause.first do |*args, &block|
+        define_method clause.first do |*args, &block|
 
-        raise "#{clause.first} can only be invoke in section #{section}, currently in #{@current_section}" if section != @current_section
+          if body
 
-        if body
+            instance_exec *args, &body
 
-          instance_exec *args, &body
+          elsif acceptor
 
-        elsif acceptor
+            rule.accept acceptor.new( *args, &block )
 
-          accept acceptor.new( *args, &block )
+          elsif action
 
-        elsif action
+            c = Clause::Generic.new *args, &block
+            c.name = clause.first
+            c.action = action
+            c.rule = self.rule
+            rule.accept c
 
-          c = Clause::Generic.new *args, &block
-          c.name = clause.first
-          c.action = action
-          c.rule = self
-          accept c
+          end
 
         end
 
-      end
+        clause[1..-1].each do |al|
+          alias_method al, clause.first
+        end
 
-      clause[1..-1].each do |al|
-        alias_method al, clause.first
       end
+    end
+
+    attr_accessor :rule
 
+    def self.included(base)
+      base.extend ClassMethods
     end
 
   end

data/lib/wongi-engine/dsl/rule.rb

@@ -4,8 +4,6 @@ module Wongi::Engine
 
     attr_reader :name
 
-      include Generated
-
     class << self
 
       def section s, *aliases
@@ -13,7 +11,9 @@ module Wongi::Engine
           sections << s
           define_method s do |&d|
             @current_section = s
-            instance_eval &d
+            section = DSL.sections[s].new
+            section.rule = self
+            section.instance_eval &d
           end
           aliases.each { |a| alias_method a, s }
         end
@@ -72,8 +72,6 @@ module Wongi::Engine
       rete.install_rule( self )
     end
 
-    protected
-
     def accept stuff
       acceptors[@current_section] << stuff
     end

data/lib/wongi-engine/dsl.rb

@@ -2,6 +2,10 @@ module Wongi::Engine
   module DSL
     extend self
 
+    def sections
+      @sections ||= {}
+    end
+
     def ruleset name = nil, &definition
       rs = Ruleset.new
       if ! name.nil?
@@ -47,6 +51,7 @@ require 'wongi-engine/dsl/action/statement_generator'
 require 'wongi-engine/dsl/action/simple_collector'
 require 'wongi-engine/dsl/action/trace_action'
 require 'wongi-engine/dsl/action/error_generator'
+require 'wongi-engine/dsl/action/assign_action'
 
 module Wongi::Engine::DSL
   dsl {
@@ -128,5 +133,8 @@ module Wongi::Engine::DSL
 
     clause :action
     action Action::SimpleAction
+
+    clause :assign
+    action Action::AssignAction
   }
 end

data/lib/wongi-engine/token.rb

@@ -37,14 +37,17 @@ module Wongi::Engine
     end
 
     def subst variable, value
-      @cached_assignments = nil
       if @assignments.has_key? variable
         @assignments[ variable ] = value
       end
     end
 
+    def set(variable, value)
+      @assignments[variable] = value
+    end
+
     def assignments
-      @cached_assignments ||= all_assignments
+      all_assignments
     end
 
     def [] var

data/lib/wongi-engine/version.rb

@@ -1,5 +1,5 @@
 module Wongi
   module Engine
-    VERSION = "0.2.9"
+    VERSION = "0.3.0"
   end
 end

data/spec/rule_specs/any_rule_spec.rb

@@ -2,74 +2,76 @@ require 'spec_helper'
 
 describe "ANY rule" do
 
-    before :each do
-      @engine = Wongi::Engine.create
-    end
+  include Wongi::Engine::DSL
 
-    def engine
-      @engine
-    end
-  
-    context "with just one option" do
-
-      it "should act like a positive matcher" do
-
-        engine << rule('one-option') {
-          forall {
-            any {
-              option {
-                has 1, 2, :X
-                has :X, 4, 5
-              }
+  before :each do
+    @engine = Wongi::Engine.create
+  end
+
+  def engine
+    @engine
+  end
+
+  context "with just one option" do
+
+    it "should act like a positive matcher" do
+
+      engine << rule('one-option') {
+        forall {
+          any {
+            option {
+              has 1, 2, :X
+              has :X, 4, 5
             }
           }
         }
+      }
 
-        production = engine.productions['one-option']
-
-        engine << [1, 2, 3]
-        engine << [3, 4, 5]
+      production = engine.productions['one-option']
 
-        expect(production.size).to eq(1)
+      engine << [1, 2, 3]
+      engine << [3, 4, 5]
 
-      end
+      expect(production.size).to eq(1)
 
     end
 
-    context "with several options" do
+  end
 
-      specify "all matching branches must pass" do
+  context "with several options" do
 
-        engine << rule('two-options') {
-          forall {
-            has 1, 2, :X
-            any {
-              option {
-                has :X, 4, 5
-              }
-              option {
-                has :X, "four", "five"
-              }
+    specify "all matching branches must pass" do
+
+      engine << rule('two-options') {
+        forall {
+          has 1, 2, :X
+          any {
+            option {
+              has :X, 4, 5
+            }
+            option {
+              has :X, "four", "five"
             }
-          }
-          make {
-            collect :X, :threes
           }
         }
+        make {
+          collect :X, :threes
+        }
+      }
 
-        production = engine.productions['two-options']
-
-        engine << [1, 2, 3]
-        engine << [3, 4, 5]
-        engine << [1, 2, "three"]
-        engine << ["three", "four", "five"]
+      production = engine.productions['two-options']
 
-        expect(production.size).to eq(2)
-        expect( engine.collection(:threes) ).to include(3)
-        expect( engine.collection(:threes) ).to include("three")
+      engine << [1, 2, 3]
+      engine << [3, 4, 5]
+      engine << [1, 2, "three"]
+      engine << ["three", "four", "five"]
 
-      end
+      expect(production.size).to eq(2)
+      expect( engine.collection(:threes) ).to include(3)
+      expect( engine.collection(:threes) ).to include("three")
 
     end
 
+  end
+
 end

data/spec/rule_specs/assign_spec.rb

@@ -18,6 +18,22 @@ describe "ASSIGN rule" do
 
   end
 
+  it 'should be available in the make section' do
+    production = engine << rule {
+      forall {
+        has 1, 2, :X
+      }
+      make {
+        assign(:Y) { |token| token[:X] * 2 }
+        gen :Y, 5, 6
+      }
+    }
+    engine << [1, 2, 21]
+    expect(production.tokens.first[:X]).to be == 21
+    expect(engine.find(42, 5, 6)).not_to be_nil
+    expect(production.tokens.first[:Y]).to be == 42
+  end
+
   it "should be able to access previous assignments" do
 
     production = engine << rule {

data/spec/rule_specs/ncc_spec.rb

@@ -101,8 +101,8 @@ describe Wongi::Engine::NccNode do
       }
       make {
         #trace values: true, generation: true
-        gen self.name, :light_bathroom, :on
-        gen self.name, :want_action_for, :light_bathroom
+        gen rule.name, :light_bathroom, :on
+        gen rule.name, :want_action_for, :light_bathroom
       }
     end
 
@@ -159,8 +159,8 @@ describe Wongi::Engine::NccNode do
       }
       make {
         #trace values: true, generation: true
-        gen self.name, :light_bathroom, :on
-        gen self.name, :want_action_for, :light_bathroom
+        gen rule.name, :light_bathroom, :on
+        gen rule.name, :want_action_for, :light_bathroom
       }
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wongi-engine
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors:
 - Valeri Sokolov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-08 00:00:00.000000000 Z
+date: 2017-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -107,6 +107,7 @@ files:
 - lib/wongi-engine/core_ext.rb
 - lib/wongi-engine/data_overlay.rb
 - lib/wongi-engine/dsl.rb
+- lib/wongi-engine/dsl/action/assign_action.rb
 - lib/wongi-engine/dsl/action/base.rb
 - lib/wongi-engine/dsl/action/error_generator.rb
 - lib/wongi-engine/dsl/action/simple_action.rb
@@ -184,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: A forward-chaining rule engine in pure Ruby.