n1_loader 1.6.5 → 1.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b7ac1fa217041b1142d51fe619c44f6f1cbc16e2d7c2606c5cb4f023f7a19ac
-  data.tar.gz: a62833353c2699c369d3581b239f0b8f67b87b6435cc4cba4995661bc83c9174
+  metadata.gz: f7d5587fbac0376006abf03b7beb385547b1c9206cdeea8461d9bf07b67e0df4
+  data.tar.gz: 6f94574d65b49c528a6af3e06d6d816ed78ef3cf3f6e14002249b816526cbb4a
 SHA512:
-  metadata.gz: c4f17f1bb93729de61ecbd636837323070c65a48f54b4fb6917cf1b24bc5a2b416826498eca11722779aafca09c9f4df150687aed331b6dae2fa9172c024aab4
-  data.tar.gz: 102ed2741ad8af210182576df8ceba4293d829b0c4489d6f15a5823dcfe0de976a4ecb604c57fe6383cdf243cc2e4fc510a3f1d8ee1d1e4cfc0c7b5ec0941e65
+  metadata.gz: 39d0370fee07be7e080adb22392633366da8cce0b74228c728b8647e9f7f859b4c995346bf0a8e9b477c355374b29f4f4690f089c6b6904822af3cfba88685af
+  data.tar.gz: 0245c5ba26df1d3f3508a22143ae5cb9d708c5460ef218ee2193b8cc537bf0ee6f6838357be50fe4d2d2d4c1db050e76a6176e98b3b7df4c64af4bf7b0e35e36

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [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!

data/lib/n1_loader/version.rb

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

metadata

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