activerecord_any_of 2.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f426526955604bce6800c7d7b84913cd198ad0a0b821be1e5fa7dc5b0bb215b
-  data.tar.gz: '08597e05b96433c2bd29cd95750beba918810fe50c320733bb864e93b273eeb1'
+  metadata.gz: 92f4fcfc4f4e943285de5882c8133e38d44b4decea581d2b0685c4133626f254
+  data.tar.gz: a64bf9c0d9e3e65555af122a46d764024df99288c1d6bf096ef0d1ee4b099bd4
 SHA512:
-  metadata.gz: a4451ade0e580f14d30f943989c3263e1ee322bfb6d9a32483c29407c1f9b3e96e4781b7ec9a6adda3ae02675c711f0d4e6009e8c88d378fc1786ad02e33660b
-  data.tar.gz: e64bb560165f871e14687b27bab765d30e5a575bce057b1387a58115ec40cb8b7b15707228675f0ade9847bfeb94f7326239c97d38fd13cc1bc78d24b03bb428
+  metadata.gz: 02d35b9440b45546546a6daa1f08aa2973d8000fbc906d4df9f670cb554bc28e2c5d696b42e096106675704aa951251997c426e7fb2a1bca5deddfa462885d20
+  data.tar.gz: f9d2faab578bc6ff582a352d79d05feea0402707cb7f50606b32e16361b229167fadf1bb194bc1ad573e38c56fb4f1ff13e07214206035d979bca2f93aa37b6c

data/README.md

@@ -1,10 +1,15 @@
 # ActiverecordAnyOf
 
+> Warning! Development of activerecord_any_of is now happening on
+> [Gitlab](https://gitlab.com/oelmekki/activerecord_any_of).
+>
+> Please go there for issues and merge requests.
+
 ## Introduction
 
 This gem provides `#any_of` and `#none_of` on ActiveRecord.
 
-`#any_of` is inspired by [any_of from mongoid](http://two.mongoid.org/docs/querying/criteria.html#any_of).
+`#any_of` is inspired by [any_of from mongoid](https://www.mongodb.com/docs/mongoid/current/reference/queries/#any-of-behavior).
 
 It was released before `#or` was implemented in ActiveRecord. Its main purpose was to both :
 

data/lib/activerecord_any_of/alternative_builder.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 module ActiverecordAnyOf
+  IS_RAILS_6 = ActiveRecord.version.to_s.between?('6', '7')
+
   # Main class allowing to build alternative conditions for the query.
   class AlternativeBuilder
     def initialize(match_type, context, *queries)
@@ -78,15 +80,26 @@ module ActiverecordAnyOf
         end
       end
 
+      def values_for(query)
+        return unless query.respond_to?(:right)
+
+        if query.right.is_a?(Array)
+          values = query.right
+          values.map!(&:value) unless IS_RAILS_6
+          values
+        else
+          return unless query.right.respond_to?(:value)
+
+          query.right.value
+        end
+      end
+
       def queries_bind_values
         queries.map do |query|
           if query.respond_to?(:children)
-            map_multiple_bind_values(query)
+            query.children.map { |c| values_for(c) }
           else
-            next unless query.respond_to?(:right)
-            next unless query.right.respond_to?(:value)
-
-            query.right.value
+            values_for(query)
           end
         end.flatten.compact
       end
@@ -110,13 +123,19 @@ module ActiverecordAnyOf
           ::Regexp.last_match(2)&.gsub(/=\ \$\d+/, '= ?') or match
         end
       end
+
+      def bind_values
+        queries_bind_values.tap do |values|
+          values.map!(&:value) if IS_RAILS_6
+        end
+      end
     end
 
     # Returns records that match any of the conditions, ie `#any_of`.
     class PositiveBuilder < Builder
       def build
         relation = if queries && queries_bind_values.any?
-                     where([unprepare_query(queries.reduce(:or).to_sql), *queries_bind_values])
+                     where([unprepare_query(queries.reduce(:or).to_sql), *bind_values])
                    else
                      where(queries.reduce(:or).to_sql)
                    end
@@ -129,7 +148,7 @@ module ActiverecordAnyOf
     class NegativeBuilder < Builder
       def build
         relation = if queries && queries_bind_values.any?
-                     where.not([unprepare_query(queries.reduce(:or).to_sql), *queries_bind_values])
+                     where.not([unprepare_query(queries.reduce(:or).to_sql), *bind_values])
                    else
                      where.not(queries.reduce(:or).to_sql)
                    end

data/lib/activerecord_any_of/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiverecordAnyOf
-  VERSION = '2.0'
+  VERSION = '2.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_any_of
 version: !ruby/object:Gem::Version
-  version: '2.0'
+  version: 2.0.2
 platform: ruby
 authors:
 - Olivier El Mekki
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-24 00:00:00.000000000 Z
+date: 2023-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '6'
     - - "<"
       - !ruby/object:Gem::Version
         version: '8'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '6'
     - - "<"
       - !ruby/object:Gem::Version
         version: '8'