predicate 2.3.3 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6adb8570080165285172882eb0c0f8216180efa05a58df348055f9a406fcef24
-  data.tar.gz: 3add1e5ed2a4d728fb92637c8527b8dfeaa2b66f16622a45608aca1d9f079774
+  metadata.gz: 68fd4bd97d5b3848c143403c1e5e161e015f9ccbb6964355af74aa70859997e1
+  data.tar.gz: dfa3f8d83173f44379e0ec59517b3f2dc7ebd7fbb410a3caeb09c8b5ec5bdc93
 SHA512:
-  metadata.gz: 8967a78cd1bbee2b0e2666f0fe853743d98c5be4730c3d263ce30d541387b71de37ac1d3e9544d487c92782795fcdeeb116099b741a362b60390b35aa2834e6a
-  data.tar.gz: ed564310b25c229a65824e06d6b37353d326a1dd56b00a6723ad669c4321fa2d4e50d660d5c02b66efbaef695a2063504602e9466c7908b0ebf681943dc28571
+  metadata.gz: 7cd3c36e029feee497ea0e9cdd4c0c1cfae338abc5b5e3e74e6b69efd2d184714b5a8e8f21b2cda2dbc91cdd2f35d6894863872f5f5cb15a1efbdcae1b976f7b
+  data.tar.gz: f04c3c2877b6a0f9032e394839e871a55692dbdbbeceddba09f448a308e5f97d36b9a76b65801608f6365dbc9e782ba6fddb8ad24f4adfd43e398a6b4e4e684c

data/lib/predicate.rb

@@ -142,4 +142,11 @@ class Predicate
     expr.to_s(scope)
   end
 
+  # If possible, converts this predicate back to a `{ attr: value, ... }`
+  # hash. Raises an IllegalArgumentError if the predicate cannot be
+  # represented that way.
+  def to_hash
+    expr.to_hash
+  end
+
 end # class Predicate

data/lib/predicate/nodes/and.rb

@@ -53,5 +53,14 @@ class Predicate
       sexpr_body.all?{|operand| operand.evaluate(tuple) }
     end
 
+    def to_hash
+      sexpr_body.inject({}) do |p,term|
+        p.merge(term.to_hash){|k,v1,v2|
+          super unless v1 == v2
+          v1
+        }
+      end
+    end
+
   end
 end

data/lib/predicate/nodes/eq.rb

@@ -48,5 +48,15 @@ class Predicate
       left.evaluate(tuple) == right.evaluate(tuple)
     end
 
+    def to_hash
+      if left.identifier? && right.literal? && !right.has_placeholder?
+        { left.name => right.value }
+      elsif right.identifier? && left.literal? && !left.has_placeholder?
+        { right.name => left.value }
+      else
+        super
+      end
+    end
+
   end
 end

data/lib/predicate/nodes/expr.rb

@@ -97,6 +97,10 @@ class Predicate
       ToS.call(self, scope: scope)
     end
 
+    def to_hash
+      raise ArgumentError, "Unable to represent #{self} to a Hash"
+    end
+
     def sexpr(arg)
       Factory.sexpr(arg)
     end

data/lib/predicate/nodes/in.rb

@@ -75,5 +75,10 @@ class Predicate
       left.identifier? && right.literal? && !right.has_placeholder?
     end
 
+    def to_hash
+      return super unless var_against_literal_value?
+      { identifier.name => right.value }
+    end
+
   end
 end

data/lib/predicate/nodes/tautology.rb

@@ -38,5 +38,9 @@ class Predicate
       true
     end
 
+    def to_hash
+      {}
+    end
+
   end
 end

data/lib/predicate/sequel/to_sequel.rb

@@ -110,7 +110,7 @@ class Predicate
       end
 
       def on_unsupported(sexpr)
-        raise NotSupportedError
+        raise NotSupportedError, "Unsupported predicate #{sexpr}"
       end
       alias :on_native :on_unsupported
       alias :on_intersect :on_unsupported

data/lib/predicate/version.rb

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

data/spec/predicate/test_free_variables.rb

@@ -9,6 +9,6 @@ class Predicate
 
       it{ should eq([:x]) }
     end
-    
+
   end
 end

data/spec/predicate/test_to_hash.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+class Predicate
+  describe Predicate, "to_hash" do
+
+    let(:p){ Predicate }
+
+    subject{ predicate.to_hash }
+
+    context "tautology" do
+      let(:predicate){ Predicate.tautology }
+
+      it{ expect(subject).to eql({}) }
+    end
+
+    context "contradiction" do
+      let(:predicate){ Predicate.contradiction }
+
+      it{ expect{ subject }.to raise_error(ArgumentError) }
+    end
+
+    context "eq" do
+      let(:predicate){ Predicate.eq(:x, 2) }
+
+      it{ expect(subject).to eql(x: 2) }
+    end
+
+    context "in" do
+      let(:predicate){ Predicate.in(:x, [2,3]) }
+
+      it{ expect(subject).to eql(x: [2,3]) }
+    end
+
+    context "and" do
+      let(:predicate){ Predicate.eq(:x, 3) & Predicate.in(:y, [2,3]) }
+
+      it{ expect(subject).to eql(x: 3, y: [2,3]) }
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: predicate
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.4.0
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-08 00:00:00.000000000 Z
+date: 2020-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexpr
@@ -183,6 +183,7 @@ files:
 - spec/predicate/test_qualify.rb
 - spec/predicate/test_rename.rb
 - spec/predicate/test_tautology.rb
+- spec/predicate/test_to_hash.rb
 - spec/predicate/test_unqualify.rb
 - spec/sequel/test_to_sequel.rb
 - spec/spec_helper.rb