where-or 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2f81ecc810527c811c55941f9f7bc23376dcd75
-  data.tar.gz: d5dfe157818c2e5f9cc451613a3939b2e5a39e43
+  metadata.gz: bb25ac3a827b4dd90acbffff6c2529fd4f70665a
+  data.tar.gz: 8af01a9d4f4b801a8a6944b66b8fa084c5742d55
 SHA512:
-  metadata.gz: fe9affdef0fb817a152ab975f3d7de3b36fda610f0fe81f44f457574113cdfabfe2d1b19a1be3c97a2b4f6936964291b2c3d7a02aa4d9a48acd4101c6a9c648c
-  data.tar.gz: 9cc489658e4bd70ee4463cd2d193bdd66d0334e8bf2d89131b78c82a2f1d931849332b160a6737acbbc2a4bef93bd269cef0373b3f01b8ba22d83f284dceabc8
+  metadata.gz: '07853e00daaa9046abfa3f388b7e887eee0621e63046a32902a132da624a00d93c1311addff9ee943ba7073683f234f29d6507bb15d4f8ee923c52a2d63cd1ad'
+  data.tar.gz: b318ac9524c5a7d4960627de6fa59838381776dcb46f57289fb9d888a5f9d2227ebee04619861bdff2252d350f6f90b4245cdad1591514440cbb25725cb07192

data/lib/where-or.rb

@@ -1,4 +1,4 @@
-abort "Congrats for being on Rails 5. Now please remove this patch" if ActiveRecord::VERSION::MAJOR > 4
+abort "Congrats for being on Rails 5. Now please remove this patch by getting rid of the `where-or` gem" if ActiveRecord::VERSION::MAJOR > 4
 # Tested on Rails Rails 4.2.3
 warn "Patching ActiveRecord::Relation#or.  This might blow up" if ActiveRecord.version.to_s < '4.2.3'
 # https://github.com/rails/rails/commit/9e42cf019f2417473e7dcbfcb885709fa2709f89.patch
@@ -92,7 +92,9 @@ ActiveSupport.on_load(:active_record) do
       self
     end
 
-    private def structurally_compatible_for_or?(other) # :nodoc:
+    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 - [:references, :eager_load, :extending, :where, :having, :bind]).all? { |m| send("#{m}_values") == other.send("#{m}_values") }
       # https://github.com/rails/rails/commit/2c46d6db4feaf4284415f2fb6ceceb1bb535f278
@@ -101,8 +103,6 @@ ActiveSupport.on_load(:active_record) do
       # (ActiveRecord::Relation::CLAUSE_METHODS - [:having, :where]).all? { |m| send("#{m}_clause") != other.send("#{m}_clause") }
     end
 
-    private
-
     def new_where_clause
       ActiveRecord::Relation::WhereClause.empty
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: where-or
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Benjamin Fleischer
@@ -31,7 +31,7 @@ cert_chain:
   R5k6Ma92sW8jupX4cqbSu9rntdVQkNRpoHIrfU0MZT0cKsg/D1zMteylxrO3KMsz
   SPQRv+nrI1J0zevFqb8010heoR8SDyUA0Mm3+Q==
   -----END CERTIFICATE-----
-date: 2016-11-11 00:00:00.000000000 Z
+date: 2016-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails