ar_lazy_preload 2.1.0 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82d5aeed661b9ab42f1d15f78cb8db84cc8b426ddfe26ae1442f297800ec0707
-  data.tar.gz: 1c89c0b2f8025143186551e06629c40a37bf8c207b7605c71481b02c158f89f5
+  metadata.gz: 21e63192d8ab41a89c7fa7fe49300123e7f8759d7e3270fdf4d821bc9865db8b
+  data.tar.gz: 28485e31dd75c9c93949ff9cc7a5a284857d347892a58a050cf754f50204beff
 SHA512:
-  metadata.gz: acbedff3a73e2b26ee0a905c9b5059e9e27297abccd2a16c0a68c3bd67001a4d45721b83aaad21738b36d6c7bce8d41ea6756bd0f1bd54973f339ab2cc26ea68
-  data.tar.gz: 5285e4116f8ba49bc7aa2cbfc1962bfff112785ebd7dbed823ebadf606e9eef1f0772f7f30312344a00cbe8c76af37fc0378d422933073d8758bebe5ae6bcd85
+  metadata.gz: 34932cd853c5344aa865da00c1210a0680e0b18e3ac4994a9908d16683d97905deaaf56b4cd2963ef01c20352df63f80fd4021d97a1831a4691129c5382c4a35
+  data.tar.gz: d40a3cf3c8ef27508e385649a4373fe84fca14796c9cd44fdb7b6df55123f9b09f9bf00d9fcfb255ba9b3c8844633e05968a50297cc6867f1ce21664e4a45944

data/README.md

@@ -13,6 +13,11 @@ Used in production by:
 - Toptal
 - _Want to be here? Let me know_ 🙂
 
+## Professional Support
+
+Dealing with performance issues in your Rails app beyond N+1 queries?
+I'm available for consulting — [get in touch](https://dmitrytsepelev.dev/consulting).
+
 ## Why should I use it?
 
 Lazy loading is super helpful when the list of associations to load is determined dynamically. For instance, in GraphQL this list comes from the API client, and you'll have to inspect the selection set to find out what associations are going to be used.
@@ -62,6 +67,10 @@ posts = User.preload_associations_lazily.flat_map(&:posts)
 # => SELECT * FROM posts WHERE user_id in (...)
 ```
 
+## Companion gem for non-association N+1s
+
+[`N1Loader`](https://github.com/djezzzl/n1_loader) complements ArLazyPreload for batched lazy loading in places where regular ActiveRecord associations are not available (for example, computed values, custom loaders, service/API calls, and GraphQL fields). ArLazyPreload can stay focused on association loading while N1Loader handles the remaining N+1-prone derived data.
+
 ## Gotchas
 
 1. Lazy preloading [does not work](https://github.com/DmitryTsepelev/ar_lazy_preload/pull/40/files) for ActiveRecord < 6 when `.includes` is called earlier:
@@ -76,6 +85,8 @@ posts = User.preload_associations_lazily.flat_map(&:posts)
 
 3. Lazy preloading for **ActiveStorage** variants is not working automatically because of the way how it is implemented ([here](https://github.com/DmitryTsepelev/ar_lazy_preload/pull/70) is the issue). You can preload them manually by calling `#with_all_variant_records`/`#with_attached_#{attachment_name}` on association. Example: `User.with_attached_avatar.first(10).map { |u| u.avatar.variant(:small).processed.url }`
 
+4. Lazy preloading does not work for association object creation methods, so it is better if you separate the logic for writing and reading objects and use lazy preloading for read only, more information with example [here](https://github.com/DmitryTsepelev/ar_lazy_preload/issues/75)
+
 ## Installation
 
 Add this line to your application's Gemfile, and you're all set:

data/lib/ar_lazy_preload/active_record/relation.rb

@@ -44,7 +44,7 @@ module ArLazyPreload
     #
     # Same effect can be achieved by User.lazy_preload(posts: :comments)
     def preload_associations_lazily
-      spawn.tap { |relation| relation.preloads_associations_lazily = true }
+      tap { |relation| relation.preloads_associations_lazily = true }
     end
 
     # Specify relationships to be loaded lazily when association is loaded for the first time. For

data/lib/ar_lazy_preload/associated_context_builder.rb

@@ -23,7 +23,7 @@ module ArLazyPreload
 
     # Takes all the associated records for the records, attached to the :parent_context and creates
     # a preloading context for them
-    # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+    # rubocop:disable Metrics/MethodLength
     def perform
       associated_records = parent_context.records.flat_map do |record|
         next if record.nil?
@@ -32,7 +32,7 @@ module ArLazyPreload
         next if reflection.nil?
 
         record_association = record.association(association_name)
-        reflection.collection? ? record_association.target : record_association.reader
+        record_association.target
       end
 
       Context.register(
@@ -41,7 +41,7 @@ module ArLazyPreload
         auto_preload: parent_context.auto_preload?
       )
     end
-    # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
+    # rubocop:enable Metrics/MethodLength
 
     private
 

data/lib/ar_lazy_preload/contexts/base_context.rb

@@ -52,12 +52,65 @@ module ArLazyPreload
         preload_records(association_name, filtered_records)
         loaded_association_names.add(association_name)
 
+        # Prepare context for intermediate through associations
+        prepare_through_association_contexts(association_name, filtered_records)
+
         AssociatedContextBuilder.prepare(
           parent_context: self,
           association_name: association_name
         )
       end
 
+      # Prepare context for intermediate associations in through chains
+      def prepare_through_association_contexts(association_name, filtered_records)
+        filtered_records.group_by(&:class).each do |klass, klass_records|
+          chain = through_association_chain(association_name, klass)
+          next if chain.empty?
+
+          chain.each do |intermediate_name|
+            register_intermediate_context(klass, klass_records, intermediate_name)
+          end
+        end
+      end
+
+      def register_intermediate_context(klass, klass_records, intermediate_name)
+        return if association_loaded?(intermediate_name)
+
+        reflection = klass.reflect_on_association(intermediate_name)
+        return if reflection.nil?
+
+        loaded_association_names.add(intermediate_name)
+
+        intermediate_records = collect_intermediate_records(klass_records, reflection)
+        return if intermediate_records.empty?
+
+        ArLazyPreload::Context.register(records: intermediate_records, auto_preload: true)
+      end
+
+      def collect_intermediate_records(klass_records, reflection)
+        klass_records.flat_map do |record|
+          record_association = record.association(reflection.name)
+          record_association.target
+        end.compact
+      end
+
+      # Extract chain of intermediate association names for through associations
+      def through_association_chain(association_name, klass)
+        reflection = klass.reflect_on_association(association_name)
+        return [] unless reflection&.options&.key?(:through)
+
+        chain = []
+        current_reflection = reflection
+
+        while current_reflection&.options&.key?(:through)
+          through_name = current_reflection.options[:through]
+          chain.unshift(through_name)
+          current_reflection = klass.reflect_on_association(through_name)
+        end
+
+        chain
+      end
+
       # Method preloads associations for the specific sets of the records
       # and provides automatically provides context for the records
       # loaded using `includes` inside Relation#preload_associations with the

data/lib/ar_lazy_preload/version.rb

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ar_lazy_preload
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.2
 platform: ruby
 authors:
 - DmitryTsepelev
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-02 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -109,19 +108,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: database_cleaner-active_record
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: factory_bot
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +177,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: lazy_preload implementation for ActiveRecord models
 email:
 - dmitry.a.tsepelev@gmail.com
@@ -212,7 +239,6 @@ homepage: https://github.com/DmitryTsepelev/ar_lazy_preload
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -227,8 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: lazy_preload implementation for ActiveRecord models
 test_files: []