lib/minitest/keyword.rb in minitest-keyword-1.0.1 vs lib/minitest/keyword.rb in minitest-keyword-1.0.2

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'minitest'
-require 'minitest/keyword/version'
+require "minitest"
+require "minitest/keyword/version"
 
 module Minitest
   # The module containing overridden assertion methods that will be prepended
   # into the Test class
   module Keyword
@@ -22,58 +22,73 @@
 
     # Raised if someone tries to pass both the regular arguments and the
     # keyword arguments
     class OverloadedArgumentError < ArgumentError
       def initialize(method_name, argument_name)
-        super('Cannot specify keyword argument and pass regular argument to ' \
-              "#{method_name} for argument #{argument_name}")
+        super(
+          "Cannot specify keyword argument and pass regular argument to " \
+            "#{method_name} for argument #{argument_name}"
+        )
       end
     end
 
     # Raised if a parameter is required but none was provided as either a
     # regular argument or a keyword argument
     class MissingRequiredArgumentError < ArgumentError
       def initialize(method_name, argument_name)
-        super("You must specify a value for the #{argument_name} argument " \
-              "for the #{method_name} assertion")
+        super(
+          "You must specify a value for the #{argument_name} argument " \
+            "for the #{method_name} assertion"
+        )
       end
     end
 
-    Assertions.instance_methods.grep(/assert|refute/).each do |method_name|
-      parameters = Assertions.instance_method(method_name).parameters
+    Assertions
+      .instance_methods
+      .grep(/assert|refute/)
+      .each do |method_name|
+        parameters = Assertions.instance_method(method_name).parameters
+        next if parameters.empty?
 
-      # This check here for methods like `assert_silent`
-      next if parameters.empty?
+        define_method(method_name) do |*args, **kwargs, &block|
+          passed_args = []
+          passed_kwargs = {}
 
-      # rubocop:disable Metrics/MethodLength
-      define_method(method_name) do |*args, **kwargs, &block|
-        passed_params = []
+          parameters.each.with_index do |(type, arg_name), index|
+            if args.length > index &&
+                 (kwargs.key?(arg_name) || kwargs.key?(ALIASES[arg_name]))
+              raise OverloadedArgumentError.new(method_name, arg_name)
+            end
 
-        parameters.each.with_index do |(type, arg_name), index|
-          if args.length > index &&
-             (kwargs.key?(arg_name) || kwargs.key?(ALIASES[arg_name]))
-            raise OverloadedArgumentError.new(method_name, arg_name)
-          end
+            if type == :req && args.length <= index && !kwargs.key?(arg_name) &&
+                 !kwargs.key?(ALIASES[arg_name])
+              raise MissingRequiredArgumentError.new(method_name, arg_name)
+            end
 
-          if type == :req && args.length <= index &&
-             !kwargs.key?(arg_name) && !kwargs.key?(ALIASES[arg_name])
-            raise MissingRequiredArgumentError.new(method_name, arg_name)
+            case type
+            when :rest
+              passed_args +=
+                if args.any?
+                  args[index..-1]
+                else
+                  kwargs[arg_name] || kwargs[ALIASES[arg_name]]
+                end
+            when :key
+              passed_kwargs[arg_name] = (
+                kwargs[arg_name] || kwargs[ALIASES[arg_name]]
+              )
+            when :req, :opt
+              passed_args << (
+                args[index] || kwargs[arg_name] || kwargs[ALIASES[arg_name]]
+              )
+            else
+              raise "Unknown parameter type #{type}"
+            end
           end
 
-          if type == :rest && args.any?
-            passed_params += args[index..-1]
-          elsif type == :rest
-            passed_params += (kwargs[arg_name] || kwargs[ALIASES[arg_name]])
-          else
-            passed_params <<
-              (args[index] || kwargs[arg_name] || kwargs[ALIASES[arg_name]])
-          end
+          super(*passed_args, **passed_kwargs, &block)
         end
-
-        super(*passed_params, &block)
       end
-      # rubocop:enable Metrics/MethodLength
-    end
   end
 
   # Hook into the Minitest::Test class and prepend the Keyword module
   class Test
     prepend Keyword