predicate 2.3.2 → 2.6.0

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

data/spec/predicate/test_to_s.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+class Predicate
+  describe Predicate, "to_s" do
+
+    let(:p){ Predicate }
+
+    subject{ predicate.to_s }
+
+    context "tautology" do
+      let(:predicate){ Predicate.tautology }
+
+      it{ expect(subject).to eql("true") }
+    end
+
+    context "contradiction" do
+      let(:predicate){ Predicate.contradiction }
+
+      it{ expect(subject).to eql("false") }
+    end
+
+    context "var" do
+      let(:predicate){ Predicate.var("x.y") }
+
+      it{ expect(subject).to eql("dig(x.y)") }
+    end
+
+    context "var when used in another predicate" do
+      let(:predicate){
+        v = Predicate.var("x.y")
+        Predicate.eq(v, 6)
+      }
+
+      it{ expect(subject).to eql("dig(x.y) == 6") }
+    end
+
+  end
+end

data/spec/predicate/test_unqualify.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+class Predicate
+  describe Predicate, "unqualify" do
+
+    let(:p){ Predicate }
+
+    subject{ predicate.unqualify }
+
+    context 'when the predicate is not qualified' do
+      let(:predicate){ p.in(:x, [2]) & p.eq(:y, :z) }
+
+      it 'works as expected' do
+        expect(subject).to eql(predicate)
+      end
+    end
+
+  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) }
 
@@ -164,6 +173,22 @@ class Predicate
       end
     end
 
+    context 'subset' do
+      let(:predicate) { Predicate.subset(:x, [8, 9]) }
+
+      it 'raises an error' do
+        expect { subject }.to raise_error(NotSupportedError)
+      end
+    end
+
+    context 'superset' do
+      let(:predicate) { Predicate.superset(:x, [8, 9]) }
+
+      it 'raises an error' do
+        expect { subject }.to raise_error(NotSupportedError)
+      end
+    end
+
     context 'match' do
       let(:predicate) { Predicate.match(left, right, options) }
       let(:options){ nil }

data/spec/shared/a_predicate.rb

@@ -0,0 +1,30 @@
+shared_examples_for "a predicate" do
+
+  let(:w){ [8, 9] }
+  let(:x){ 12 }
+  let(:y){ 13 }
+
+  it 'can be negated easily' do
+    (!subject).should be_a(Predicate)
+  end
+
+  it 'detects stupid AND' do
+    (subject & Predicate.tautology).should be(subject)
+  end
+
+  it 'detects stupid OR' do
+    (subject | Predicate.contradiction).should be(subject)
+  end
+
+  it 'has free variables' do
+    (fv = subject.free_variables).should be_a(Array)
+    (fv - [ :w, :x, :y ]).should be_empty
+  end
+
+  it 'always splits around and trivially when no free variables are touched' do
+    top, down = subject.and_split([:z])
+    top.should be_tautology
+    down.should eq(subject)
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require "rspec"
 require 'predicate'
+require_relative 'shared/a_predicate'
 
 module Helpers
 

data/spec/test_predicate.rb

@@ -1,36 +1,5 @@
 require 'spec_helper'
 
-shared_examples_for "a predicate" do
-
-  let(:w){ [8, 9] }
-  let(:x){ 12 }
-  let(:y){ 13 }
-
-  it 'can be negated easily' do
-    (!subject).should be_a(Predicate)
-  end
-
-  it 'detects stupid AND' do
-    (subject & Predicate.tautology).should be(subject)
-  end
-
-  it 'detects stupid OR' do
-    (subject | Predicate.contradiction).should be(subject)
-  end
-
-  it 'has free variables' do
-    (fv = subject.free_variables).should be_a(Array)
-    (fv - [ :w, :x, :y ]).should be_empty
-  end
-
-  it 'always splits around and trivially when no free variables are touched' do
-    top, down = subject.and_split([:z])
-    top.should be_tautology
-    down.should eq(subject)
-  end
-
-end
-
 describe 'Predicate.tautology' do
   subject{ Predicate.tautology }
 
@@ -49,7 +18,17 @@ describe "Predicate.comp" do
   it_should_behave_like "a predicate"
 end
 
-describe "Predicate.in" do
+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]) }
 
   it_should_behave_like "a predicate"
@@ -59,6 +38,36 @@ describe "Predicate.in" do
   end
 end
 
