predicate 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db81e00071c6190ac6692ccd9a3b5cd384ba7c0ee9a636d4b4b75c841a84f628
-  data.tar.gz: dbcf66021eee203a6f943f2ca5ca02a101a9306aa8ee4b1ffaeb3131d0d0c524
+  metadata.gz: 901370b7a22028c4557c52fb7f5cd8d3ac92c97a440cf4d0f772bd592198c3a5
+  data.tar.gz: 7dc1e4912f365fc08657fc1b7289f1796989511c8b5e7c5e219bf8fe9eb16ccd
 SHA512:
-  metadata.gz: cfef5e3953b9b9416be3a72305b0a33ebf063548735bd7a477f1f41aadac0936ef4cfc477092c5de4946e0df77b53706d306579f17aacfd91a7a6b97371f0ece
-  data.tar.gz: 664b4ee4aba8a4e354b70021944fdf76796a8aee3558616d7f58472e0f11a607b4ae23694d15a44af203f56e960c06d22a04393db24eb5c92d25452be7b8585d
+  metadata.gz: 9515618b5f501b1774cae70cd88784d8bc965f2c331132c5c1f11363e3f690df9233f423195e3d0938fdf42cde4f90a68a69f1273e544014a0f43b386b322b8b
+  data.tar.gz: 4c4870c03e0aa43e7082136e68d6c17873febcb5608090713fc5ee0873f8f5e5c061a74eb5d57159bac3962f3ca9ce906e629e329bd654c4fd4be61cedad4ea8

data/lib/predicate/factory.rb

@@ -17,6 +17,10 @@ class Predicate
       _factor_predicate([:qualified_identifier, qualifier, name])
     end
 
+    def placeholder
+      Placeholder.new
+    end
+
     def and(left, right = nil)
       _factor_predicate([:and, sexpr(left), sexpr(right)])
     end
@@ -31,7 +35,7 @@ class Predicate
 
     def in(left, right)
       left, right = sexpr(left), sexpr(right)
-      if right.literal? && right.value.empty?
+      if right.literal? && right.empty_value?
         contradiction
       else
         _factor_predicate([:in, left, right])

data/lib/predicate/grammar.sexp.yml

@@ -51,6 +51,7 @@ rules:
   term:
     - varref
     - literal
+    - placeholder
     - opaque
   varref:
     - qualified_identifier
@@ -59,6 +60,8 @@ rules:
     - [ "::Proc" ]
   literal:
     - "::Object"
+  placeholder:
+    - "::Predicate::Placeholder"
   opaque:
     - "::Object"
   options:

data/lib/predicate/nodes/eq.rb

@@ -32,9 +32,9 @@ class Predicate
 
     def constants
       left, right = sexpr(self.left), sexpr(self.right)
-      if left.identifier? && right.literal?
+      if left.identifier? && right.literal? && !right.has_placeholder?
         { left.name => right.value }
-      elsif right.identifier? && left.literal?
+      elsif right.identifier? && left.literal? && !left.has_placeholder?
         { right.name => left.value }
       else
         {}

data/lib/predicate/nodes/expr.rb

@@ -77,6 +77,10 @@ class Predicate
       Qualifier.new(qualifier).call(self)
     end
 
+    def bind(binding)
+      Binder.new(binding).call(self)
+    end
+
     def constant_variables
       []
     end

data/lib/predicate/nodes/in.rb

@@ -26,6 +26,7 @@ class Predicate
 
         # we only optimize if both right terms are literals
         return super unless right.literal? and other.right.literal?
+        return super if right.has_placeholder? or other.right.has_placeholder?
 
         intersection = right.value & other.right.value
         if intersection.empty?
@@ -45,7 +46,7 @@ class Predicate
     end
 
     def constant_variables
-      if right.literal? and right.value.size == 1
+      if right.literal? and right.singleton_value?
         free_variables
       else
         []
@@ -53,7 +54,7 @@ class Predicate
     end
 
     def constants
-      if right.literal? and right.value.size == 1
+      if right.literal? and right.singleton_value?
         { identifier.name => right.value.first }
       else
         {}
@@ -66,6 +67,7 @@ class Predicate
 
     def evaluate(tuple)
       values = right.evaluate(tuple)
+      raise UnboundError if values.is_a?(Placeholder)
       values.include?(identifier.evaluate(tuple))
     end
 

data/lib/predicate/nodes/intersect.rb

@@ -19,7 +19,7 @@ class Predicate
     end
 
     def constant_variables
-      values.size == 1 ? free_variables : []
+      []
     end
 
     def evaluate(tuple)

data/lib/predicate/nodes/literal.rb

@@ -14,7 +14,22 @@ class Predicate
       last
     end
 
+    def has_placeholder?
+      value.is_a?(Placeholder)
+    end
+
+    def empty_value?
+      return false if has_placeholder?
+      value.respond_to?(:empty?) && value.empty?
+    end
+
+    def singleton_value?
+      return false if has_placeholder?
+      value.respond_to?(:size) && value.size == 1
+    end
+
     def evaluate(tuple)
+      raise UnboundError if has_placeholder?
       value
     end
 

data/lib/predicate/placeholder.rb

@@ -0,0 +1,4 @@
+class Predicate
+  class Placeholder
+  end # class Placeholder
+end # class Predicate

data/lib/predicate/processors/binder.rb

@@ -0,0 +1,23 @@
+class Predicate
+  class Binder < Sexpr::Rewriter
+
+    grammar Grammar
+
+    def initialize(binding)
+      @binding = binding
+    end
+    attr_reader :binding
+
+    def on_literal(sexpr)
+      lit = sexpr.last
+      if lit.is_a?(Placeholder)
+        [:literal, binding[lit]]
+      else
+        sexpr
+      end
+    end
+
+    alias :on_missing :copy_and_apply
+
+  end
+end

data/lib/predicate/processors/to_s.rb

@@ -81,6 +81,7 @@ class Predicate
 
     def to_literal(x)
       case x
+      when Placeholder then "$#{x.object_id}"
       when Array then "{" << x.map{|y| to_literal(y) }.join(',') << "}"
       else x.inspect
       end

data/lib/predicate/processors.rb

@@ -1,3 +1,4 @@
 require_relative "processors/to_s"
 require_relative "processors/renamer"
 require_relative "processors/qualifier"
+require_relative "processors/binder"

data/lib/predicate/sequel/to_sequel.rb

@@ -13,7 +13,13 @@ class Predicate
       end
 
       def on_literal(sexpr)
-        sexpr.last.nil? ? nil : ::Sequel.expr(sexpr.last)
+        if sexpr.last.nil?
+          nil
+        elsif sexpr.last.is_a?(Predicate::Placeholder)
+          ::Sequel.lit("?", :"$#{sexpr.last.object_id}")
+        else
+          ::Sequel.expr(sexpr.last)
+        end
       end
 
       ###
@@ -48,18 +54,22 @@ class Predicate
       def on_in(sexpr)
         left, right = apply(sexpr.identifier), sexpr.right
         if right.literal?
-          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)
+          if right.has_placeholder?
+            ::Sequel.expr(left => [on_literal(right)])
+          else
+            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 => nil) | ::Sequel.expr(left => nonnil)
+              ::Sequel.expr(left => right.value)
             end
-          else
-            ::Sequel.expr(left => right.value)
           end
         elsif right.opaque?
           ::Sequel.expr(left => apply(right))

data/lib/predicate/version.rb

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

data/lib/predicate.rb

@@ -1,11 +1,13 @@
 require 'sexpr'
 require_relative 'predicate/version'
+require_relative 'predicate/placeholder'
 require_relative 'predicate/factory'
 require_relative 'predicate/grammar'
 require_relative 'predicate/processors'
 class Predicate
 
   class NotSupportedError < StandardError; end
+  class UnboundError < StandardError; end
 
   TupleLike = ->(t){ t.is_a?(Hash) }
 
@@ -90,6 +92,10 @@ class Predicate
     Predicate.new(expr.rename(renaming))
   end
 
+  def bind(binding)
+    Predicate.new(expr.bind(binding))
+  end
+
   def evaluate(tuple)
     expr.evaluate(tuple)
   end

data/spec/predicate/test_and_split.rb

@@ -53,6 +53,18 @@ class Predicate
       it{ should eq([ p.tautology, pred ]) }
     end
 
+    context "on eq with placeholder" do
+      let(:pred){ p.eq(:x, p.placeholder) }
+
+      it{ should eq([ pred, p.tautology ]) }
+    end
+
+    context "on in with placeholder" do
+      let(:pred){ p.in(:x, p.placeholder) }
+
+      it{ should eq([ pred, p.tautology ]) }
+    end
+
     context "on match (included)" do
       let(:pred){ p.match(:x, "London") }
 

data/spec/predicate/test_attr_split.rb

@@ -35,6 +35,18 @@ class Predicate
       it{ should eq({ x: pred }) }
     end
 
+    context "on eq with placeholder" do
+      let(:pred){ p.eq(:x, p.placeholder) }
+
+      it{ should eq({ x: pred }) }
+    end
+
+    context "on in" do
+      let(:pred){ p.in(:x, [2]) }
+
+      it{ should eq({ x: pred }) }
+    end
+
     context "on match" do
       let(:pred){ p.match(:x, "London") }
 

data/spec/predicate/test_bind.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+class Predicate
+  describe Predicate, "bind" do
+
+    it 'allowing binding a eq placeholder' do
+      p = Predicate.placeholder
+      unbound = Predicate.eq(:name, p)
+      bind = unbound.bind(p => "blambeau")
+      expect(bind).to eql(Predicate.eq(:name, "blambeau"))
+    end
+
+    it 'allowing binding an in placeholder' do
+      p = Predicate.placeholder
+      unbound = Predicate.in(:name, p)
+      bind = unbound.bind(p => ["blambeau","llambeau"])
+      expect(bind).to eql(Predicate.in(:name, ["blambeau","llambeau"]))
+    end
+
+    it 'applies recursively placeholder' do
+      p, p2 = Predicate.placeholder, Predicate.placeholder
+      unbound = Predicate.eq(:name, p) & Predicate.eq(:last, p2)
+      bind = unbound.bind(p => "bernard", p2 => "lambeau")
+      expect(bind).to eql(Predicate.eq(:name, "bernard") & Predicate.eq(:last, "lambeau"))
+    end
+
+  end
+end

data/spec/predicate/test_constant_variables.rb

@@ -10,12 +10,44 @@ class Predicate
       it{ expect(subject).to eql([:x, :y]) }
     end
 
+    describe "on a comp(:eq) with placeholder" do
+      let(:p){ Predicate.coerce(x: Predicate.placeholder) }
+
+      it{ expect(subject).to eql([:x]) }
+    end
+
     describe "on a in with one value" do
       let(:p){ Predicate.in(:x, [2]) }
 
       it{ expect(subject).to eql([:x]) }
     end
 
+    describe "on a in with one placeholder" do
+      let(:p){ Predicate.in(:x, Predicate.placeholder) }
+
+      it{ expect(subject).to eql([]) }
+    end
+
+    describe "on an intersect with many values" do
+      let(:p){ Predicate.intersect(:x, [2, 3]) }
+
+      it{ expect(subject).to eql([]) }
+    end
+
+    describe "on an intersect with one value" do
+      let(:p){ Predicate.intersect(:x, [2]) }
+
+      # TODO: is that correct?
+      it{ expect(subject).to eql([]) }
+    end
+
+    describe "on an intersect with a placeholder" do
+      let(:p){ Predicate.intersect(:x, Predicate.placeholder) }
+
+      # TODO: is that correct?
+      it{ expect(subject).to eql([]) }
+    end
+
     describe "on a in with mutiple values" do
       let(:p){ Predicate.in(:x, [2, 3]) }
 

data/spec/predicate/test_constants.rb

@@ -23,6 +23,12 @@ class Predicate
       it{ should eq({x: 2}) }
     end
 
+    context "on eq(identifier,placeholder)" do
+      let(:pred){ p.eq(:x, p.placeholder) }
+
+      it{ should eq({}) }
+    end
+
     context "on eq(value,identifier)" do
       let(:pred){ p.eq(2, :x) }
 
@@ -107,6 +113,12 @@ class Predicate
       it{ should eq({}) }
     end
 
+    context "on intersect with placeholder" do
+      let(:pred){ p.intersect(:x, p.placeholder) }
+
+      it{ should eq({}) }
+    end
+
     context "on or (two eqs)" do
       let(:pred){ p.eq(:x, 2) | p.eq(:y, 4) }
 

data/spec/predicate/test_evaluate.rb

@@ -216,6 +216,16 @@ class Predicate
       end
     end
 
+    context 'when having a placeholder' do
+      let(:predicate){
+        Predicate.match(:eq, Predicate.placeholder)
+      }
+
+      it "raises an UnboundError" do
+        expect{ predicate.evaluate({}) }.to raise_error(UnboundError)
+      end
+    end
+
     context 'has a call alias' do
       let(:predicate){
         Predicate.new(Factory.gte(:x => 0))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: predicate
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-31 00:00:00.000000000 Z
+date: 2020-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexpr
@@ -116,7 +116,9 @@ files:
 - lib/predicate/nodes/or.rb
 - lib/predicate/nodes/qualified_identifier.rb
 - lib/predicate/nodes/tautology.rb
+- lib/predicate/placeholder.rb
 - lib/predicate/processors.rb
+- lib/predicate/processors/binder.rb
 - lib/predicate/processors/qualifier.rb
 - lib/predicate/processors/renamer.rb
 - lib/predicate/processors/to_s.rb
@@ -166,6 +168,7 @@ files:
 - spec/nodes/qualified_identifier/test_qualifier.rb
 - spec/predicate/test_and_split.rb
 - spec/predicate/test_attr_split.rb
+- spec/predicate/test_bind.rb
 - spec/predicate/test_bool_and.rb
 - spec/predicate/test_bool_not.rb
 - spec/predicate/test_bool_or.rb