n1_loader 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b26072476fbcb5cd1635a97c0139aef964d7e2d89d22bd2aaf0f10bf50314337
-  data.tar.gz: f998a2e0997e9c3657402fd5e351dfb02fc53d981cd63c0c723b3e09094ba5f0
+  metadata.gz: 56479004f7a3456664bac05e808268177dabffa616848b57efb734865fd5ec49
+  data.tar.gz: 2d65c334abe26c5eb9baeb17ebe186d201b6c362b60d628758defd696b3e3522
 SHA512:
-  metadata.gz: 70c3fcdf22685895f3ead6f1987b6044b3d926c40a19d1c3a10295066a26831f729d91ac07ae6b6044798de7cf47b83792565ce8d710efdeb44e56afd9a4a7c4
-  data.tar.gz: 21fd7cbb0bb2c2a751a74c3773dec35ecfa37ea1467fa553c7021142809053ede73a6a7149bab92da9529619e045d1bbf2dd90a5600381a8a894c7fb6f75545c
+  metadata.gz: 9d83a5cc7742f23b0702f56fbcd2320f46e309731c7734df825406a657709259dae08e2e3ed78db322f815438e5e0db82cbe40799e02bb7d0f7cd469ad453585
+  data.tar.gz: 225fa5c982e60ceaae8d5a8cbd90ff6ecd8d54cff5105bc1338d45e6fb9969586af5ced3fa6b3a7c6948a453ee7bd7956a30f2972527719d32467116da48f7ce

data/lib/n1_loader/ar_lazy_preload/loader_patch.rb

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

data/lib/n1_loader/core/loadable.rb

@@ -45,6 +45,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?
+      identity_loaded = loaded
+
+      if identity_loaded.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 identity_loaded[element] if identity_loaded.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
@@ -103,25 +107,28 @@ 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 ensure_loaded
+      return if @already_loaded
 
-      synchronize do
-        non_thread_safe_loaded unless @already_loaded
-      end
+      synchronize { non_thread_safe_loaded unless @already_loaded }
+    end
 
-      @loaded
+    def loaded
+      ensure_loaded
+      @loaded_by_identity
     end
 
     def non_thread_safe_loaded # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-      return @loaded if @already_loaded
+      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))
@@ -131,7 +138,6 @@ module N1Loader
       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.0"
 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.0
 platform: ruby
 authors:
 - Evgeniy Demin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-07 00:00:00.000000000 Z
+date: 2026-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mutex_m