predictive_load 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 81ada2f7016b7b5509b284c17b4c33de2e954cc4
-  data.tar.gz: 6eb5283529e87d3cdf5bb8041add35741393ba9f
+SHA256:
+  metadata.gz: 580ba2c90f13384b9fba7ea3c386fbc8c25f79a35dbed9fa1ea3a59aadc2e854
+  data.tar.gz: 79a274f1f22adb3bec3a795c55dde8a01ed29056433e5316ad8d72dd605232f9
 SHA512:
-  metadata.gz: 8b9a33be0b03acd42fd3c59151f2c3fd70baaf4cd9993bcd8e41ef3fad47e6127279a35a5227edb747d0ad9e2fe14b3f7980e673484c6d22b7cd05530f9d71b8
-  data.tar.gz: 1ec97d78977b7e25082ec45ed327e53dbd6a6bb60e87fcd25e415e7b4ed12fb596e5648124aaf7a27c3c2a8d38a91d11335a2cba4a85fb7d9047bb0dda15954c
+  metadata.gz: ec156ee9fea24e8b223f63d31b9f2d000ebb65fcf63005998682097e4ebba3c1c8c19e2df9aadc19819c77c9a90d5a8d01993353215ed61f14aeddcc54a2a20e
+  data.tar.gz: 4019f082b0a466304725cb37ad3e0753a19f2fd665bfe699a7221674c2f59be09cdb43db1b84331fe5386388081a529daba414d5d0e8d9b5918c702cba097d2b

data/lib/predictive_load/loader.rb

@@ -57,10 +57,21 @@ module PredictiveLoad
     end
 
     def preload(association_name)
+      # https://github.com/rails/rails/blob/v4.2.10/activerecord/lib/active_record/associations/preloader.rb#L187 (similar to other Rails versions)
+      # If the first record association is loaded, Preloader aborts.
+      #
+      # In a code like `comments.each { |c| c.user }, if the first comment user_id is nil,
+      # when calling the method (`user`) ActiveRecord doesn't load the association, but marks it as loaded.
+      # So when the second comment calls `user` (and user_id is not nil), @records.first will be the first
+      # comment above (with thr association already loaded), which will be checked by Preloader and used to skip
+      # any preloading.
+      #
+      # Fix is pretty simple, ignore any record with association already loaded.
+      rs = records_with_association(association_name).reject { |r| r.association(association_name).loaded? }
       if ActiveRecord::VERSION::STRING <= "4.1.0"
-        ActiveRecord::Associations::Preloader.new(records_with_association(association_name), [ association_name ]).run
+        ActiveRecord::Associations::Preloader.new(rs, [ association_name ]).run
       else
-        ActiveRecord::Associations::Preloader.new.preload(records_with_association(association_name), [ association_name ])
+        ActiveRecord::Associations::Preloader.new.preload(rs, [ association_name ])
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: predictive_load
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Eric Chapweske
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2018-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -176,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: ''