Merge pull request rails#53383 from Earlopain/rack-3.2-deprecation

Handle Rack 3.2 `unprocessable_{entity,content}`

Author: byroot

actionmailbox/app/controllers/action_mailbox/ingresses/mandrill/inbound_emails_controller.rb

@@ -22,7 +22,7 @@ def create
       head :ok
     rescue JSON::ParserError => error
       logger.error error.message
-      head :unprocessable_entity
+      head ActionDispatch::Constants::UNPROCESSABLE_CONTENT
     end
 
     def health_check

actionmailbox/app/controllers/action_mailbox/ingresses/postmark/inbound_emails_controller.rb

@@ -57,7 +57,7 @@ def create
         When configuring your Postmark inbound webhook, be sure to check the box
         labeled "Include raw email content in JSON payload".
       MESSAGE
-      head :unprocessable_entity
+      head ActionDispatch::Constants::UNPROCESSABLE_CONTENT
     end
 
     private

actionmailbox/app/controllers/action_mailbox/ingresses/relay/inbound_emails_controller.rb

@@ -55,7 +55,7 @@ def create
       if request.body
         ActionMailbox::InboundEmail.create_and_extract_message_id! request.body.read
       else
-        head :unprocessable_entity
+        head ActionDispatch::Constants::UNPROCESSABLE_CONTENT
       end
     end
 

actionmailbox/app/controllers/action_mailbox/ingresses/sendgrid/inbound_emails_controller.rb

@@ -52,7 +52,7 @@ def create
       ActionMailbox::InboundEmail.create_and_extract_message_id! mail
     rescue JSON::ParserError => error
       logger.error error.message
-      head :unprocessable_entity
+      head ActionDispatch::Constants::UNPROCESSABLE_CONTENT
     end
 
     private

actionmailbox/test/controllers/ingresses/postmark/inbound_emails_controller_test.rb

@@ -53,7 +53,7 @@ class ActionMailbox::Ingresses::Postmark::InboundEmailsControllerTest < ActionDi
         headers: { authorization: credentials }, params: { From: "[email protected]" }
     end
 
-    assert_response :unprocessable_entity
+    assert_response ActionDispatch::Constants::UNPROCESSABLE_CONTENT
   end
 
   test "rejecting an unauthorized inbound email from Postmark" do

actionmailbox/test/controllers/ingresses/relay/inbound_emails_controller_test.rb

@@ -37,7 +37,7 @@ class ActionMailbox::Ingresses::Relay::InboundEmailsControllerTest < ActionDispa
         env: { "rack.input" => nil }
     end
 
-    assert_response :unprocessable_entity
+    assert_response ActionDispatch::Constants::UNPROCESSABLE_CONTENT
   end
 
   test "rejecting an unauthorized inbound email" do

actionpack/lib/action_controller/metal/redirecting.rb

@@ -249,9 +249,9 @@ def _allow_other_host
 
       def _extract_redirect_to_status(options, response_options)
         if options.is_a?(Hash) && options.key?(:status)
-          Rack::Utils.status_code(options.delete(:status))
+          ActionDispatch::Response.rack_status_code(options.delete(:status))
         elsif response_options.key?(:status)
-          Rack::Utils.status_code(response_options[:status])
+          ActionDispatch::Response.rack_status_code(response_options[:status])
         else
           302
         end

actionpack/lib/action_controller/metal/rendering.rb

@@ -238,7 +238,7 @@ def _normalize_options(options)
         end
 
         if options[:status]
-          options[:status] = Rack::Utils.status_code(options[:status])
+          options[:status] = ActionDispatch::Response.rack_status_code(options[:status])
         end
 
         super

actionpack/lib/action_dispatch/constants.rb

@@ -30,5 +30,11 @@ module Constants
       SERVER_TIMING = "server-timing"
       STRICT_TRANSPORT_SECURITY = "strict-transport-security"
     end
+
+    if Gem::Version.new(Rack::RELEASE) < Gem::Version.new("3.1")
+      UNPROCESSABLE_CONTENT = :unprocessable_entity
+    else
+      UNPROCESSABLE_CONTENT = :unprocessable_content
+    end
   end
 end

actionpack/lib/action_dispatch/http/response.rb

@@ -46,6 +46,20 @@ class Response
       Headers = ::Rack::Utils::HeaderHash
     end
 
+    class << self
+      if ActionDispatch::Constants::UNPROCESSABLE_CONTENT == :unprocessable_content
+        def rack_status_code(status) # :nodoc:
+          status = :unprocessable_content if status == :unprocessable_entity
+          Rack::Utils.status_code(status)
+        end
+      else
+        def rack_status_code(status) # :nodoc:
+          status = :unprocessable_entity if status == :unprocessable_content
+          Rack::Utils.status_code(status)
+        end
+      end
+    end
+
     # To be deprecated:
     Header = Headers
 
@@ -257,7 +271,7 @@ def sent?;      synchronize { @sent };      end
 
     # Sets the HTTP status code.
     def status=(status)
-      @status = Rack::Utils.status_code(status)
+      @status = Response.rack_status_code(status)
     end
 
     # Sets the HTTP response's content MIME type. For example, in the controller you