predicate 2.7.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9cef06edb829e0b79b74be5d6f69b329f1cc6656
-  data.tar.gz: 32535df41b6b08a634d818308c05424509683b58
+SHA256:
+  metadata.gz: 3b905f4aeb37f046ccef6ac9b7afc674f19f3a91f865be488354daecc8ef28f1
+  data.tar.gz: d205d1b1e789b2f549ccfe6181f7dfc66a7a650346050c1497521000e243f85f
 SHA512:
-  metadata.gz: 650836d9f3b0534271a38b2e58f59f4f93aad9fad9b60017777a0c1ab91e373ffe458d1a77bcc2309405c267b657c89121abb401f6687d19f8f79196d209dd06
-  data.tar.gz: 70a98a7269cda44050632396a4c90cfafddf16a8b06b1dc76fc1962cab7b4e8520e64244dc20cbf8e2369cbf21e7733f913d7b80cffa4dda0ec26b81decaaaae
+  metadata.gz: a9ec299aaa242f521d53042df037536e618e00cceebe612c56d083eb3ea62ae7175c9dcfefe45b9dcf52df3b22c4a594a6c1456047a807a924ae4fb0029a60c4
+  data.tar.gz: c3f88782791b4fbb0d645be5d24a7bfb54b4bddc7128b30b84e60c2fc66f9bb9fa4407620dcbed6f12cb8773fb112cf223ab38cbc96a43fd8c15c96ba66f0e9d

data/lib/predicate/asserter.rb

@@ -0,0 +1,12 @@
+require 'minitest'
+class Predicate
+  class Asserter
+    include Minitest::Assertions
+
+    def initialize
+      @assertions = 0
+    end
+    attr_accessor :assertions
+
+  end # class Asserter
+end # class Predicate

data/lib/predicate/grammar.rb

@@ -30,6 +30,7 @@ require_relative 'nodes/gte'
 require_relative 'nodes/lt'
 require_relative 'nodes/lte'
 require_relative 'nodes/in'
+require_relative 'nodes/exists'
 require_relative 'nodes/set_op'
 require_relative 'nodes/intersect'
 require_relative 'nodes/subset'

data/lib/predicate/grammar.sexp.yml

@@ -15,6 +15,7 @@ rules:
     - gt
     - gte
     - in
+    - exists
     - intersect
     - subset
     - superset
@@ -72,6 +73,7 @@ rules:
     - literal
     - placeholder
     - opaque
+    - exists
   varref:
     - qualified_identifier
     - identifier
@@ -84,6 +86,8 @@ rules:
     - "::Predicate::Placeholder"
   opaque:
     - "::Object"
+  exists:
+    - "::Object"
   handler:
     - "::Object"
   options:

data/lib/predicate/nodes/eq.rb

@@ -46,6 +46,12 @@ class Predicate
       left.evaluate(tuple) == right.evaluate(tuple)
     end
 
+    def assert!(tuple, asserter = Asserter.new)
+      l, r = left.evaluate(tuple), right.evaluate(tuple)
+      asserter.assert_equal(l, r)
+      l
+    end
+
     def to_hash
       if left.identifier? && right.literal? && !right.has_placeholder?
         { left.name => right.value }

data/lib/predicate/nodes/exists.rb

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

data/lib/predicate/nodes/expr.rb

@@ -50,6 +50,10 @@ class Predicate
       sexpr([:or, self, other])
     end
 
+    def assert!(tuple, asserter = Asserter.new)
+      asserter.assert(evaluate(tuple))
+    end
+
     def and_split(attr_list)
       # If we have no reference to attr_list, then we are P2, else we are P1
       (free_variables & attr_list).empty? ? [ tautology, self ] : [ self, tautology ]

data/lib/predicate/nodes/neq.rb

@@ -10,5 +10,11 @@ class Predicate
       left.evaluate(tuple) != right.evaluate(tuple)
     end
 
+    def assert!(tuple, asserter = Asserter.new)
+      l, r = left.evaluate(tuple), right.evaluate(tuple)
+      asserter.refute_equal(l, r)
+      l
+    end
+
   end
 end

data/lib/predicate/version.rb

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

data/lib/predicate.rb

@@ -6,6 +6,7 @@ require_relative 'predicate/sugar'
 require_relative 'predicate/grammar'
 require_relative 'predicate/processors'
 require_relative 'predicate/dsl'
+require_relative 'predicate/asserter'
 class Predicate
 
   class Error < StandardError; end
@@ -125,6 +126,10 @@ class Predicate
     expr.evaluate(tuple)
   end
 
+  def assert!(tuple = {})
+    expr.assert!(tuple)
+  end
+
   # Splits this predicate, say P, as too predicates P1 & P2
   # such that `P <=> P1 & P2` and P2 makes no reference to
   # any attribute in `attr_list`.

data/spec/predicate/test_assert!.rb

@@ -0,0 +1,67 @@
+require 'spec_helper'
+class Predicate
+  describe Predicate, "assert!" do
+
+    describe "eq" do
+      let(:predicate) {
+        Predicate.eq(:x, 2)
+      }
+
+      subject{
+        predicate.assert!(input)
+      }
+
+      context "when ok" do
+        let(:input){
+          { x: 2 }
+        }
+        it 'works and returns 2' do
+          expect(subject).to eql(2)
+        end
+      end
+
+      context "when ko" do
+        let(:input){
+          { x: 3 }
+        }
+        it 'works and throws' do
+          expect{
+            subject
+          }.to raise_error(Minitest::Assertion, /Expected: 3\s+Actual: 2/)
+        end
+      end
+    end
+
+    describe "neq" do
+      let(:predicate) {
+        Predicate.neq(:x, 2)
+      }
+
+      subject{
+        predicate.assert!(input)
+      }
+
+      context "when ok" do
+        let(:input){
+          { x: 3 }
+        }
+        it 'works and returns 3' do
+          expect(subject).to eql(3)
+        end
+      end
+
+      context "when ko" do
+        let(:input){
+          { x: 2 }
+        }
+        it 'works and throws' do
+          expect{
+            subject
+          }.to raise_error(Minitest::Assertion, /Expected 2 to not be equal to 2./)
+        end
+      end
+    end
+
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: predicate
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-10 00:00:00.000000000 Z
+date: 2023-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexpr
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -107,6 +121,7 @@ files:
 - Rakefile
 - bin/g
 - lib/predicate.rb
+- lib/predicate/asserter.rb
 - lib/predicate/dsl.rb
 - lib/predicate/factory.rb
 - lib/predicate/grammar.rb
@@ -118,6 +133,7 @@ files:
 - lib/predicate/nodes/dyadic_comp.rb
 - lib/predicate/nodes/empty.rb
 - lib/predicate/nodes/eq.rb
+- lib/predicate/nodes/exists.rb
 - lib/predicate/nodes/expr.rb
 - lib/predicate/nodes/gt.rb
 - lib/predicate/nodes/gte.rb
@@ -218,6 +234,7 @@ files:
 - spec/postgres/test_to_postgres.rb
 - spec/postgres/test_to_sequel.rb
 - spec/predicate/test_and_split.rb
+- spec/predicate/test_assert!.rb
 - spec/predicate/test_attr_split.rb
 - spec/predicate/test_bind.rb
 - spec/predicate/test_bool_and.rb
@@ -263,8 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Predicate provides a simple class and processors to encode and manipulate