+describe "Predicate.in, with an inclusive range" do
+  subject{ Predicate.in(:x, 1..10) }
+
+  it_should_behave_like "a predicate"
+
+  it 'should be a shortcut over comparisons' do
+    expect(subject).to eql(Predicate.gte(:x, 1) & Predicate.lte(:x, 10))
+  end
+end
+
+describe "Predicate.in, with an exclusive range" do
+  subject{ Predicate.in(:x, 1...10) }
+
+  it_should_behave_like "a predicate"
+
+  it 'should be a shortcut over comparisons' do
+    expect(subject).to eql(Predicate.gte(:x, 1) & Predicate.lt(:x, 10))
+  end
+end
+
+describe "Predicate.in, with an empty range" do
+  subject{ Predicate.in(:x, 1...1) }
+
+  it_should_behave_like "a predicate"
+
+  it 'should be a contradiction' do
+    expect(subject).to eql(Predicate.contradiction)
+  end
+end
+
 describe "Predicate.among" do
   subject{ Predicate.among(:x, [2, 3]) }
 
@@ -66,7 +75,19 @@ describe "Predicate.among" do
 end
 
 describe "Predicate.intersect" do
-  subject{ Predicate.intersect(:w, [2, 3]) }
+  subject{ Predicate.intersect(:x, [2, 3]) }
+
+  it_should_behave_like "a predicate"
+end
+
+describe "Predicate.subset" do
+  subject{ Predicate.subset(:x, [2, 3]) }
+
+  it_should_behave_like "a predicate"
+end
+
+describe "Predicate.superset" do
+  subject{ Predicate.superset(:x, [2, 3]) }
 
   it_should_behave_like "a predicate"
 end
@@ -136,3 +157,27 @@ describe "Predicate.not" do
 
   it_should_behave_like "a predicate"
 end
+
+describe "Predicate.dsl" do
+  subject{ Predicate.dsl{ eq(:x, 6) & lte(:y, 5)} }
+
+  it_should_behave_like "a predicate"
+end
+
+describe "Predicate.empty" do
+  subject{ Predicate.empty(:x) }
+
+  it_should_behave_like "a predicate"
+end
+
+describe "Predicate.has_size" do
+  subject{ Predicate.has_size(:x, 1..10) }
+
+  it_should_behave_like "a predicate"
+end
+
+#jeny(predicate) describe "Predicate.${op_name}" do
+#jeny(predicate)   subject{ Predicate.${op_name}(TODO) }
+#jeny(predicate)
+#jeny(predicate)   it_should_behave_like "a predicate"
+#jeny(predicate) end

data/spec/test_readme.rb

@@ -0,0 +1,80 @@
+require 'spec_helper'
+require 'ostruct'
+
+describe "README" do
+
+  it 'has a correct first example' do
+    p = Predicate.eq(:x, 2) & !Predicate.lte(:y, 3)
+    expect(p.evaluate(:x => 2, :y => 6)).to eql(true)
+    expect(p.evaluate(:x => 2, :y => 3)).to eql(false)
+  end
+
+  it 'has a correct second example' do
+    p = Predicate.dsl{
+      eq(:x, 2) & !lte(:y, 3)
+    }
+    expect(p.evaluate(:x => 2, :y => 6)).to eql(true)
+    expect(p.evaluate(:x => 2, :y => 3)).to eql(false)
+  end
+
+  it 'has a correct third example' do
+    p1 = Predicate.gt(:x, 1) & Predicate.lt(:x, 10)
+    p2 = Predicate.dsl{
+      gt(:x, 1) & lt(:x, 10)
+    }
+    p3 = Predicate.currying(:x){
+      gt(1) & lt(10)
+    }
+    [p1, p2, p3].all?{|p|
+      expect(p.evaluate(:x => 0)).to eql(false)
+      expect(p.evaluate(:x => 6)).to eql(true)
+      expect(p.evaluate(:x => 22)).to eql(false)
+    }
+  end
+
+  it 'has a correct fourth example' do
+    p = Predicate.currying{
+      gt(1) & lt(10)
+    }
+    expect(p.evaluate(0)).to eql(false)
+    expect(p.evaluate(6)).to eql(true)
+    expect(p.evaluate(22)).to eql(false)
+  end
+
+  it 'has a correct fifth example' do
+    x, y = Predicate.vars("items.0.price", "items.1.price")
+    p = Predicate.eq(x, 6) & Predicate.lt(y, 10)
+    expect(p.evaluate({
+      items: [
+        { name: "Candy", price: 6 },
+        { name: "Crush", price: 4 }
+      ]
+    })).to eql(true)    
+  end
+
+  it 'has a correct sixth example' do
+    xyz = Predicate.var([:x, :y, :z], :dig)
+    p = Predicate.eq(xyz, 2)
+    expect(p.evaluate({ x: { y: { z: 2 } } })).to eql(true)
+  end
+
+  it 'has a correct seventh example' do
+    class C
+      attr_reader :x
+      def initialize(x)
+        @x = x
+      end
+    end
+
+    [:send, :public_send].each do |semantics|
+      xy = Predicate.var([:x, :y], semantics)
+      p = Predicate.eq(xy, 2)
+      expect(p.evaluate(C.new(OpenStruct.new(y: 2)))).to eql(true)
+
+      xy = Predicate.var("x.y", semantics)
+      p = Predicate.eq(xy, 2)
+      expect(p.evaluate(C.new(OpenStruct.new(y: 2)))).to eql(true)
+    end
+  end
+
+end

