predicate 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2faa507af72faac3d76ea9e9a5f1b4fade753afa
-  data.tar.gz: dcb6ca71f2d7d35acf950877428c31e6755944e3
+  metadata.gz: 301830894045bb25bd0641f77273a4924e8ff743
+  data.tar.gz: b04f894cb93548246b50085170cc83e3d1476acc
 SHA512:
-  metadata.gz: a3536e379bbbc676be3572761887d9d8752b073fbbe9892518fcff2a3de13818b3cb958e19cad86402db7b0c5566e286dfac1126543c6b8a96173b36463691ba
-  data.tar.gz: 543b030ece30b9bda05e3a61616d2aaf7c7d4b2e271665609c77e548b87a5dbb7063e1ca602f556fe119d89b9a8445fff30d79edd4564a501844b376d28c9c64
+  metadata.gz: 3e1968b96700a0cb15da2d143fa3d0776d26ee54855232dc0e30e2854748ffd5b12c3767cb8121d95aa006d6c6a6695bf091ea262d4a8de5e1c5c099e73d730c
+  data.tar.gz: 3f0c0192c97d90654b36de5dbaf4a94c18a86a1787a13d27ec9d127902b8c48cd5969bca338695024b33dbd62f8dcfcfc1513cb44bcc9adcfbd2d39ef74bd1a0

data/lib/predicate/nodes/and.rb

@@ -7,9 +7,14 @@ class Predicate
     end
 
     def and_split(attr_list)
+      # Say we are X = X1 & X2 & X3
+      # We will split each term: X = (X1 & Y1) & (X2 & Y2) & (X3 & Y3)
+      # ... such that Y1, Y2, and Y2 makes no reference to attr_list
+      # ... which is equivalent to (X1 & X2 & X3) & (Y1 & Y2 & Y3)
+      # ... hence P1 & P2, that we return
       sexpr_body.inject([tautology, tautology]) do |(top,down),term|
-        pair = term.and_split(attr_list)
-        [top & pair.first, down & pair.last]
+        p1, p2 = term.and_split(attr_list)
+        [top & p1, down & p2]
       end
     end
 

data/lib/predicate/nodes/contradiction.rb

@@ -26,9 +26,5 @@ class Predicate
       @free_variables ||= []
     end
 
-    def and_split(*args)
-      [tautology, self]
-    end
-
   end
 end

data/lib/predicate/nodes/expr.rb

@@ -36,6 +36,7 @@ class Predicate
     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 ]
     end
 

data/lib/predicate/nodes/native.rb

@@ -10,6 +10,12 @@ class Predicate
       self[1]
     end
 
+    def and_split(attr_list)
+      # I possibly make references to those attributes, so
+      # I can't be P2
+      [ self, tautology ]
+    end
+
     def to_ruby_code(scope = 't')
       if proc.respond_to?(:source_code)
         code = proc.source_code

data/lib/predicate/version.rb

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

data/lib/predicate.rb

@@ -88,6 +88,9 @@ class Predicate
     to_proc.call(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`.
   def and_split(attr_list)
     expr.and_split(attr_list).map{|e| Predicate.new(e)}
   end

data/spec/nodes/and/test_and_split.rb

@@ -62,5 +62,23 @@ class Predicate
       end
     end
 
+    context 'with a native on one side' do
+      let(:left) { Factory.eq(:x, 2)       }
+      let(:right){ Factory.native(->(t){}) }
+      let(:predicate){ left & right }
+
+      context 'when fully covered' do
+        let(:list){ [:x, :y, :z] }
+
+        it{ should eq([predicate, tautology]) }
+      end
+
+      context 'when not covered' do
+        let(:list){ [:y] }
+
+        it{ should eq([right, left]) }
+      end
+    end
+
   end
 end

data/spec/nodes/or/test_and_split.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+class Predicate
+  describe Or, "and_split" do
+
+    let(:tautology){ Factory.tautology  }
+
+    subject{ predicate.and_split(list) }
+
+    context 'when attributes on one side' do
+      let(:predicate){ Factory.eq(:x, 2) | Factory.eq(:y, 3) }
+
+      context 'when fully covered' do
+        let(:list){ [:x, :y] }
+
+        it{ should eq([predicate, tautology]) }
+      end
+
+      context 'when fully disjoint' do
+        let(:list){ [:z] }
+
+        it{ should eq([tautology, predicate]) }
+      end
+
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: predicate
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Bernard Lambeau
@@ -152,6 +152,7 @@ files:
 - spec/nodes/identifier/test_free_variables.rb
 - spec/nodes/identifier/test_name.rb
 - spec/nodes/nadic_bool/test_free_variables.rb
+- spec/nodes/or/test_and_split.rb
 - spec/nodes/qualified_identifier/test_and_split.rb
 - spec/nodes/qualified_identifier/test_free_variables.rb
 - spec/nodes/qualified_identifier/test_name.rb