wongi-engine 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f70a76b11b19e257c3a6b291a69f369d5450ca9171493d8145cec51e45a84dcb
-  data.tar.gz: 2affbdd8616b22659d8b52063238c8668dcc9e484b4c2a300da1bc5293a37ec3
+  metadata.gz: d3f9d2adf82d8e36010a2ea956c308d58c073673cba49013352c420ed69180e5
+  data.tar.gz: 792ee293fce552b92c516f17749253fe9c6ba6c72f8b8e4c751b32b7f87902a6
 SHA512:
-  metadata.gz: 1258959929174cf579adf433f01ac9130a731eaaefbffc3dcca9d208bd83e33d54e12f0b041af34e20f0e1188c9c430b96ea34174cc8487bc547f8d757dc6a3d
-  data.tar.gz: 4dd53c994df99b82ee04bd030371a11c168a3544b06a343bdfd042ab17e67ee71c22280b80df5384e3587efa7e493412315d5aa719c992237151cd651fb616f8
+  metadata.gz: 319936296084020880b58d775a241eaa575bfce12246fac060e8150a0ff97a30aa7558653c771548616b7a1d0da450fa625dc11ce9ceca490cdf8affd2005231
+  data.tar.gz: 8f7397d233f1eb4cd714c0c69caa866cd18dd42a3304bc19c263662bafb122382b9be50ffd101bb9dacf50a9c4ce11804b4071dfefefeda6d72a38d60074b8f0

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.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/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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wongi-engine
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Valeri Sokolov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-26 00:00:00.000000000 Z
+date: 2020-02-20 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
@@ -150,7 +152,9 @@ files:
 - 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
@@ -198,7 +202,9 @@ test_files:
 - 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