actionpack 8.0.3 → 8.1.0.rc1

data/lib/action_dispatch/routing/redirection.rb

@@ -12,9 +12,10 @@ module ActionDispatch
     class Redirect < Endpoint # :nodoc:
       attr_reader :status, :block
 
-      def initialize(status, block)
+      def initialize(status, block, source_location)
         @status = status
         @block  = block
+        @source_location = source_location
       end
 
       def redirect?; true; end
@@ -27,6 +28,7 @@ module ActionDispatch
           payload[:status] = @status
           payload[:location] = response.headers["Location"]
           payload[:request] = request
+          payload[:source_location] = @source_location if @source_location
 
           response.to_a
         end
@@ -202,16 +204,17 @@ module ActionDispatch
       #     get 'accounts/:name' => redirect(SubdomainRedirector.new('api'))
       #
       def redirect(*args, &block)
-        options = args.extract_options!
-        status  = options.delete(:status) || 301
-        path    = args.shift
+        options         = args.extract_options!
+        status          = options.delete(:status) || 301
+        path            = args.shift
+        source_location = caller[0] if ActionDispatch.verbose_redirect_logs
 
-        return OptionRedirect.new(status, options) if options.any?
-        return PathRedirect.new(status, path) if String === path
+        return OptionRedirect.new(status, options, source_location) if options.any?
+        return PathRedirect.new(status, path, source_location) if String === path
 
         block = path if path.respond_to? :call
         raise ArgumentError, "redirection argument not supported" unless block
-        Redirect.new status, block
+        Redirect.new status, block, source_location
       end
     end
   end

data/lib/action_dispatch/routing/route_set.rb

@@ -59,8 +59,6 @@ module ActionDispatch
         private
           def controller(req)
             req.controller_class
-          rescue NameError => e
-            raise ActionController::RoutingError, e.message, e.backtrace
           end
 
           def dispatch(controller, action, req, res)
@@ -659,14 +657,14 @@ module ActionDispatch
         if route.segment_keys.include?(:controller)
           ActionDispatch.deprecator.warn(<<-MSG.squish)
             Using a dynamic :controller segment in a route is deprecated and
-            will be removed in Rails 8.1.
+            will be removed in Rails 9.0.
           MSG
         end
 
         if route.segment_keys.include?(:action)
           ActionDispatch.deprecator.warn(<<-MSG.squish)
             Using a dynamic :action segment in a route is deprecated and
-            will be removed in Rails 8.1.
+            will be removed in Rails 9.0.
           MSG
         end
 

data/lib/action_dispatch/structured_event_subscriber.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module ActionDispatch
+  class StructuredEventSubscriber < ActiveSupport::StructuredEventSubscriber # :nodoc:
+    def redirect(event)
+      payload = event.payload
+      status = payload[:status]
+
+      emit_event("action_dispatch.redirect", {
+        location: payload[:location],
+        status: status,
+        status_name: Rack::Utils::HTTP_STATUS_CODES[status],
+        duration_ms: event.duration.round(2),
+        source_location: payload[:source_location]
+      })
+    end
+  end
+end
+
+ActionDispatch::StructuredEventSubscriber.attach_to :action_dispatch

data/lib/action_dispatch/system_testing/test_helpers/screenshot_helper.rb

@@ -132,8 +132,8 @@ module ActionDispatch
           end
 
           def display_image(html:, screenshot_output:)
-            message = +"[Screenshot Image]: #{image_path}\n"
-            message << +"[Screenshot HTML]: #{html_path}\n" if html
+            message = +"[Screenshot Image]: #{image_path} \n"
+            message << +"[Screenshot HTML]: #{html_path} \n" if html
 
             case screenshot_output || output_type
             when "artifact"

data/lib/action_dispatch/testing/assertions/response.rb

@@ -71,6 +71,20 @@ module ActionDispatch
         assert_operator redirect_expected, :===, redirect_is, message
       end
 
