predicate 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fca9de34caf91b943ce07da44ab519042b4b1e9
-  data.tar.gz: f5655e929360dab91af6533db03674a7e259c465
+  metadata.gz: d3a81672181d7e3403108a8f09f7d7adbb94266c
+  data.tar.gz: ce94a0e1580ea4d77d177926a5e305736b47741b
 SHA512:
-  metadata.gz: 14b384734d66a9ff1886c4737cab98e247e484d7c11b7459393fcf27fa4bdf18f2042a4a83cdc55e72b840d1e9db92472a45e5df36649a7f54b7ec2f2f64ded8
-  data.tar.gz: cf72d2ba84a77d59c27f84880dea9e5a4b19636cf3fd4345cc1fcb3fbe3d3ed59d7f3e41001ad9098633711cf7fe9fd8a6b36dbffe94d8f96c2e8a91c1f4c1a3
+  metadata.gz: cd1126d3e88102910c26ff3181d9eb842e697b90632f82012c74efbd391a922de6465653ba9968ae802e8968cb8723f1e88fd30d0c630289c8ef6ef1fc86b97a
+  data.tar.gz: b0e52017a78b5a33b9eeb7d62c1e6e08ca2090555a501b21d4407c991cedde6201926c8f2c6d40d5621d7d912935d00584675ab7257ebed62ce197054e5888d1

data/lib/predicate/factory.rb

@@ -29,10 +29,13 @@ class Predicate
       _factor_predicate([:not, sexpr(operand)])
     end
 
-    def in(identifier, values)
-      return contradiction if values.is_a?(Array) && values.empty?
-      identifier = sexpr(identifier) if identifier.is_a?(Symbol)
-      _factor_predicate([:in, identifier, values])
+    def in(left, right)
+      left, right = sexpr(left), sexpr(right)
+      if right.literal? && right.value.empty?
+        contradiction
+      else
+        _factor_predicate([:in, left, right])
+      end
     end
     alias :among :in
 
@@ -63,7 +66,7 @@ class Predicate
       else
         terms = h.to_a.map{|(k,v)|
           if v.is_a?(Array)
-            [:in, sexpr(k), v]
+            [:in, sexpr(k), sexpr(v)]
           else
             [op, sexpr(k), sexpr(v)]
           end
@@ -77,6 +80,10 @@ class Predicate
       _factor_predicate([:literal, literal])
     end
 
+    def opaque(arg)
+      _factor_predicate([:opaque, arg])
+    end
+
     def match(left, right, options = nil)
       _factor_predicate([:match, sexpr(left), sexpr(right)] + (options.nil? ? [] : [options]))
     end
@@ -89,13 +96,13 @@ class Predicate
 
     def sexpr(expr)
       case expr
-      when Expr       then expr
-      when Predicate  then expr.expr
-      when TrueClass  then Grammar.sexpr([:tautology, true])
-      when FalseClass then Grammar.sexpr([:contradiction, false])
-      when Symbol     then Grammar.sexpr([:identifier, expr])
-      when Proc       then Grammar.sexpr([:native, expr])
-      when Array      then Grammar.sexpr(expr)
+      when Expr        then expr
+      when Predicate   then expr.expr
+      when TrueClass   then Grammar.sexpr([:tautology, true])
+      when FalseClass  then Grammar.sexpr([:contradiction, false])
+      when Symbol      then Grammar.sexpr([:identifier, expr])
+      when Proc        then Grammar.sexpr([:native, expr])
+      when SexprLike   then Grammar.sexpr(expr)
       else
         Grammar.sexpr([:literal, expr])
       end

data/lib/predicate/grammar.rb

@@ -33,3 +33,4 @@ require_relative 'nodes/intersect'
 require_relative 'nodes/literal'
 require_relative 'nodes/match'
 require_relative 'nodes/native'
+require_relative 'nodes/opaque'

data/lib/predicate/grammar.sexp.yml

@@ -43,14 +43,15 @@ rules:
   gte:
     - [ term, term ]
   in:
-    - [ varref, values ]
+    - [ varref, term ]
   intersect:
-    - [ varref, values ]
+    - [ term, term ]
   match:
     - [ term, term, options ]
   term:
     - varref
     - literal
+    - opaque
   varref:
     - qualified_identifier
     - identifier
@@ -58,7 +59,7 @@ rules:
     - [ "::Proc" ]
   literal:
     - "::Object"
-  values:
+  opaque:
     - "::Object"
   options:
     - "::Hash"

data/lib/predicate/nodes/eq.rb

@@ -7,20 +7,17 @@ class Predicate
     end
 
     def &(other)
+      return super unless free_variables == other.free_variables
       case other
       when Eq
-        if free_variables == other.free_variables
-          return self if constants == other.constants
-          contradiction
-        else
-          super
-        end
+        return self if constants == other.constants
+        return contradiction
       when In
-        return self if free_variables == other.free_variables
-        super
-      else
-        super
+        return self if other.right.literal?
       end
+      super
+    rescue NotSupportedError
+      super
     end
 
     def constant_variables

data/lib/predicate/nodes/expr.rb

@@ -23,6 +23,10 @@ class Predicate
       sexpr_type == :literal
     end
 
+    def opaque?
+      sexpr_type == :opaque
+    end
+
     def identifier?
       sexpr_type == :identifier
     end
@@ -84,7 +88,6 @@ class Predicate
     def to_s(scope = nil)
       ToS.call(self, scope: scope)
     end
-    alias :inspect :to_s
 
     def sexpr(arg)
       Factory.sexpr(arg)

data/lib/predicate/nodes/in.rb

@@ -6,32 +6,33 @@ class Predicate
       80
     end
 
-    def identifier
+    def left
       self[1]
     end
+    alias :identifier :left
 
-    def values
+    def right
       self[2]
     end
 
     def &(other)
-      case other
-      when In
-        fv = free_variables
-        if fv.size == 1 && fv == other.free_variables
-          intersection = values & other.values
-          if intersection.empty?
-            Factory.contradiction
-          elsif intersection.size == 1
-            Factory.eq(fv.first, [:literal, intersection.first])
-          else
-            Factory.in(fv.first, intersection)
-          end
-        else
-          super
-        end
+      # we only optimize with another In
+      return super unless other.is_a?(In)
+
+      # we only optimize is same free variables
+      fv = free_variables
+      return super unless fv.size == 1 && fv == other.free_variables
+
+      # we only optimize if both right terms are literals
+      return super unless right.literal? and other.right.literal?
+
+      intersection = right.value & other.right.value
+      if intersection.empty?
+        Factory.contradiction
+      elsif intersection.size == 1
+        Factory.eq(fv.first, [:literal, intersection.first])
       else
-        super
+        Factory.in(fv.first, intersection)
       end
     end
 
@@ -40,11 +41,19 @@ class Predicate
     end
 
     def constant_variables
-      values.size == 1 ? free_variables : []
+      if right.literal? and right.value.size == 1
+        free_variables
+      else
+        []
+      end
     end
 
     def constants
-      values.size == 1 ? { identifier.name => values.first } : {}
+      if right.literal? and right.value.size == 1
+        { identifier.name => right.value.first }
+      else
+        {}
+      end
     end
 
     def dyadic_priority
@@ -52,6 +61,7 @@ class Predicate
     end
 
     def evaluate(tuple)
+      values = right.evaluate(tuple)
       values.include?(identifier.evaluate(tuple))
     end
 

data/lib/predicate/nodes/opaque.rb

@@ -0,0 +1,18 @@
+class Predicate
+  module Opaque
+    include Expr
+
+    def priority
+      100
+    end
+
+    def free_variables
+      @free_variables ||= []
+    end
+
+    def evaluate(tuple)
+      raise NotImplementedError, "Opaque#evaluate is not defined"
+    end
+
+  end
+end

data/lib/predicate/processors/to_s.rb

@@ -50,7 +50,7 @@ class Predicate
     alias :on_gte :on_dyadic
 
     def on_in(sexpr)
-      "#{apply(sexpr.identifier)} IN #{to_literal(sexpr.values)}"
+      "#{apply(sexpr.identifier)} IN #{apply(sexpr.right)}"
     end
 
     def on_intersect(sexpr)
@@ -61,6 +61,10 @@ class Predicate
       to_literal(sexpr.last)
     end
 
+    def on_opaque(sexpr)
+      "OPAQUE #{sexpr.last}"
+    end
+
     def on_match(sexpr)
       "#{apply(sexpr.left)} =~ #{apply(sexpr.right)}"
     end

data/lib/predicate/sequel/to_sequel.rb

@@ -1,5 +1,8 @@
 class Predicate
   class ToSequel < Sexpr::Processor
+
+    class Error < StandardError; end
+
     module Methods
       def on_identifier(sexpr)
         ::Sequel.identifier(sexpr.last)
@@ -43,9 +46,14 @@ class Predicate
       alias :on_gte :on_dyadic_comp
 
       def on_in(sexpr)
-        left, right = apply(sexpr.identifier), sexpr.last
-        right = [right] if !right.is_a?(Array) && right.respond_to?(:sql_literal)
-        ::Sequel.expr(left => right)
+        left, right = apply(sexpr.identifier), sexpr.right
+        if right.literal?
+          ::Sequel.expr(left => right.value)
+        elsif right.opaque?
+          ::Sequel.expr(left => apply(right))
+        else
+          raise Error, "Unable to compile `#{right}` to sequel"
+        end
       end
 
       def on_not(sexpr)
@@ -74,6 +82,11 @@ class Predicate
         end
       end
 
+      def on_opaque(sexpr)
+        return [sexpr.last] if sexpr.last.respond_to?(:sql_literal)
+        raise Error, "Unable to compile #{sexpr} to Sequel"
+      end
+
       def on_unsupported(sexpr)
         raise NotSupportedError
       end

data/lib/predicate/version.rb

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

data/lib/predicate.rb

@@ -9,6 +9,8 @@ class Predicate
 
   TupleLike = ->(t){ t.is_a?(Hash) }
 
+  SexprLike = ->(x) { x.is_a?(Array) && x.first.is_a?(Symbol) }
+
   def initialize(sexpr)
     @sexpr = sexpr
   end

data/spec/factory/test_from_hash.rb

@@ -35,7 +35,7 @@ class Predicate
       let(:h){ {:x => [12], :y => :z} }
       let(:expected){
         [:and,
-          [:in, [:identifier, :x], [12]],
+          [:in, [:identifier, :x], [:literal, [12]]],
           [:eq, [:identifier, :y], [:identifier, :z]]]
       }
 

data/spec/factory/test_in.rb

@@ -2,11 +2,29 @@ require_relative "shared/a_comparison_factory_method"
 class Predicate
   describe Factory, 'in' do
 
-    subject{ Factory.in(:x, [2, 3]) }
+    context 'with values on the right' do
+      subject{ Factory.in(:x, [2, 3]) }
 
-    it{ should be_a(In) }
+      it 'is a In' do
+        expect(subject).to be_a(In)
+      end
 
-    it{ should eq([:in, [:identifier, :x], [2, 3]]) }
+      it 'has the expected AST' do
+        expect(subject).to eql([:in, [:identifier, :x], [:literal, [2, 3]]])
+      end
+    end
+
+    context 'with opaque on the right' do
+      subject{ Factory.in(:x, Factory.opaque([2, 3])) }
+
+      it 'is a In' do
+        expect(subject).to be_a(In)
+      end
+
+      it 'has the expected AST' do
+        expect(subject).to eql([:in, [:identifier, :x], [:opaque, [2, 3]]])
+      end
+    end
 
   end
 end

data/spec/nodes/eq/test_and.rb

@@ -14,5 +14,17 @@ class Predicate
       it{ should be_a(Contradiction) }
     end
 
+    context 'with an IN on same variable and literal' do
+      let(:right){ Factory.in(:x, [3,4]) }
+
+      it{ should be(left) }
+    end
+
+    context 'with an IN on same variable and opaque' do
+      let(:right){ Factory.in(:x, Factory.opaque([3,4])) }
+
+      it{ should be_a(And) }
+    end
+
   end
 end

data/spec/predicate/test_constant_variables.rb

@@ -22,6 +22,12 @@ class Predicate
       it{ expect(subject).to eql([]) }
     end
 
+    describe "on a in with an opaque right term" do
+      let(:p){ Predicate.in(:x, Predicate.opaque([2])) }
+
+      it{ expect(subject).to eql([]) }
+    end
+
     describe "on a NOT" do
       let(:p){ !Predicate.coerce(x: 2) }
 

data/spec/predicate/test_constants.rb

@@ -65,6 +65,12 @@ class Predicate
       it{ should eq({}) }
     end
 
+    context "on in (opaque)" do
+      let(:pred){ p.in(:x, p.opaque([2])) }
+
+      it{ should eq({}) }
+    end
+
     context "on and (two eqs)" do
       let(:pred){ p.eq(:x, 2) & p.eq(:y, 4) }
 

data/spec/sequel/test_to_sequel.rb

@@ -93,7 +93,7 @@ class Predicate
           end
         }
       }
-      let(:predicate) { Predicate.in(:price, operand) }
+      let(:predicate) { Predicate.in(:price, Predicate.opaque(operand)) }
 
       it 'works as expected' do
         expect(subject).to eql("SELECT * FROM `items` WHERE (`price` IN (Hello World))")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: predicate
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-28 00:00:00.000000000 Z
+date: 2018-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexpr
@@ -112,6 +112,7 @@ files:
 - lib/predicate/nodes/native.rb
 - lib/predicate/nodes/neq.rb
 - lib/predicate/nodes/not.rb
+- lib/predicate/nodes/opaque.rb
 - lib/predicate/nodes/or.rb
 - lib/predicate/nodes/qualified_identifier.rb
 - lib/predicate/nodes/tautology.rb