where-or 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 570e1bbf0c33343e297c3c359928edebf9b0979e
-  data.tar.gz: 8add070663225de7bab2a8a3786fa944b9c77ea4
+  metadata.gz: 7a8bfccbdf3bdfea44c956cf6d044c2a5ad2da00
+  data.tar.gz: 0645fe9531ecea43d7a1538ea4d42a95ca5864a8
 SHA512:
-  metadata.gz: deb95ae420bfeb2bd809d9a70fab3113215800149f77823e846ea4019309c102b61f02925c03f4a781a04703adb95c045b5979ce7be10bba4a2af60304e58363
-  data.tar.gz: 4a079a3599ba1e0da29f8b8cf889f00ede75c467bc0702aa4c030afe918879eeb860659026f7fa6b1f8f0e548687a5bb596ceb9024b842e58e8d9a54b015bb8e
+  metadata.gz: c1b550c7fd8219a42159273af1c65426da3bdde824faf1e56d875e79f6f0e13add2ae4f013c3f994aa4ceaa65a76efdd3e13f98b03b7682b1e965ab031caa77d
+  data.tar.gz: 172daeacff899edaabf660b6c8cd64322581bc21fc543b176e7cb5adf88f091819ee5c0f6d6a377b48f141b97f7e06bcb4b493aaf5ab25f42dd0322310d522ab

data/README.md

@@ -2,7 +2,7 @@
 
 [Where or](https://github.com/rails/rails/pull/16052) function backport from Rails 5 for Rails 4.2
 
-Confirm works from Rails 4.2.3 to 4.2.5. [with some issues](https://github.com/Eric-Guo/where-or/issues?utf8=%E2%9C%93&q=is%3Aissue)
+Confirm works from Rails 4.2.3 to 4.2.6, including for preloading
 
 [![Gem Version](https://badge.fury.io/rb/where-or.svg)](https://badge.fury.io/for/rb/where-or)
 

data/lib/where-or.rb

@@ -86,7 +86,7 @@ ActiveSupport.on_load(:active_record) do
 
     private def structurally_compatible_for_or?(other) # :nodoc:
       (ActiveRecord::Relation::SINGLE_VALUE_METHODS - [:from]).all? { |m| send("#{m}_value") == other.send("#{m}_value") } &&
-        (ActiveRecord::Relation::MULTI_VALUE_METHODS - [:extending, :where, :having, :bind]).all? { |m| send("#{m}_values") == other.send("#{m}_values") }
+        (ActiveRecord::Relation::MULTI_VALUE_METHODS - [:references, :eager_load, :extending, :where, :having, :bind]).all? { |m| send("#{m}_values") == other.send("#{m}_values") }
       # https://github.com/rails/rails/commit/2c46d6db4feaf4284415f2fb6ceceb1bb535f278
       # https://github.com/rails/rails/commit/39f2c3b3ea6fac371e79c284494e3d4cfdc1e929
       # https://github.com/rails/rails/commit/bdc5141652770fd227455681cde1f9899f55b0b9
@@ -270,4 +270,15 @@ ActiveSupport.on_load(:active_record) do
     end
 
   end
+
+  class Arel::Visitors::Visitor
+    def visit_ActiveRecord_Relation_WhereClause o, collector
+      if o.binds
+        visit_Arel_Nodes_And(o.ast, collector)
+      else
+        collector << '1=1' # no-op
+        collector
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: where-or
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Benjamin Fleischer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-12 00:00:00.000000000 Z
+date: 2016-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -62,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Where or function backport from Rails 5 for Rails 4.2