activerecord-where-any-of 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf959bf2a2e069a95f05871354445d3e985d6843af07a6801784c5d6e578bf14
-  data.tar.gz: 1ab3c71933752ce016aec12f9c5dd3740f65cfd521713b5c3b28ddf551e6c734
+  metadata.gz: 89757a8e0b56e3133e9220af6d3dc0521d49148c3e61036465f7e5d562f93c4f
+  data.tar.gz: a70d52c50687a60db29191d9dbdf5bd3199225e8b456710bf3eab53924cbb3a2
 SHA512:
-  metadata.gz: b87241a975b1f0ad7e341d7840d58b1fea1180994ee892762c7e157ee4cbfe494bade5661f73e405a9caf59814b25de9e1f351e17b424ac272c6b26ca9d10d44
-  data.tar.gz: 46df15413eadd5a146ffbdc53a89935663b7b5811a7acabfdbfe45dc9c8dc594fb73e5b16a193129481a9864a7cf920bced02b8bf3ddcef25bb334649a474a5a
+  metadata.gz: 70bd1922ac95437f98da846af4580a2dcece793675e84ae3df1fe6bc9ba619ac59b5be7ae0ed35b9a89f68536f4364645e684c889a047e0ed9ed9f88701ce437
+  data.tar.gz: 4c9c0426a3a31e539f94783e14e1882fdf6b74d248e746a777ea80088f3aa758fe8ebc16a48682cb897dc3c8a3fd7eab160383475fe4cd25c590eb2b3554078d

data/activerecord-where-any-of.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name = 'activerecord-where-any-of'
-  s.version = '1.1.1'
+  s.version = '1.1.2'
   s.license = 'MIT'
-  s.date = '2016-12-25'
+  s.date = '2020-05-12'
   s.summary = 'A simple mixin to ActiveRecord::Base that allows use of OR arel relations.'
   s.description = 'Should work in Rails 3, 4, & 5.  However, in Rails 5 use of #or is prefered.'
   s.description = File.read(File.expand_path('../README.md', __FILE__))[/Description:\n-+\s*(.*?)\n\n/m, 1]

data/lib/active_record/where-any-of-mixin-rails-5.rb

@@ -2,20 +2,60 @@
 module ActiveRecord
   module WhereAnyOfMixin
 
+    INVALID_RELATION_VALUES = %i[
+      bind
+      eager_load
+      group
+      union_ordering
+      union
+      unscope
+      window
+      with
+    ]
+
+    RELATION_VALUES_TO_COPY = %i[
+      includes
+      joined_includes
+      joins
+      left_outer_joins
+      preload
+      references
+    ]
+
     def where_any_of(*conditions)
       # Rails 5 comes with an #or method for relations, so we can just use that
       # It is advised that once on Rails 5, this gem should be removed.
+
+      # Do our best to preserve joins from the conditions into the outer relation
+      values_to_copy = {}
+
       conditions = conditions.map do |c|
-        if c.is_a? Symbol or c.is_a? String
-          self.unscoped.send(c)
-        else
-          c
+        c = self.unscoped.send(c) if c.is_a? Symbol or c.is_a? String
+        raise ArgumentError, "Unsupported argument type: #{c.class.name}" unless c.is_a?(ActiveRecord::Relation)
+
+        INVALID_RELATION_VALUES.each do |m|
+          raise ArgumentError, "Unsupported condition contains #{m} values" if c.send("#{m}_values").present?
         end
+
+        RELATION_VALUES_TO_COPY.each do |m|
+          values = c.send("#{m}_values").presence or next
+          values_to_copy[m] ||= []
+          values_to_copy[m].concat(values)
+        end
+
+        # Only preserve the where clause of the condition
+        c2 = ActiveRecord::Relation.new(c.klass)
+        c2.where_clause = c.where_clause
+        c2
       end
+
       if conditions.empty?
         all.none
       else
-        all.merge conditions.reduce(:or)
+        all_with_copied_values = values_to_copy.reduce(all) do |s, (key, values)|
+          s.send(key, values)
+        end
+        all_with_copied_values.merge conditions.reduce(:or)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-where-any-of
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - David McCullars
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-25 00:00:00.000000000 Z
+date: 2020-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord