Shorten inspect on AbstractController::Base and ActionDispatch::Request

actionpack/lib/abstract_controller/base.rb

@@ -204,6 +204,10 @@ def self.supports_path?
       true
     end
 
+    def inspect # :nodoc:
+      "#<#{self.class.name}:#{'%#016x' % (object_id << 1)}>"
+    end
+
     private
       # Returns true if the name can be considered an action because
       # it has a method defined in the controller.

actionpack/lib/action_dispatch/http/request.rb

@@ -431,6 +431,10 @@ def ssl?
       super || scheme == "wss"
     end
 
+    def inspect # :nodoc:
+      "#<#{self.class.name} method=#{method.dump}, original_url=#{original_url.dump}, remote_ip=#{remote_ip.dump}, media_type=#{media_type.dump}>"
+    end
+
     private
       def check_method(name)
         HTTP_METHOD_LOOKUP[name] || raise(ActionController::UnknownHttpMethod, "#{name}, accepted HTTP methods are #{HTTP_METHODS[0...-1].join(', ')}, and #{HTTP_METHODS[-1]}")

actionpack/test/controller/base_test.rb

@@ -147,6 +147,10 @@ def test_response_has_default_headers
   ensure
     ActionDispatch::Response.default_headers = original_default_headers
   end
+
+  def test_inspect
+    assert_match(/#<EmptyController:0x[0-9a-f]+>/, @empty.inspect)
+  end
 end
 
 class PerformActionTest < ActionController::TestCase

actionpack/test/controller/metal_test.rb

@@ -29,4 +29,9 @@ def test_response_does_not_have_default_headers
   ensure
     ActionDispatch::Response.default_headers = original_default_headers
   end
+
+  def test_inspect
+    controller = SimpleController.new
+    assert_match(/#<MetalControllerInstanceTests::SimpleController:0x[0-9a-f]+>/, controller.inspect)
+  end
 end

actionpack/test/dispatch/request_test.rb

@@ -1290,3 +1290,21 @@ def setup
     assert_equal expected_hints, early_hints
   end
 end
+
+class RequestInspectTest < BaseRequestTest
+  test "inspect" do
+    request = stub_request(
+      "REQUEST_METHOD" => "POST",
+      "REMOTE_ADDR" => "1.2.3.4",
+      "HTTP_X_FORWARDED_PROTO" => "https",
+      "HTTP_X_FORWARDED_HOST" => "glu.ttono.us:443",
+      "PATH_INFO" => "/path/of/some/uri",
+      "QUERY_STRING" => "mapped=1",
+      "CONTENT_TYPE" => "application/x-www-form-urlencoded; charset=utf-8",
+    )
+    assert_match %r(#<ActionDispatch::Request method="POST"), request.inspect
+    assert_match %r(original_url="https://glu.ttono.us/path/of/some/uri\?mapped=1"), request.inspect
+    assert_match %r(remote_ip="1.2.3.4"), request.inspect
+    assert_match %r(media_type="application/x-www-form-urlencoded">), request.inspect
+  end
+end