predicate 2.10.0 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba74ff534d4a9b58d4fdc9dc671d17275d9d01d65b391b509be68fd6500fb75b
-  data.tar.gz: 964c06320295c968a80547e7af048bfd6382638414e724734f7b79ab9c739ac1
+  metadata.gz: 6fd6ea9f498fb935b7445d0486d1ff4387da5f8e9d71525c762abeb214353b13
+  data.tar.gz: f0bbf5080ea295803a10823984d5d99112033a2ea98dbaf1bdc3846fadd65db0
 SHA512:
-  metadata.gz: e4ac5d9e093b57a77ca942c11f602e13460d9e9154d6f5b271651c3ea7972c6fc0fb01a19b66c1a462e2c2d0d8760b7479ec75db566ef83fa7c63c1b3ab62db9
-  data.tar.gz: 275ebdd55119eca9b6ef5513f90ba0a2e9664cf2a70fa3fa28da342fcbb0ce91ade41154cbc04e187c89c33b34473d0a83fe98828aec40c1573dc465f1031518
+  metadata.gz: 4422e7cf2eda59e119df2e1aa89fc703a9dc935c1bd80a9d625d6281316786fb2e56d5ad6c4dcd2a06a77a58510df9f74b2a3cf0e735a8f5b4f6014487a6ed4e
+  data.tar.gz: 310883c2b4d6c7e8661219969097e199a7bd9f6a6cd3ef520c93026a1b42485cf52b492449320d833aa0e00ff398d17cae00f7cd2ec089edbfb3a5a90eeebf52

data/lib/predicate/nodes/or.rb

@@ -10,5 +10,37 @@ class Predicate
       sexpr_body.any?{|op| op.evaluate(tuple) }
     end
 
+    # A disjunction can be represented as a `{ attr => [values] }` hash only
+    # when every operand constrains the *same single* attribute to a literal
+    # or a set of literals, e.g. `x == 1 OR x == 2 OR x IN [3, 4]`. Operands
+    # are folded together into an IN-style hash. As soon as an operand touches
+    # another attribute, or cannot itself be represented as a hash, the whole
+    # disjunction is not representable and an ArgumentError is raised (as for
+    # any other non-representable predicate).
+    def to_hash
+      merged = sexpr_body.inject(nil) do |acc, term|
+        hash = term.to_hash
+        return super unless hash.size == 1
+
+        attr, value = hash.first
+        values = value.is_a?(Array) ? value : [value]
+
+        if acc.nil?
+          [attr, values.dup]
+        elsif acc.first == attr
+          [attr, acc.last + values]
+        else
+          return super
+        end
+      end
+
+      return super if merged.nil?
+      { merged.first => merged.last.uniq }
+    end
+
+    def to_hashes
+      [ to_hash, {} ]
+    end
+
   end
 end

data/lib/predicate/version.rb

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

data/spec/predicate/test_to_hash.rb

@@ -36,5 +36,23 @@ class Predicate
       it{ expect(subject).to eql(x: 3, y: [2,3]) }
     end
 
+    context "or of eqs on the same attribute" do
+      let(:predicate){ Predicate.eq(:x, 2) | Predicate.eq(:x, 3) }
+
+      it{ expect(subject).to eql(x: [2,3]) }
+    end
+
+    context "or mixing eq and in on the same attribute" do
+      let(:predicate){ Predicate.eq(:x, 2) | Predicate.in(:x, [3,4]) }
+
+      it{ expect(subject).to eql(x: [2,3,4]) }
+    end
+
+    context "or on distinct attributes" do
+      let(:predicate){ Predicate.eq(:x, 2) | Predicate.eq(:y, 3) }
+
+      it{ expect{ subject }.to raise_error(ArgumentError) }
+    end
+
   end
 end

data/spec/predicate/test_to_hashes.rb

@@ -48,6 +48,12 @@ class Predicate
       it{ expect(subject).to eql([{y: [2,3]},{x: 3}]) }
     end
 
+    context "or of eqs on the same attribute" do
+      let(:predicate){ Predicate.eq(:x, 2) | Predicate.eq(:x, 3) }
+
+      it{ expect(subject).to eql([{x: [2,3]},{}]) }
+    end
+
     context "not nil & eq" do
       let(:predicate){ Predicate.neq(:x, nil) & Predicate.eq(:x, [2,3]) }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: predicate
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.11.0
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-24 00:00:00.000000000 Z
+date: 2026-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexpr