predictive_load 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb9fa507002032502359805bb5a3e97730abba37
-  data.tar.gz: 40ad5bd0b8d8aa0b65bdd4d81bd20617a901744f
+  metadata.gz: c588660d2fac16be90c9c518cf38777a5a88908e
+  data.tar.gz: a5019c17bd022a04f8a805637ca2d3a9583dacd1
 SHA512:
-  metadata.gz: 785eaf1a3a9a1ad2f7c79ad0603ae92e0366cde058ffe8941ab5e81093df731562f6c90b8724aa5f0613949058c7aa0bbf414992ea8b4d597524fee79b024d70
-  data.tar.gz: 3ac672859b89465d53fe8086dad7d82fe3519869452537ac7ab551b7c7216111a1b336c4f746aebb2c9af6e720d01b3e40a680e3b1a575406cf313ca38412d44
+  metadata.gz: 415799244ca6a53685d163174d6ee846a5749c68899d4b91571a36e878771882c05269581b1e55a631044916617d53e2222b261a99f1c25c7ec0b103b5833ef7
+  data.tar.gz: 41ba67603699ab634d0d788c1a90aad5df3d18f5a304a11f213b0a657d3c80d3e9ed9edd5ef260617c3ee36f82f0c8df45c65dc812dab4ab291fcb9272bb1297

data/README.md

@@ -34,10 +34,10 @@ Produces:
 
 ### Disabling preload
 
-Some things cannot be preloaded, use `no_preload`
+Some things cannot be preloaded, use `predictive_load: false`
 
 ```
-has_many :foos, no_preload: true
+has_many :foos, predictive_load: false
 ```
 
 ### N+1 detection logging
@@ -78,3 +78,4 @@ would have prevented all 10 queries
 
 * Calling association#size will trigger an N+1 on SELECT COUNT(*). Work around by calling #length, loading all records.
 * Calling first / last will trigger an N+1.
+* Rails 4: unscoped will disable eager loading to circument a rails bug ... hopefully fixed in rails 5 https://github.com/rails/rails/pull/16531

data/lib/predictive_load/active_record_collection_observation.rb

@@ -3,6 +3,7 @@ module PredictiveLoad::ActiveRecordCollectionObservation
   def self.included(base)
     ActiveRecord::Relation.send(:include, RelationObservation)
     ActiveRecord::Base.send(:include, CollectionMember)
+    ActiveRecord::Base.send(:extend, UnscopedTracker)
     ActiveRecord::Associations::Association.send(:include, AssociationNotification)
     ActiveRecord::Associations::CollectionAssociation.send(:include, CollectionAssociationNotification)
   end
@@ -32,6 +33,32 @@ module PredictiveLoad::ActiveRecordCollectionObservation
 
   end
 
+  # disable eager loading since includes + unscoped is broken on rails 4
+  module UnscopedTracker
+    if ActiveRecord::VERSION::MAJOR == 4
+      def unscoped
+        if block_given?
+          begin
+            old, self.predictive_load_disabled = predictive_load_disabled, true
+            super
+          ensure
+            self.predictive_load_disabled = old
+          end
+        else
+          super
+        end
+      end
+    end
+
+    def predictive_load_disabled=(value)
+      Thread.current[:predictive_load_disabled] = value
+    end
+
+    def predictive_load_disabled
+      Thread.current[:predictive_load_disabled]
+    end
+  end
+
   module AssociationNotification
 
     def self.included(base)

data/lib/predictive_load/loader.rb

@@ -40,7 +40,8 @@ module PredictiveLoad
     end
 
     def supports_preload?(association)
-      return false if association.reflection.options[:no_preload]
+      return false if ActiveRecord::Base.predictive_load_disabled
+      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

data/lib/predictive_load.rb

@@ -1,4 +1,4 @@
 module PredictiveLoad
 end
 
-ActiveRecord::Associations::Builder::Association.valid_options << :no_preload
+ActiveRecord::Associations::Builder::Association.valid_options << :predictive_load

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: predictive_load
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Eric Chapweske