+      # Asserts that the given +text+ is present somewhere in the response body.
+      #
+      #     assert_in_body fixture(:name).description
+      def assert_in_body(text)
+        assert_match(/#{Regexp.escape(text)}/, @response.body)
+      end
+
+      # Asserts that the given +text+ is not present anywhere in the response body.
+      #
+      #     assert_not_in_body fixture(:name).description
+      def assert_not_in_body(text)
+        assert_no_match(/#{Regexp.escape(text)}/, @response.body)
+      end
+
       private
         # Proxy to to_param if the object will respond to it.
         def parameterize(value)

data/lib/action_dispatch/testing/assertions/routing.rb

@@ -25,7 +25,7 @@ module ActionDispatch
             old_integration_session = nil
 
             setup do
-              old_routes = app.routes
+              old_routes = initialize_lazy_routes(app.routes)
               old_routes_call_method = old_routes.method(:call)
               old_integration_session = integration_session
               create_routes(&block)
@@ -38,7 +38,7 @@ module ActionDispatch
         end
 
         def with_routing(&block)
-          old_routes = app.routes
+          old_routes = initialize_lazy_routes(app.routes)
           old_routes_call_method = old_routes.method(:call)
           old_integration_session = integration_session
           create_routes(&block)
@@ -47,6 +47,14 @@ module ActionDispatch
         end
 
         private
+          def initialize_lazy_routes(routes)
+            if defined?(Rails::Engine::LazyRouteSet) && routes.is_a?(Rails::Engine::LazyRouteSet)
+              routes.tap(&:routes)
+            else
+              routes
+            end
+          end
+
           def create_routes
             app = self.app
             routes = ActionDispatch::Routing::RouteSet.new
@@ -340,7 +348,7 @@ module ActionDispatch
         def fail_on(exception_class, message)
           yield
         rescue exception_class => e
-          raise Minitest::Assertion, message || e.message
+          flunk(message || e.message)
         end
     end
   end

data/lib/action_dispatch/testing/integration.rb

@@ -621,7 +621,7 @@ module ActionDispatch
   #         end
   #
   #         assert_response :success
-  #         assert_equal({ id: Article.last.id, title: "Ahoy!" }, response.parsed_body)
+  #         assert_equal({ "id" => Article.last.id, "title" => "Ahoy!" }, response.parsed_body)
   #       end
   #     end
   #

data/lib/action_dispatch.rb

@@ -138,6 +138,14 @@ module ActionDispatch
 
   autoload :SystemTestCase, "action_dispatch/system_test_case"
 
+  ##
+  # :singleton-method:
+  #
+  # Specifies if the methods calling redirects in controllers and routes should
+  #  be logged below their relevant log lines. Defaults to false.
+  singleton_class.attr_accessor :verbose_redirect_logs
+  self.verbose_redirect_logs = false
+
   def eager_load!
     super
     Routing.eager_load!

data/lib/action_pack/gem_version.rb

@@ -10,9 +10,9 @@ module ActionPack
 
   module VERSION
     MAJOR = 8
-    MINOR = 0
-    TINY  = 3
-    PRE   = nil
+    MINOR = 1
+    TINY  = 0
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actionpack
 version: !ruby/object:Gem::Version
-  version: 8.0.3
+  version: 8.1.0.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.0.3
+        version: 8.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.0.3
+        version: 8.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -127,28 +127,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.0.3
+        version: 8.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.0.3
+        version: 8.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.0.3
+        version: 8.1.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.0.3
+        version: 8.1.0.rc1
 description: Web apps on Rails. Simple, battle-tested conventions for building and
   testing MVC web applications. Works with any Rack-compatible server.
 email: david@loudthinking.com
@@ -218,6 +218,7 @@ files:
 - lib/action_controller/railtie.rb
 - lib/action_controller/railties/helpers.rb
 - lib/action_controller/renderer.rb
+- lib/action_controller/structured_event_subscriber.rb
 - lib/action_controller/template_assertions.rb
 - lib/action_controller/test_case.rb
 - lib/action_dispatch.rb
@@ -287,6 +288,7 @@ files:
 - lib/action_dispatch/middleware/static.rb
 - lib/action_dispatch/middleware/templates/rescues/_actions.html.erb
 - lib/action_dispatch/middleware/templates/rescues/_actions.text.erb
+- lib/action_dispatch/middleware/templates/rescues/_copy_button.html.erb
 - lib/action_dispatch/middleware/templates/rescues/_message_and_suggestions.html.erb
 - lib/action_dispatch/middleware/templates/rescues/_request_and_response.html.erb
 - lib/action_dispatch/middleware/templates/rescues/_request_and_response.text.erb
@@ -325,6 +327,7 @@ files:
 - lib/action_dispatch/routing/route_set.rb
 - lib/action_dispatch/routing/routes_proxy.rb
 - lib/action_dispatch/routing/url_for.rb
+- lib/action_dispatch/structured_event_subscriber.rb
 - lib/action_dispatch/system_test_case.rb
 - lib/action_dispatch/system_testing/browser.rb
 - lib/action_dispatch/system_testing/driver.rb
@@ -349,10 +352,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v8.0.3/actionpack/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v8.0.3/
+  changelog_uri: https://github.com/rails/rails/blob/v8.1.0.rc1/actionpack/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v8.1.0.rc1/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v8.0.3/actionpack
+  source_code_uri: https://github.com/rails/rails/tree/v8.1.0.rc1/actionpack
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths: