predicate 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d3a81672181d7e3403108a8f09f7d7adbb94266c
-  data.tar.gz: ce94a0e1580ea4d77d177926a5e305736b47741b
+SHA256:
+  metadata.gz: 6f717f6bf0c4cddf18b0a7762f6a85dd47200ec21c274fb974755319862420f1
+  data.tar.gz: 48ce7004023d6121f650ab05d9893c2d25ff3a60324450b773ec4629e643b752
 SHA512:
-  metadata.gz: cd1126d3e88102910c26ff3181d9eb842e697b90632f82012c74efbd391a922de6465653ba9968ae802e8968cb8723f1e88fd30d0c630289c8ef6ef1fc86b97a
-  data.tar.gz: b0e52017a78b5a33b9eeb7d62c1e6e08ca2090555a501b21d4407c991cedde6201926c8f2c6d40d5621d7d912935d00584675ab7257ebed62ce197054e5888d1
+  metadata.gz: eb29761546c30faca593aa4dd5749367fce9e3a3d85404a49d32db310c73471a9008b01f046828070583cb043f3142e1e10688be06a2a5dca4d318c144b1f33a
+  data.tar.gz: d8852634d7c9d33199544fa2ee0ef70f92198b379d6f7e6ed670d40266e8799e7ff7d804551cb1bcaf19c4b6390715217e665e8a03b4c50a5213be10c3e3c626

data/lib/predicate.rb

@@ -94,6 +94,10 @@ class Predicate
     expr.evaluate(tuple)
   end
 
+  def call(tuple)
+    expr.evaluate(tuple)
+  end
+
   # Splits this predicate, say P, as too predicates P1 & P2
   # such that `P <=> P1 & P2` and P2 makes no reference to
   # any attribute in `attr_list`.

data/lib/predicate/sequel/to_sequel.rb

@@ -48,7 +48,19 @@ class Predicate
       def on_in(sexpr)
         left, right = apply(sexpr.identifier), sexpr.right
         if right.literal?
-          ::Sequel.expr(left => right.value)
+          values = Array(right.value).uniq
+          if values.include?(nil)
+            nonnil = values.compact
+            if nonnil.empty?
+              ::Sequel.expr(left => nil)
+            elsif nonnil.size == 1
+              ::Sequel.expr(left => nil) | ::Sequel.expr(left => nonnil.first)
+            else
+              ::Sequel.expr(left => nil) | ::Sequel.expr(left => nonnil)
+            end
+          else
+            ::Sequel.expr(left => right.value)
+          end
         elsif right.opaque?
           ::Sequel.expr(left => apply(right))
         else

data/lib/predicate/version.rb

@@ -1,7 +1,7 @@
 class Predicate
   module Version
     MAJOR = 2
-    MINOR = 1
+    MINOR = 2
     TINY  = 0
   end
   VERSION = "#{Version::MAJOR}.#{Version::MINOR}.#{Version::TINY}"

data/spec/predicate/test_evaluate.rb

@@ -216,5 +216,14 @@ class Predicate
       end
     end
 
+    context 'has a call alias' do
+      let(:predicate){
+        Predicate.new(Factory.gte(:x => 0))
+      }
+
+      let(:scope){ { x: 2 } }
+
+      it{ expect(predicate.call(scope)).to be(true) }
+    end
   end
 end

data/spec/sequel/test_to_sequel.rb

@@ -85,6 +85,30 @@ class Predicate
       end
     end
 
+    context 'in with nil among values' do
+      let(:predicate) { Predicate.in(:price, [nil, 10.0, 17.99]) }
+
+      it 'works as expected' do
+        expect(subject).to eql("SELECT * FROM `items` WHERE ((`price` IS NULL) OR (`price` IN (10.0, 17.99)))")
+      end
+    end
+
+    context 'in with nil among values that can be simplified' do
+      let(:predicate) { Predicate.in(:price, [nil, 17.99]) }
+
+      it 'works as expected' do
+        expect(subject).to eql("SELECT * FROM `items` WHERE ((`price` IS NULL) OR (`price` = 17.99))")
+      end
+    end
+
+    context 'in with only nil among values ' do
+      let(:predicate) { Predicate.in(:price, [nil]) }
+
+      it 'works as expected' do
+        expect(subject).to eql("SELECT * FROM `items` WHERE (`price` IS NULL)")
+      end
+    end
+
     context 'in with something responding to sql_literal' do
       let(:operand){
         Object.new.tap{|o|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: predicate
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-21 00:00:00.000000000 Z
+date: 2019-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexpr
@@ -204,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Predicate provides a simple class and processors to encode and manipulate