ar_lazy_preload 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3b1c23e853fd6612e6d7f4f063e4cac5577c591a9a3b7be3b04c4a6801d1291
-  data.tar.gz: 66a30a3b81d996ebbb9324dfedf4f874498da1b202f66dcab17385fc8596bde3
+  metadata.gz: 780b04da1bdc2de0822bcf78d9ac51d7e24f5bf66aee70d42e81a0a0cb662a21
+  data.tar.gz: bceb49a3525fcfcac85d8662485992bc81e37015a9100a4332f3aaae1c0bd59e
 SHA512:
-  metadata.gz: 7fae1e071f6f199d8a881a2bf0a60a4b5d53e1467428d07e39d67d98539a20a9b8b319ac4aac7ba73675367c648db441a7eb24bcf1f252c0becddd7905150d9c
-  data.tar.gz: 7c5107b91f3671cc4fa16ae38af7a8b54832c31afc10e337c76eb3b4f24440eff87d5202577bbbcef38628f3266af057966a4120097c8cf887524a8c8ce03ba3
+  metadata.gz: d32ee8fe923b29451f032ebb050168d6eaec8d5aec0b3136917a8196284198323ed804061bf64c7b36e104b95a43ced12372baa39a79976a1f69ae22a44c190c
+  data.tar.gz: d104a956772f064cb255db1f6743edd312da87da0526d2eff669976ce6f8537fb78a49cb302fa818942a4bb2bf1f0f0ae4226053c696e4575981aef774c356a9

data/lib/ar_lazy_preload/contexts/base_context.rb

@@ -45,7 +45,7 @@ module ArLazyPreload
 
       def perform_preloading(association_name)
         filtered_records = records.select do |record|
-          reflection_names_cache[record.class].include?(association_name)
+          preloadable_record?(association_name, record)
         end
 
         preload_records(association_name, filtered_records)
@@ -79,11 +79,30 @@ module ArLazyPreload
         @preloader ||= ActiveRecord::Associations::Preloader.new
       end
 
-      def reflection_names_cache
-        @reflection_names_cache ||= Hash.new do |hash, klass|
-          hash[klass] = klass.reflect_on_all_associations.map(&:name)
+      def preloadable_record?(association_name, record)
+        preloadable_reflections_cache.dig(record.class, association_name)
+      end
+
+      def preloadable_reflections_cache
+        @preloadable_reflections_cache ||= Hash.new do |hash, klass|
+          associations = klass.reflect_on_all_associations
+
+          hash[klass] = associations.each_with_object({}) do |reflection, cache|
+            cache[reflection.name] = preloadable_reflection?(klass, reflection)
+          end
         end
       end
+
+      def preloadable_reflection?(klass, reflection)
+        scope = reflection.scope
+        preloadable_scope = scope&.arity&.zero?
+        through_reflection =
+          reflection.options[:through] && klass.reflect_on_association(reflection.options[:through])
+        preloadable_through_reflection =
+          through_reflection && preloadable_reflection?(klass, through_reflection)
+
+        (!scope || preloadable_scope) && (!through_reflection || preloadable_through_reflection)
+      end
     end
   end
 end

data/lib/ar_lazy_preload/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ArLazyPreload
-  VERSION = "0.6.2"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar_lazy_preload
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - DmitryTsepelev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-18 00:00:00.000000000 Z
+date: 2021-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails