predictive_load 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06c683b9447d34decb31d5c7364b83e05896a0d5
-  data.tar.gz: 60aabeabaf9889446277fabfb26b581a9a5bba3f
+  metadata.gz: 389078c86577ae35abeed91c62774ecf92924a19
+  data.tar.gz: 1ba0d8068de6029ecc853ae92b3068f827c6c067
 SHA512:
-  metadata.gz: 59b7d697564804716960c66ead83b077c7c07acb3d26b9afa42e6c886a6a13b94e166fc872136625bf3dec869945eff01a9fdec922f52a667294331723cb441b
-  data.tar.gz: 88d0b749741eca4d134ba75d1797f0c1985de83634c0385ea6558bf9a0528610e845614bedef753edb54a53028aebf68cf6ab15fa7c653698a86630dfbf2735e
+  metadata.gz: 019bf857c563d681ac96c34bd97543c08046422ba8941d3441f5093297c13928e258b03194443749d4f6893394d7ab3b58eb1879aa03e6a751d5ab5f22330e5a
+  data.tar.gz: 8f6e11a32d2d372a9ce43e12f8f32c0d1d2eba2ac24425fc553905023814c3cb4db5d1f739a3746abe54cdcef5ca760b2cd7a1db3806d4c9cd67a68a42fd9874

data/lib/predictive_load/active_record_collection_observation.rb

@@ -39,10 +39,10 @@ module PredictiveLoad::ActiveRecordCollectionObservation
       def unscoped
         if block_given?
           begin
-            old, self.predictive_load_disabled = predictive_load_disabled, true
+            predictive_load_disabled << self
             super
           ensure
-            self.predictive_load_disabled = old
+            predictive_load_disabled.pop
           end
         else
           super
@@ -50,12 +50,8 @@ module PredictiveLoad::ActiveRecordCollectionObservation
       end
     end
 
-    def predictive_load_disabled=(value)
-      Thread.current[:predictive_load_disabled] = value
-    end
-
     def predictive_load_disabled
-      Thread.current[:predictive_load_disabled]
+      Thread.current[:predictive_load_disabled] ||= []
     end
   end
 

data/lib/predictive_load/loader.rb

@@ -40,11 +40,18 @@ module PredictiveLoad
     end
 
     def supports_preload?(association)
-      return false if ActiveRecord::Base.predictive_load_disabled
+      return false if ActiveRecord::Base.predictive_load_disabled.include?(association.klass)
       return false if association.reflection.options[:predictive_load] == false
       return false if association.reflection.options[:conditions].respond_to?(:to_proc) # rails 3 conditions proc (we do not know if it uses instance methods)
-      if ActiveRecord::VERSION::MAJOR > 3
-        return false if association.reflection.scope.try(:arity).to_i > 0 # rails 4+ conditions block, if it uses a passed in object, we assume it is not preloadable
+      if ActiveRecord::VERSION::MAJOR > 3 && scope = association.reflection.scope
+        if scope.is_a?(Proc)
+          # rails 4+ conditions block, if it uses a passed in object, we assume it is not preloadable
+          return false if scope.arity.to_i > 0
+        elsif where = scope.options[:where]
+          # ActiveRecord::Associations::Builder::DeprecatedOptionsProc from rails 4.0 and deprecated finders
+          # when conditions was a proc the where will be a proc too -> check arity
+          return false if where.is_a?(Proc) && where.arity > 0
+        end
       end
       true
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: predictive_load
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Eric Chapweske
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-02 00:00:00.000000000 Z
+date: 2015-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord