predictive_load 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c06e8dd628fc0332e30ded32af6042aa499143be
-  data.tar.gz: 0cef50d150b563becfd37449cb32f09425f6297b
+  metadata.gz: 9765b8681e6f08d2913adc2e00dd8543221e4104
+  data.tar.gz: 7c9efbb5370c71cf3209a534e8694ac698f6e282
 SHA512:
-  metadata.gz: 8b84b9da822ee49efb981cfb1ecbab8456d48c7c495b4de0ba7689a5611205584b722097b33054eb8e2e6515044519a3c78188138379862d2c1a44b840a0a7fc
-  data.tar.gz: 5188551f856d9827928b14a72bb667fab7b78e2868ac16af44c4c8695c2a2f890217dc56d3d8d5a8e6c72c1c67c55f90dd279308e0583287d8936c73e702e90f
+  metadata.gz: 36c715e1fc8d8e241e766fdf1fb2df3ca78505b10ca717cdb87f6164020a2527e40ba422657fc53b4dd3322f870b8ffe45879d099c13a7cb6aa9aab36240e034
+  data.tar.gz: c48502690d43a1a2b93d555fbbbb95bceac4e54d4c2048a570faf98c7bead3b5fb62995fedf624e02af1f9e00c7b566b3e95277a2828ef63cf45753b80461103

data/lib/predictive_load/active_record_collection_observation.rb

@@ -48,7 +48,7 @@ module PredictiveLoad::ActiveRecordCollectionObservation
 
     def notify_collection_observer
       if @owner.collection_observer
-        @owner.collection_observer.loading_association(@owner, @reflection.name)
+        @owner.collection_observer.loading_association(@owner, self)
       end
     end
 

data/lib/predictive_load/loader.rb

@@ -20,8 +20,10 @@ module PredictiveLoad
       end
     end
 
-    def loading_association(record, association_name)
-      if all_records_will_likely_load_association?(association_name)
+    def loading_association(record, association)
+      association_name = association.reflection.name
+
+      if all_records_will_likely_load_association?(association_name) && supports_preload?(association)
         preload(association_name)
       end
     end
@@ -34,6 +36,11 @@ module PredictiveLoad
       end
     end
 
+    def supports_preload?(association)
+      return false if association.reflection.options[:conditions].respond_to?(:to_proc)
+      true
+    end
+
     protected
 
     attr_reader :records

data/lib/predictive_load/watcher.rb

@@ -27,8 +27,10 @@ module PredictiveLoad
       @loaded_associations = {}
     end
 
-    def loading_association(record, association_name)
+    def loading_association(record, association)
+      association_name = association.reflection.name
       return if !all_records_will_likely_load_association?(association_name)
+      return if !supports_preload?(association)
 
       if loaded_associations.key?(association_name)
         log_query_plan(association_name)

data/predictive_load.gemspec

@@ -12,5 +12,5 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "predictive_load"
-  gem.version       = '0.1.1'
+  gem.version       = '0.1.2'
 end

data/test/loader_test.rb

@@ -44,6 +44,14 @@ describe PredictiveLoad::Loader do
         end
       end
 
+      it "does not attempt to preload associations with proc conditions" do
+        comments = Comment.all
+        assert_equal 2, comments.size
+        assert_queries(2) do
+          comments.each { |comment| assert comment.user_by_proc.full_name }
+        end
+      end
+
     end
 
     describe "has_one" do

data/test/models.rb

@@ -3,6 +3,11 @@ class User < ActiveRecord::Base
   has_many :topics,    :through => :comments
   has_one  :photo
   has_and_belongs_to_many :emails
+
+  def full_name
+    name
+  end
+
 end
 
 class Email < ActiveRecord::Base
@@ -14,10 +19,16 @@ end
 
 class Comment < ActiveRecord::Base
   belongs_to :user
+  belongs_to :user_by_proc, :class_name => "User", :foreign_key => :user_id,
+                            :conditions => proc { "1 = #{one}" }
   belongs_to :topic
 
   scope :by_topic, lambda { |topic| where(:topic_id => topic.id) }
   scope :recent, order('updated_at desc')
+
+  def one
+    1
+  end
 end
 
 class Photo < ActiveRecord::Base

data/test/watcher_test.rb

@@ -57,14 +57,24 @@ predictive_load: would have prevented all 1 queries
 
     end
 
+    it "does not blow up when preloading associations with proc conditions" do
+      log    = StringIO.new
+      logger = build_logger(log)
+      ActiveRecord::Base.logger = logger
+
+      comments = Comment.all
+      assert_equal 2, comments.size
+      assert_queries(2) do
+        comments.each { |comment| assert comment.user_by_proc.full_name }
+      end
+    end
+
   end
 
   def assert_log(message, gsub_pattern)
     original_logger = ActiveRecord::Base.logger
     log    = StringIO.new
-    logger = Logger.new(log)
-    logger.level = Logger::Severity::INFO
-    logger.formatter = proc { |severity, datetime, progname, msg| "#{msg}\n" }
+    logger = build_logger(log)
     ActiveSupport::LogSubscriber.colorize_logging = false
     ActiveRecord::Base.logger = logger
 
@@ -76,4 +86,11 @@ predictive_load: would have prevented all 1 queries
     ActiveRecord::Base.logger = original_logger
   end
 
+  def build_logger(log)
+    Logger.new(log).tap do |logger|
+      logger.level     = Logger::Severity::INFO
+      logger.formatter = proc { |severity, datetime, progname, msg| "#{msg}\n" }
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: predictive_load
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Eric Chapweske
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-07 00:00:00.000000000 Z
+date: 2014-01-15 00:00:00.000000000 Z
 dependencies: []
 description: Predictive loader
 email: