wongi-engine 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6436f3939185ba3c379a4fb06a9df42f9eda8e2b70fc3ba15dee97ba868dbd59
-  data.tar.gz: 209e4bfc4814cc52950f84e9d95ceb9a1c0298ca04801e350856467df95d0c7f
+  metadata.gz: 461346062a679921c61fc0b35bc2e89ef0d06920745d650b48fedbbc452b780a
+  data.tar.gz: df2bf13a3551dc049e08398b11ac42440a34e4cb651f5092b74d3efdd5a3aecf
 SHA512:
-  metadata.gz: 045d9b46743c8a36c9398764864d5c333939500018f853289724e34b4564794c816704e37bc1cf74d7096b57ea56d91ced165ea4a57ac5105bc9efe1797dd7ee
-  data.tar.gz: bcb075bd1367b1c146a3299ebad4409defe227b8f4bd1d8d4c2aeefe7d5d8765602642edb1105b9abd8379595d2431412de95b3a1fd142c87bffe90e094df50b
+  metadata.gz: 0a3495df610621e35c8cef1a0cbf39aa0b26a8cee6d699df2bf4cdb451f4c06db534d7943bb4f30778d21289406d54ba0264f54ecfe3b839e3b1d50ccd6b63b3
+  data.tar.gz: 8f85d69a8f476eec9a6ee8cf97ade3a4b8e9959616114511ca65007cd225feb0963613750628a450d5ea5f905fcaed65082662db828491a7caa9c533dc70db37

data/lib/wongi-engine/dsl.rb

@@ -86,6 +86,12 @@ module Wongi::Engine::DSL
     clause :gte
     accept Wongi::Engine::GreaterThanOrEqualTest
 
+    clause :in_list
+    accept Wongi::Engine::InListTest
+
+    clause :not_in_list
+    accept Wongi::Engine::NotInListTest
+
     clause :aggregate
     accept Clause::Aggregate
 

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

@@ -27,7 +27,7 @@ module Wongi::Engine
     end
 
     def ==(other)
-      super && x == other.x && y == other.y
+      self.class == other.class && x == other.x && y == other.y
     end
   end
 end

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

@@ -29,7 +29,7 @@ module Wongi::Engine
     end
 
     def ==(other)
-      super && x == other.x && y == other.y
+      self.class == other.class && x == other.x && y == other.y
     end
   end
 end

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

@@ -27,7 +27,7 @@ module Wongi::Engine
     end
 
     def ==(other)
-      super && x == other.x && y == other.y
+      self.class == other.class && x == other.x && y == other.y
     end
   end
 end

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

@@ -0,0 +1,33 @@
+module Wongi::Engine
+  class InListTest < FilterTest
+    attr_reader :x, :y
+
+    def initialize(x, y)
+      super()
+      @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 == :_
+
+      y.include?(x)
+    end
+
+    def ==(other)
+      self.class == other.class && x == other.x && y == other.y
+    end
+  end
+end

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

@@ -27,7 +27,7 @@ module Wongi::Engine
     end
 
     def ==(other)
-      super && x == other.x && y == other.y
+      self.class == other.class && x == other.x && y == other.y
     end
   end
 end

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

@@ -29,7 +29,7 @@ module Wongi::Engine
     end
 
     def ==(other)
-      super && x == other.x && y == other.y
+      self.class == other.class && x == other.x && y == other.y
     end
   end
 end

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

@@ -27,7 +27,7 @@ module Wongi::Engine
     end
 
     def ==(other)
-      super && x == other.x && y == other.y
+      self.class == other.class && x == other.x && y == other.y
     end
   end
 end

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

@@ -0,0 +1,33 @@
+module Wongi::Engine
+  class NotInListTest < FilterTest
+    attr_reader :x, :y
+
+    def initialize(x, y)
+      super()
+      @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 == :_
+
+      !y.include?(x)
+    end
+
+    def ==(other)
+      self.class == other.class && x == other.x && y == other.y
+    end
+  end
+end

data/lib/wongi-engine/filter.rb

@@ -6,3 +6,5 @@ require 'wongi-engine/filter/less_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'
+require 'wongi-engine/filter/in_list_test'
+require 'wongi-engine/filter/not_in_list_test'

data/lib/wongi-engine/version.rb

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

data/spec/in_list_spec.rb

@@ -0,0 +1,115 @@
+require 'spec_helper'
+
+describe Wongi::Engine::InListTest do
+  include Wongi::Engine::DSL
+  let(:engine) { Wongi::Engine.create }
+
+  it "passes when the value is in the literal list" do
+    prod = engine << rule {
+      forall {
+        has :X, :is, :value
+        in_list :X, [1, 2, 3]
+      }
+    }
+
+    engine << [1, :is, :value]
+    expect(prod.size).to eq(1)
+  end
+
+  it "does not when the value is not in the literal list" do
+    prod = engine << rule {
+      forall {
+        has :X, :is, :value
+        in_list :X, [1, 2, 3]
+      }
+    }
+
+    engine << [0, :is, :value]
+    expect(prod.size).to eq(0)
+  end
+
+  it "passes when the value is in the variable list" do
+    prod = engine << rule {
+      forall {
+        has :X, :is, :value
+        has :Y, :is, :list
+        in_list :X, :Y
+      }
+    }
+
+    engine << [1, :is, :value]
+    engine << [[1, 2, 3], :is, :list]
+    expect(prod.size).to eq(1)
+  end
+
+  it "does not when the value is not in the variable list" do
+    prod = engine << rule {
+      forall {
+        has :X, :is, :value
+        has :Y, :is, :list
+        in_list :X, :Y
+      }
+    }
+
+    engine << [0, :is, :value]
+    engine << [[1, 2, 3], :is, :list]
+    expect(prod.size).to eq(0)
+  end
+end
+
+describe Wongi::Engine::NotInListTest do
+  include Wongi::Engine::DSL
+  let(:engine) { Wongi::Engine.create }
+
+  it "passes when the value is not in the literal list" do
+    prod = engine << rule {
+      forall {
+        has :X, :is, :value
+        not_in_list :X, [1, 2, 3]
+      }
+    }
+
+    engine << [0, :is, :value]
+    expect(prod.size).to eq(1)
+  end
+
+  it "does not when the value is in the literal list" do
+    prod = engine << rule {
+      forall {
+        has :X, :is, :value
+        not_in_list :X, [1, 2, 3]
+      }
+    }
+
+    engine << [1, :is, :value]
+    expect(prod.size).to eq(0)
+  end
+
+  it "passes when the value is not in the variable list" do
+    prod = engine << rule {
+      forall {
+        has :X, :is, :value
+        has :Y, :is, :list
+        not_in_list :X, :Y
+      }
+    }
+
+    engine << [0, :is, :value]
+    engine << [[1, 2, 3], :is, :list]
+    expect(prod.size).to eq(1)
+  end
+
+  it "does not when the value is in the variable list" do
+    prod = engine << rule {
+      forall {
+        has :X, :is, :value
+        has :Y, :is, :list
+        not_in_list :X, :Y
+      }
+    }
+
+    engine << [1, :is, :value]
+    engine << [[1, 2, 3], :is, :list]
+    expect(prod.size).to eq(0)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wongi-engine
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Valeri Sokolov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-09 00:00:00.000000000 Z
+date: 2022-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -137,9 +137,11 @@ files:
 - 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/in_list_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/filter/not_in_list_test.rb
 - lib/wongi-engine/generator_tracker.rb
 - lib/wongi-engine/graph.rb
 - lib/wongi-engine/join_results.rb
@@ -168,6 +170,7 @@ files:
 - spec/generation_spec.rb
 - spec/greater_than_equality_test_spec.rb
 - spec/high_level_spec.rb
+- spec/in_list_spec.rb
 - spec/less_test_spec.rb
 - spec/less_than_equality_test_spec.rb
 - spec/maybe_rule_spec.rb