predicate 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bd1cc5bc76250463f8dd68f07852df3838d8e9e553da27b188a87d968f83e5d
-  data.tar.gz: eab52fff1970e5a74f21170e6486ec8082065be352053206b819fec2a2da3075
+  metadata.gz: 4d0149b8d39635ed0f27c39362d1c4aec0dc5f2ccc1290580ed67edf18414e5b
+  data.tar.gz: a623594513754521196f1a98f5d2f682650a3ec1b02b02b4dfa703600039faa1
 SHA512:
-  metadata.gz: b3b4f2354d525a6c7a80de4fe6edba8459270ab34a2a5f15e17f233d485761b2c8e2f4c86c93349b2ffc06380cd37a4621da0df6ffa14672d1b43fa24ae9f428
-  data.tar.gz: af95ddb5a971f2f7631046ed59e05982a5ff5309cbb1ac1a892c949ac9ed7305f4188f40616efce485978854561a756b3a722c0db192abb0b42e925beed42834
+  metadata.gz: dfc8fdb19e1d61171a4c91e893bfc6b6b91d559d8402f3a47dbede8d09dcb2f702f697cbd9e8b6db688e896d1831f837ace44d8c78b8c0e110d767ac0f99db05
+  data.tar.gz: 21ffbda2c7831051ac8ffba6a5c84d029735ce953e3fc969ae252945b0417ea28bc05f865e0e4e29771b542ca2993ec3720389a7be012b96b378536fb0743602

data/README.md

@@ -1,5 +1,7 @@
 # Predicate
 
+![](https://travis-ci.com/enspirit/predicate.svg?branch=master)
+
 Boolean (truth-value) expressions that can be evaluated, manipulated,
 optimized, translated to code, etc.
 

data/lib/predicate/factory.rb

@@ -160,6 +160,14 @@ class Predicate
 
   public # Low-level
 
+    # Factors a predicate from a mapping between variables
+    # and values. This typically generates a AND(EQ)
+    # predicate, but a value can be an Array (IN) or a
+    # Regexp (MATCH).
+    def h(h)
+      from_hash(h, :eq)
+    end
+
     # Factors a predicate for a ruby Proc that returns
     # truth-value for a single argument.
     def native(arg)
@@ -182,10 +190,10 @@ class Predicate
         tautology
       else
         terms = h.to_a.map{|(k,v)|
-          if v.is_a?(Array)
-            [:in, sexpr(k), sexpr(v)]
-          else
-            [op, sexpr(k), sexpr(v)]
+          case v
+          when Array  then [:in, sexpr(k), sexpr(v)]
+          when Regexp then [:match, sexpr(k), sexpr(v) ]
+          else             [op, sexpr(k), sexpr(v)]
           end
         }
         terms = terms.size == 1 ? terms.first : terms.unshift(:and)

data/lib/predicate/version.rb

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

data/spec/factory/test_comp.rb

@@ -10,7 +10,15 @@ class Predicate
       it{ should eq(Factory.tautology) }
     end
 
-    context "when the hash is singleton" do
+    context "when the hash is a singelton" do
+      let(:h){ {:x => 12} }
+
+      it_should_behave_like "a predicate AST node"
+      it{ should be_a(Eq) }
+      it{ should eq([:eq, [:identifier, :x], [:literal, 12]]) }
+    end
+
+    context "when the hash is not singleton" do
       let(:h){ {:x => 12, :y => :z} }
       let(:expected){
         [:and,
@@ -23,12 +31,27 @@ class Predicate
       it{ should eq(expected) }
     end
 
-    context "when the hash is not singelton" do
-      let(:h){ {:x => 12} }
+    context "when the value is a Regexp" do
+      let(:rx){ /[a-z]+/ }
+      let(:h){ {:x => /[a-z]+/} }
 
       it_should_behave_like "a predicate AST node"
-      it{ should be_a(Eq) }
-      it{ should eq([:eq, [:identifier, :x], [:literal, 12]]) }
+      it{ should be_a(Match) }
+      it{ should eq([:match, [:identifier, :x], [:literal, rx]]) }
+    end
+
+    context "when the hash mixes value types" do
+      let(:rx){ /[a-z]+/ }
+      let(:h){ {:x => 12, :y => rx} }
+      let(:expected){
+        [:and,
+          [:eq, [:identifier, :x], [:literal, 12]],
+          [:match, [:identifier, :y], [:literal, rx]]]
+      }
+
+      it_should_behave_like "a predicate AST node"
+      it{ should be_a(And) }
+      it{ should eq(expected) }
     end
 
   end

data/spec/sequel/test_to_sequel.rb

@@ -140,6 +140,15 @@ class Predicate
       end
     end
 
+    context 'nary and' do
+      let(:predicate) { Predicate.eq(:name, "Bob") & Predicate.eq(:price, 10.0) & Predicate.eq(:city, "London") }
+
+      it 'works as expected' do
+        puts predicate.sexpr.inspect
+        expect(subject).to eql("SELECT * FROM `items` WHERE ((`name` = 'Bob') AND (`price` = 10.0) AND (`city` = 'London'))")
+      end
+    end
+
     context 'or' do
       let(:predicate) { Predicate.eq(:name, "Bob") | Predicate.lt(:price, 10.0) }
 

data/spec/test_predicate.rb

@@ -18,6 +18,16 @@ describe "Predicate.comp" do
   it_should_behave_like "a predicate"
 end
 
+describe "Predicate.h" do
+  subject{ Predicate.h(:x => 2) }
+
+  it_should_behave_like "a predicate"
+
+  it 'should be a eq on x' do
+    expect(subject).to eql(Predicate.eq(:x => 2))
+  end
+end
+
 describe "Predicate.in, with a list" do
   subject{ Predicate.in(:x, [2, 3]) }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: predicate
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-30 00:00:00.000000000 Z
+date: 2021-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexpr
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement