n1_loader 1.6.4 → 1.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dbd6c49bba45473f2a822d02befa1ca0efdc155698648a17640c472ace4fccd
-  data.tar.gz: db6c04d5cc63ddbcc8a3362fba985f478601e2b5ed0f5a298df992ecdc1e8f65
+  metadata.gz: f7d5587fbac0376006abf03b7beb385547b1c9206cdeea8461d9bf07b67e0df4
+  data.tar.gz: 6f94574d65b49c528a6af3e06d6d816ed78ef3cf3f6e14002249b816526cbb4a
 SHA512:
-  metadata.gz: 397c84c6ee33547838c1155c58f7488dfef34028003d7da1c26a6f9a0f2be951bfe4ff4d7df761be6185ec58e36022ead691e434af708fd74ccb2cbae503e459
-  data.tar.gz: 4a554a0f7aa8832b7aa81f32e8b0544baf060c0c8b59538f56e7d579b0e972e680a989ff41c7fe14c01665a7a2f8fb3883ca7ef98d60cc24005a68d3fe67bc6d
+  metadata.gz: 39d0370fee07be7e080adb22392633366da8cce0b74228c728b8647e9f7f859b4c995346bf0a8e9b477c355374b29f4f4690f089c6b6904822af3cfba88685af
+  data.tar.gz: 0245c5ba26df1d3f3508a22143ae5cb9d708c5460ef218ee2193b8cc537bf0ee6f6838357be50fe4d2d2d4c1db050e76a6176e98b3b7df4c64af4bf7b0e35e36

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [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!
+
 ## [1.6.4] - 2023/07/30
 
 - Add support of `n1_optimized` ending with `?` (question mark). Thanks [Ilya Kamenko](https://github.com/Galathius) for the suggestion!

data/lib/n1_loader/active_record/loader_collection.rb

@@ -13,3 +13,7 @@ end
 N1Loader::LoaderCollection.define_method :run? do
   true
 end
+
+N1Loader::LoaderCollection.define_method :future_classes do
+  []
+end

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.4"
+  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.4
+  version: 1.6.6
 platform: ruby
 authors:
 - Evgeniy Demin