n1_loader 1.7.4 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a80439f77077004912f1e3bdcd9d7352691d92da0350e474e8286a6deb0f3f5
-  data.tar.gz: 414c47adbfd1cbff273085b7c1728a7db40eeb5c17e578d131ccc1f0a8cd2899
+  metadata.gz: b26072476fbcb5cd1635a97c0139aef964d7e2d89d22bd2aaf0f10bf50314337
+  data.tar.gz: f998a2e0997e9c3657402fd5e351dfb02fc53d981cd63c0c723b3e09094ba5f0
 SHA512:
-  metadata.gz: 5d0bf3469584e36dffc65a36960cf8190272f71d71a91c1e8ab8bda04ebce1525f09061f46f395d9b91d88f950b745cee37be3758d9ef5d23ea936d27419fc3b
-  data.tar.gz: a2c718ab66fb8055261d31ef0424f9739493636e081ed0301bc92a7d251bb9a53284c714857740f5ab81b892c71e9748a5c99079c90a5036bd88fcc1e279dc5d
+  metadata.gz: 70c3fcdf22685895f3ead6f1987b6044b3d926c40a19d1c3a10295066a26831f729d91ac07ae6b6044798de7cf47b83792565ce8d710efdeb44e56afd9a4a7c4
+  data.tar.gz: 21fd7cbb0bb2c2a751a74c3773dec35ecfa37ea1467fa553c7021142809053ede73a6a7149bab92da9529619e045d1bbf2dd90a5600381a8a894c7fb6f75545c

data/lib/n1_loader/active_record/{associations_preloader_v7.rb → associations_preloader.rb}

@@ -8,6 +8,14 @@ module N1Loader
           def options
             {}
           end
+
+          def deprecated?
+            false
+          end
+
+          def through_reflection?
+            false
+          end
         end
 
         def preloaders_for_reflection(reflection, records)

data/lib/n1_loader/active_record.rb

@@ -26,7 +26,7 @@ ActiveSupport.on_load(:active_record) do
     require_relative "active_record/associations_preloader_v5"
     ActiveRecord::Associations::Preloader.prepend(N1Loader::ActiveRecord::Associations::Preloader)
   else
-    require_relative "active_record/associations_preloader_v7"
+    require_relative "active_record/associations_preloader"
     ActiveRecord::Associations::Preloader::Branch.prepend(N1Loader::ActiveRecord::Associations::Preloader)
   end
 

data/lib/n1_loader/ar_lazy_preload/loader_patch.rb

@@ -7,12 +7,15 @@ module N1Loader
       attr_accessor :context_setup
 
       def loaded
-        return @loaded if @loaded
+        return @loaded if @already_loaded && @already_context
 
         super
 
-        context_setup&.call(preloaded_records)
+        synchronize do
+          context_setup&.call(@loaded.values.flatten) unless @already_context
+        end
 
+        @already_context = true
         @loaded
       end
     end

data/lib/n1_loader/core/loadable.rb

@@ -32,8 +32,16 @@ module N1Loader
       n1_loaders[name]
     end
 
+    def n1_bind_to(collection)
+      @n1_binding = collection
+    end
+
     def n1_loader_reload(name)
-      n1_loaders[name] = LoaderCollection.new(self.class.n1_loaders[name], [self])
+      elements = @n1_binding || [self]
+      collection = LoaderCollection.new(self.class.n1_loaders[name], elements)
+
+      @n1_binding&.each { |el| el.n1_loaders[name] = collection if el.respond_to?(:n1_loaders) }
+      n1_loaders[name] = collection
     end
 
     def n1_clear_cache

data/lib/n1_loader/core/loader.rb

@@ -6,6 +6,8 @@ module N1Loader
   # Subclasses must define +perform+ method that accepts single argument
   # and returns hash where key is the element and value is what we want to load.
   class Loader
+    prepend MonitorMixin
+
     class << self
       attr_reader :arguments
 
@@ -105,7 +107,17 @@ module N1Loader
     end
 
     def loaded
-      return @loaded if @loaded
+      return @loaded if @already_loaded
+
+      synchronize do
+        non_thread_safe_loaded unless @already_loaded
+      end
+
+      @loaded
+    end
+
+    def non_thread_safe_loaded # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      return @loaded if @already_loaded
 
       check_arguments!
 
@@ -114,9 +126,11 @@ module N1Loader
       if respond_to?(:single) && elements.size == 1
         fulfill(elements.first, single(elements.first))
       elsif elements.any?
+        elements.each { |el| el.n1_bind_to(elements) if el.respond_to?(:n1_bind_to) }
         perform(elements)
       end
 
+      @already_loaded = true
       @loaded
     end
   end

data/lib/n1_loader/version.rb

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

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: n1_loader
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 2.1.0
 platform: ruby
 authors:
 - Evgeniy Demin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-18 00:00:00.000000000 Z
+date: 2026-03-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: mutex_m
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -126,17 +140,17 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
-description: 
+description:
 email:
 - lawliet.djez@gmail.com
 executables: []
@@ -145,9 +159,9 @@ extra_rdoc_files: []
 files:
 - lib/n1_loader.rb
 - lib/n1_loader/active_record.rb
+- lib/n1_loader/active_record/associations_preloader.rb
 - lib/n1_loader/active_record/associations_preloader_v5.rb
 - lib/n1_loader/active_record/associations_preloader_v6.rb
-- lib/n1_loader/active_record/associations_preloader_v7.rb
 - lib/n1_loader/active_record/base.rb
 - lib/n1_loader/active_record/loader.rb
 - lib/n1_loader/active_record/loader_collection.rb
@@ -174,7 +188,7 @@ metadata:
   source_code_uri: https://github.com/djezzzl/n1_loader
   changelog_uri: https://github.com/djezzzl/n1_loader/master/CHANGELOG.md
   funding_uri: https://opencollective.com/n1_loader#support
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -189,8 +203,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.21
-signing_key: 
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: Loader to solve N+1 issue for good.
 test_files: []