n1_loader 2.1.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b26072476fbcb5cd1635a97c0139aef964d7e2d89d22bd2aaf0f10bf50314337
-  data.tar.gz: f998a2e0997e9c3657402fd5e351dfb02fc53d981cd63c0c723b3e09094ba5f0
+  metadata.gz: 24b29bd98ee754ae976c84c253a4d9018cc3372003a6965d1227d578f9cd6d4d
+  data.tar.gz: 39ccc3e7314dd901cd47c2dd15d16154fefa5529a33e269e7e42877e78d3f7fa
 SHA512:
-  metadata.gz: 70c3fcdf22685895f3ead6f1987b6044b3d926c40a19d1c3a10295066a26831f729d91ac07ae6b6044798de7cf47b83792565ce8d710efdeb44e56afd9a4a7c4
-  data.tar.gz: 21fd7cbb0bb2c2a751a74c3773dec35ecfa37ea1467fa553c7021142809053ede73a6a7149bab92da9529619e045d1bbf2dd90a5600381a8a894c7fb6f75545c
+  metadata.gz: 1ff08212965c0d67d3035be2e083ba6240fc1d034880d29615d88d7c88bbf7c3b61057779ff88c22d27a501d59098a4b67b5a406ff2e2e3984a72c5de6d33459
+  data.tar.gz: da51833d93a6109edb7eb284e024b3f24c8684e4765166ba55b4a4279dd2ea23c905e0f37762cef007adef12efbb3d8a46c52030ff3b047e38b18798b7579c2f

data/lib/n1_loader/active_record/loader.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 N1Loader::Loader.define_method :preloaded_records do
-  @preloaded_records ||= loaded.values.flatten
+  @preloaded_records ||= loaded? && loaded_by_value.values.flatten
 end

data/lib/n1_loader/ar_lazy_preload/loader_patch.rb

@@ -6,17 +6,22 @@ module N1Loader
     module LoaderPatch
       attr_accessor :context_setup
 
-      def loaded
-        return @loaded if @already_loaded && @already_context
+      def loaded?
+        return true if @already_loaded && @already_context
 
         super
 
-        synchronize do
-          context_setup&.call(@loaded.values.flatten) unless @already_context
-        end
+        synchronize { non_thread_safe_context_setting unless @already_context }
+
+        true
+      end
+
+      def non_thread_safe_context_setting
+        return if @already_context
+
+        context_setup&.call(loaded_by_identity.values.flatten)
 
         @already_context = true
-        @loaded
       end
     end
   end

data/lib/n1_loader/core/loadable.rb

@@ -33,9 +33,21 @@ module N1Loader
     end
 
     def n1_bind_to(collection)
+      unless collection.is_a?(Array) && collection.any? do |obj|
+        obj == self || obj.equal?(self)
+      end
+
+        raise InvalidBinding,
+              "assigned collection should be array and include object"
+      end
+
       @n1_binding = collection
     end
 
+    def n1_bind_to?
+      !@n1_binding.nil?
+    end
+
     def n1_loader_reload(name)
       elements = @n1_binding || [self]
       collection = LoaderCollection.new(self.class.n1_loaders[name], elements)
@@ -45,6 +57,7 @@ module N1Loader
     end
 
     def n1_clear_cache
+      @n1_binding = nil
       self.class.n1_loaders.each_key do |name|
         n1_loaders[name] = nil
       end

data/lib/n1_loader/core/loader.rb

@@ -47,12 +47,16 @@ module N1Loader
     end
 
     def for(element)
-      if loaded.empty? && elements.any?
+      return unless loaded?
+
+      if loaded_by_identity.empty? && elements.any?
         raise NotFilled, "Nothing was preloaded, perhaps you forgot to use fulfill method"
       end
-      raise NotLoaded, "The data was not preloaded for the given element" unless loaded.key?(element)
 
-      loaded[element]
+      return loaded_by_identity[element] if loaded_by_identity.key?(element)
+      return loaded_by_value[element] if loaded_by_value.key?(element)
+
+      raise NotLoaded, "The data was not preloaded for the given element"
     end
 
     def cache_key
@@ -62,7 +66,7 @@ module N1Loader
 
     private
 
-    attr_reader :elements, :args
+    attr_reader :elements, :args, :loaded_by_value, :loaded_by_identity
 
     def check_missing_arguments!
       return unless (arguments = self.class.arguments)
@@ -103,35 +107,39 @@ module N1Loader
     end
 
     def fulfill(element, value)
-      @loaded[element] = value
+      loaded_by_identity[element] = value
+      loaded_by_value[element] = value
     end
 
-    def loaded
-      return @loaded if @already_loaded
+    def loaded?
+      return true if @already_loaded
 
-      synchronize do
-        non_thread_safe_loaded unless @already_loaded
-      end
+      synchronize { non_thread_safe_loading unless @already_loaded }
 
-      @loaded
+      true
     end
 
-    def non_thread_safe_loaded # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-      return @loaded if @already_loaded
+    def non_thread_safe_loading # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      return if @already_loaded
 
       check_arguments!
 
-      @loaded = {}
+      @loaded_by_identity = {}.compare_by_identity
+      @loaded_by_value = {}
 
       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)
+
+        # propagate context to loaded objects only when it was set
+        if elements.first.respond_to?(:n1_bind_to?) && elements.first.n1_bind_to?
+          loaded_objects = loaded_by_identity.values.flatten
+          loaded_objects.each { |el| el.n1_bind_to(loaded_objects) if el.respond_to?(:n1_bind_to) }
+        end
       end
 
       @already_loaded = true
-      @loaded
     end
   end
 end

data/lib/n1_loader/version.rb

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

data/lib/n1_loader.rb

@@ -15,4 +15,5 @@ module N1Loader # :nodoc:
   class NotFilled < Error; end
   class MissingArgument < Error; end
   class InvalidArgument < Error; end
+  class InvalidBinding < Error; end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: n1_loader
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Evgeniy Demin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-07 00:00:00.000000000 Z
+date: 2026-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mutex_m