Fix Ruby 2.7 warnings for ActionController::Metal.use

Author: kamipo

actionpack/lib/action_controller/metal.rb

@@ -15,10 +15,10 @@ module ActionController
   #
   class MiddlewareStack < ActionDispatch::MiddlewareStack #:nodoc:
     class Middleware < ActionDispatch::MiddlewareStack::Middleware #:nodoc:
-      def initialize(klass, args, actions, strategy, block)
+      def initialize(klass, args, actions, strategy, block, &build_block)
         @actions = actions
         @strategy = strategy
-        super(klass, args, block)
+        super(klass, args, block, &build_block)
       end
 
       def valid?(action)
@@ -56,7 +56,9 @@ def build_middleware(klass, *args, &block)
           list     = except
         end
 
-        Middleware.new(klass, args, list, strategy, block)
+        Middleware.new(klass, args, list, strategy, block) do |app|
+          klass.new(app, *args, &block)
+        end
       end
   end
 
@@ -218,8 +220,14 @@ def self.inherited(base) # :nodoc:
 
     # Pushes the given Rack middleware and its arguments to the bottom of the
     # middleware stack.
-    def self.use(*args, &block)
-      middleware_stack.use(*args, &block)
+    if RUBY_VERSION >= "2.7"
+      def self.use(...)
+        middleware_stack.use(...)
+      end
+    else
+      def self.use(*args, &block)
+        middleware_stack.use(*args, &block)
+      end
     end
 
     # Alias for +middleware_stack+.

actionpack/lib/action_dispatch/middleware/stack.rb

@@ -151,6 +151,5 @@ def build_middleware(klass, *args, &block)
           klass.new(app, *args, &block)
         end
       end
-      ruby2_keywords(:build_middleware) if respond_to?(:ruby2_keywords, true)
   end
 end

actionpack/test/controller/new_base/middleware_test.rb

@@ -4,7 +4,7 @@
 
 module MiddlewareTest
   class MyMiddleware
-    def initialize(app)
+    def initialize(app, kw: nil)
       @app = app
     end
 
@@ -17,7 +17,7 @@ def call(env)
   end
 
   class ExclaimerMiddleware
-    def initialize(app)
+    def initialize(app, kw: nil)
       @app = app
     end
 
@@ -46,8 +46,8 @@ class MyController < ActionController::Metal
     use BlockMiddleware do |config|
       config.configurable_message = "Configured by block."
     end
-    use MyMiddleware
-    middleware.insert_before MyMiddleware, ExclaimerMiddleware
+    use MyMiddleware, kw: 1
+    middleware.insert_before MyMiddleware, ExclaimerMiddleware, kw: 1
 
     def index
       self.response_body = "Hello World"
@@ -58,8 +58,8 @@ class InheritedController < MyController
   end
 
   class ActionsController < ActionController::Metal
-    use MyMiddleware, only: :show
-    middleware.insert_before MyMiddleware, ExclaimerMiddleware, except: :index
+    use MyMiddleware, only: :show, kw: 1
+    middleware.insert_before MyMiddleware, ExclaimerMiddleware, except: :index, kw: 1
 
     def index
       self.response_body = "index"