data/spec/test_sugar.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe "Predicate.min_size" do
+  subject{ Predicate.min_size(:x, 1) }
+
+  it 'works as expected' do
+    expect(subject).to eq(Predicate.has_size(:x, Range.new(1, nil)))
+    expect(subject.call(x: "")).to eq(false)
+    expect(subject.call(x: "1")).to eq(true)
+  end
+end if RUBY_VERSION >= "2.6"
+
+describe "Predicate.min_size" do
+  subject{ Predicate.min_size(:x, 1) }
+
+  it 'works as expected' do
+    expect(subject.call(x: "")).to eq(false)
+    expect(subject.call(x: "1")).to eq(true)
+  end
+end if RUBY_VERSION < "2.6"
+
+describe "Predicate.max_size" do
+  subject{ Predicate.max_size(:x, 10) }
+
+  it 'works as expected' do
+    expect(subject).to eq(Predicate.has_size(:x, 0..10))
+    expect(subject.call(x: "")).to eq(true)
+    expect(subject.call(x: "01234567891")).to eq(false)
+  end
+end
+
+describe "Predicate.is_null" do
+  subject{ Predicate.is_null(:x) }
+
+  it 'works as expected' do
+    expect(subject).to eq(Predicate.eq(:x, nil))
+    expect(subject.call(x: nil)).to eq(true)
+    expect(subject.call(x: "01234567891")).to eq(false)
+  end
+end
+
+#jeny(sugar) describe "Predicate.${op_name}" do
+#jeny(sugar)   subject{ Predicate.${op_name}(TODO) }
+#jeny(sugar)
+#jeny(sugar)   it 'works as expected' do
+#jeny(sugar)     expect(subject).to eq(TODO)
+#jeny(sugar)   end
+#jeny(sugar) end

data/tasks/test.rake

@@ -1,9 +1,9 @@
 namespace :test do
+  require 'rspec/core/rake_task'
 
   desc %q{Run all RSpec tests}
-  task :unit do
-    require 'rspec'
-    RSpec::Core::Runner.run(%w[-I. -Ilib -Ispec --pattern=spec/**/test_*.rb --color .])
+  RSpec::Core::RakeTask.new(:unit) do |t|
+    t.rspec_opts = %w[-I. -Ilib -Ispec --pattern=spec/**/test_*.rb --color .]
   end
 
   task :all => :"unit"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: predicate
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.6.0
 platform: ruby
 authors:
 - Bernard Lambeau
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-08 00:00:00.000000000 Z
+date: 2021-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexpr
@@ -16,42 +16,42 @@ 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
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -89,18 +89,25 @@ extra_rdoc_files: []
 files:
 - Gemfile
 - LICENSE.md
+- README.md
 - Rakefile
+- bin/g
 - lib/predicate.rb
+- lib/predicate/dsl.rb
 - lib/predicate/factory.rb
 - lib/predicate/grammar.rb
 - lib/predicate/grammar.sexp.yml
+- lib/predicate/nodes/${op_name}.rb.jeny
 - lib/predicate/nodes/and.rb
+- lib/predicate/nodes/binary_func.rb
 - lib/predicate/nodes/contradiction.rb
 - lib/predicate/nodes/dyadic_comp.rb
+- lib/predicate/nodes/empty.rb
 - lib/predicate/nodes/eq.rb
 - lib/predicate/nodes/expr.rb
 - lib/predicate/nodes/gt.rb
 - lib/predicate/nodes/gte.rb
+- lib/predicate/nodes/has_size.rb
 - lib/predicate/nodes/identifier.rb
 - lib/predicate/nodes/in.rb
 - lib/predicate/nodes/intersect.rb
@@ -115,30 +122,42 @@ files:
 - lib/predicate/nodes/opaque.rb
 - lib/predicate/nodes/or.rb
 - lib/predicate/nodes/qualified_identifier.rb
+- lib/predicate/nodes/set_op.rb
+- lib/predicate/nodes/subset.rb
+- lib/predicate/nodes/superset.rb
 - lib/predicate/nodes/tautology.rb
+- lib/predicate/nodes/unary_func.rb
+- lib/predicate/nodes/var.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
+- lib/predicate/processors/unqualifier.rb
 - lib/predicate/sequel.rb
 - lib/predicate/sequel/to_sequel.rb
+- lib/predicate/sugar.rb
 - lib/predicate/version.rb
+- spec/dsl/test_dsl.rb
+- spec/dsl/test_evaluate.rb
+- spec/dsl/test_respond_to_missing.rb
+- spec/dsl/test_to_skake_case.rb
 - spec/factory/shared/a_comparison_factory_method.rb
 - spec/factory/shared/a_predicate_ast_node.rb
+- spec/factory/test_${op_name}.rb.jeny
 - spec/factory/test_and.rb
-- spec/factory/test_between.rb
 - spec/factory/test_comp.rb
 - spec/factory/test_contradiction.rb
+- spec/factory/test_empty.rb
 - spec/factory/test_eq.rb
 - spec/factory/test_factor_predicate.rb
 - spec/factory/test_from_hash.rb
 - spec/factory/test_gt.rb
 - spec/factory/test_gte.rb
+- spec/factory/test_has_size.rb
 - spec/factory/test_identifier.rb
 - spec/factory/test_in.rb
-- spec/factory/test_intersect.rb
 - spec/factory/test_literal.rb
 - spec/factory/test_lt.rb
 - spec/factory/test_lte.rb
@@ -148,14 +167,20 @@ files:
 - spec/factory/test_not.rb
 - spec/factory/test_or.rb
 - spec/factory/test_qualified_identifier.rb
+- spec/factory/test_set_ops.rb
 - spec/factory/test_tautology.rb
+- spec/factory/test_var.rb
+- spec/factory/test_vars.rb
 - spec/grammar/test_match.rb
 - spec/grammar/test_sexpr.rb
+- spec/nodes/${op_name}.jeny/test_evaluate.rb.jeny
 - spec/nodes/and/test_and.rb
 - spec/nodes/and/test_and_split.rb
 - spec/nodes/and/test_attr_split.rb
 - spec/nodes/dyadic_comp/test_and_split.rb
+- spec/nodes/empty/test_evaluate.rb
 - spec/nodes/eq/test_and.rb
+- spec/nodes/has_size/test_evaluate.rb
 - spec/nodes/identifier/test_and_split.rb
 - spec/nodes/identifier/test_free_variables.rb
 - spec/nodes/identifier/test_name.rb
@@ -182,16 +207,22 @@ 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_to_s.rb
+- spec/predicate/test_unqualify.rb
 - spec/sequel/test_to_sequel.rb
+- spec/shared/a_predicate.rb
 - spec/spec_helper.rb
 - spec/test_predicate.rb
+- spec/test_readme.rb
+- spec/test_sugar.rb
 - tasks/gem.rake
 - tasks/test.rake
 homepage: http://github.com/enspirit/predicate
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -206,8 +237,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Predicate provides a simple class and processors to encode and manipulate
   (tuple) predicates

data/spec/factory/test_between.rb

@@ -1,12 +0,0 @@
-require_relative "shared/a_comparison_factory_method"
-class Predicate
-  describe Factory, 'between' do
-
-    subject{ Factory.between(:x, 2, 3) }
-
-    it{ should be_a(And) }
-
-    it{ should eq([:and, [:gte, [:identifier, :x], [:literal, 2]], [:lte, [:identifier, :x], [:literal, 3]]]) }
-
-  end
-end

data/spec/factory/test_intersect.rb

@@ -1,12 +0,0 @@
-require_relative "shared/a_comparison_factory_method"
-class Predicate
-  describe Factory, 'intersect' do
-
-    subject{ Factory.intersect(:x, [2, 3]) }
-
-    it{ should be_a(Intersect) }
-
-    it{ should eq([:intersect, [:identifier, :x], [2, 3]]) }
-
-  end
-end