predicate 2.10.0 → 2.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba74ff534d4a9b58d4fdc9dc671d17275d9d01d65b391b509be68fd6500fb75b
-  data.tar.gz: 964c06320295c968a80547e7af048bfd6382638414e724734f7b79ab9c739ac1
+  metadata.gz: '09ccf1574a1c60ddbbc1098e0366b64bef8ac7293a68beadc6a62703ee226157'
+  data.tar.gz: 8f2ab6ebda4b51e7daf12b747bb0042f2fe7d3117a0ac67b1b8204cb11cdb882
 SHA512:
-  metadata.gz: e4ac5d9e093b57a77ca942c11f602e13460d9e9154d6f5b271651c3ea7972c6fc0fb01a19b66c1a462e2c2d0d8760b7479ec75db566ef83fa7c63c1b3ab62db9
-  data.tar.gz: 275ebdd55119eca9b6ef5513f90ba0a2e9664cf2a70fa3fa28da342fcbb0ce91ade41154cbc04e187c89c33b34473d0a83fe98828aec40c1573dc465f1031518
+  metadata.gz: e805d5307a5977dae82e83ee41a92c1fba18e23eae6dacdaa84e374d9ddcaf068c597bcd5ab1b71763a214a98e80007ce80b29e68b39fbde2bdbfa2323b65a7e
+  data.tar.gz: f4031f7cba8e49714ca7e8f3c9a05864a23cfee7ad29829aab48cd4b159cc905721796ceb15d02bd585008c07fea41625d3a4d0f8d01a7af282cc09634a06abf

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 = 12
     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,13 @@
 --- !ruby/object:Gem::Specification
 name: predicate
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.12.0
 platform: ruby
 authors:
 - Bernard Lambeau
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-24 00:00:00.000000000 Z
+date: 2026-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexpr
@@ -31,6 +30,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,76 +40,93 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13'
+        version: '13.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13'
+        version: '13.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.80'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.80'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 description: Predicate provides a simple class and processors to encode and manipulate
   (tuple) predicates
 email: blambeau@gmail.com
@@ -266,7 +285,6 @@ homepage: http://github.com/enspirit/predicate
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -274,15 +292,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Predicate provides a simple class and processors to encode and manipulate
   (tuple) predicates