n1_loader 1.6.5 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b7ac1fa217041b1142d51fe619c44f6f1cbc16e2d7c2606c5cb4f023f7a19ac
-  data.tar.gz: a62833353c2699c369d3581b239f0b8f67b87b6435cc4cba4995661bc83c9174
+  metadata.gz: e9be9c5e7d5e551d253a327cd3d130a38821ef49a43cab60235cc5363a4093d0
+  data.tar.gz: 55c8e748bf52fc05b8648d81d907963b4a60eae0b7aa680d0c491987b43303d3
 SHA512:
-  metadata.gz: c4f17f1bb93729de61ecbd636837323070c65a48f54b4fb6917cf1b24bc5a2b416826498eca11722779aafca09c9f4df150687aed331b6dae2fa9172c024aab4
-  data.tar.gz: 102ed2741ad8af210182576df8ceba4293d829b0c4489d6f15a5823dcfe0de976a4ecb604c57fe6383cdf243cc2e4fc510a3f1d8ee1d1e4cfc0c7b5ec0941e65
+  metadata.gz: b626c836856198a9e0d0f54daedd0299b2cd7eb0648ddde369a6b7f923751b31d402c8ba03ab67bb064b884e5c5f035babcd1f59d0bef93db26968f7e6fca7ae
+  data.tar.gz: 640e8decd4c53e4f09451041392b964b5f0e59a273719673978e4bf62d26543364b5b4166d97833b7a5084ebacfe7921a921a5c0aae3938c3ce9394f6627bfc8

data/CHANGELOG.md

@@ -1,3 +1,48 @@
+## [1.6.7] - 2023/07/30
+
+Extend the flexibility of loading data comparison. Thanks [Nazar Matus](https://github.com/FunkyloverOne) for suggesting it! 
+
+**BREAKING CHANGES:**
+
+Loose comparison of loaded data. Before loaded data was initialized with identity comparator in mind:
+
+```ruby
+@loaded = {}.compare_by_identity
+```
+
+Now it will be:
+
+```ruby
+@loaded = {}
+```
+
+This might bring unwanted results for cases when strict comparison was wanted. 
+
+On the other hand, it gives more flexibility for many other cases, especially with isolated loader.
+For example, this will work now, when it wasn't working before.
+
+```ruby
+# ActiveRecord object
+object = Entity.first
+
+# Initialize isolated loader
+instance = loader.new([object])
+
+# This was working before because the loaded object is identical to passed object by `#object_id`
+instance.for(object)
+
+# This wasn't working before because the loaded object is not identical to passed one by `#object_id`
+# 
+# But it will be working now, because object == Entity.find(object.id)
+instance.for(Entity.find(object.id))
+```
+
+If you need strict comparison support, please feel free to open the issue or the PR.
+
+## [1.6.6] - 2023/07/30
+
+- Fix naive check of required arguments. Thanks [Nazar Matus](https://github.com/FunkyloverOne) for the issue!
+
 ## [1.6.5] - 2023/07/30
 
 - Fix nested preloading for ActiveRecord 7. Thanks [Igor Gonchar](https://github.com/gigorok) for the issue!

data/lib/n1_loader/core/loader.rb

@@ -62,22 +62,20 @@ module N1Loader
 
     attr_reader :elements, :args
 
-    def check_missing_arguments! # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+    def check_missing_arguments! # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
       return unless (arguments = self.class.arguments)
 
-      min = arguments.count { |argument| !argument[:optional] }
-      max = arguments.count
+      required_arguments = arguments.reject { |argument| argument[:optional] }
+                                    .map { |argument| argument[:name] }
 
-      return if args.size >= min && args.size <= max
+      return if required_arguments.all? { |argument| args.key?(argument) }
 
-      str =
-        if min == max
-          max.to_s
-        else
-          "#{min}..#{max}"
-        end
+      missing_arguments = required_arguments.reject { |argument| args.key?(argument) }
+
+      list = missing_arguments.map { |argument| ":#{argument}" }.join(", ")
 
-      raise MissingArgument, "Loader requires #{str} arguments but #{args.size} were given"
+      raise MissingArgument,
+            "Loader requires [#{list}] arguments but they are missing"
     end
 
     def check_arguments!
@@ -108,7 +106,7 @@ module N1Loader
 
       check_arguments!
 
-      @loaded = {}.compare_by_identity
+      @loaded = {}
 
       if respond_to?(:single) && elements.size == 1
         fulfill(elements.first, single(elements.first))

data/lib/n1_loader/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: n1_loader
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.7.0
 platform: ruby
 authors:
 - Evgeniy Demin