actionpack 7.2.2.1 → 8.0.5

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

@@ -5,6 +5,7 @@
 require "uri"
 require "active_support/core_ext/hash/indifferent_access"
 require "active_support/core_ext/string/access"
+require "active_support/core_ext/module/redefine_method"
 require "action_controller/metal/exceptions"
 
 module ActionDispatch
@@ -20,38 +21,43 @@ module ActionDispatch
         module ClassMethods
           def with_routing(&block)
             old_routes = nil
+            old_routes_call_method = nil
             old_integration_session = nil
 
             setup do
               old_routes = app.routes
+              old_routes_call_method = old_routes.method(:call)
               old_integration_session = integration_session
               create_routes(&block)
             end
 
             teardown do
-              reset_routes(old_routes, old_integration_session)
+              reset_routes(old_routes, old_routes_call_method, old_integration_session)
             end
           end
         end
 
         def with_routing(&block)
           old_routes = app.routes
+          old_routes_call_method = old_routes.method(:call)
           old_integration_session = integration_session
           create_routes(&block)
         ensure
-          reset_routes(old_routes, old_integration_session)
+          reset_routes(old_routes, old_routes_call_method, old_integration_session)
         end
 
         private
           def create_routes
             app = self.app
             routes = ActionDispatch::Routing::RouteSet.new
-            rack_app = app.config.middleware.build(routes)
+
+            @original_routes ||= app.routes
+            @original_routes.singleton_class.redefine_method(:call, &routes.method(:call))
+
             https = integration_session.https?
             host = integration_session.host
 
             app.instance_variable_set(:@routes, routes)
-            app.instance_variable_set(:@app, rack_app)
             @integration_session = Class.new(ActionDispatch::Integration::Session) do
               include app.routes.url_helpers
               include app.routes.mounted_helpers
@@ -63,11 +69,9 @@ module ActionDispatch
             yield routes
           end
 
-          def reset_routes(old_routes, old_integration_session)
-            old_rack_app = app.config.middleware.build(old_routes)
-
+          def reset_routes(old_routes, old_routes_call_method, old_integration_session)
             app.instance_variable_set(:@routes, old_routes)
-            app.instance_variable_set(:@app, old_rack_app)
+            @original_routes.singleton_class.redefine_method(:call, &old_routes_call_method)
             @integration_session = old_integration_session
             @routes = old_routes
           end
@@ -118,9 +122,9 @@ module ActionDispatch
       #       assert_equal "/users", users_path
       #     end
       #
-      def with_routing(&block)
+      def with_routing(config = nil, &block)
         old_routes, old_controller = @routes, @controller
-        create_routes(&block)
+        create_routes(config, &block)
       ensure
         reset_routes(old_routes, old_controller)
       end
@@ -267,8 +271,8 @@ module ActionDispatch
       end
 
       private
-        def create_routes
-          @routes = ActionDispatch::Routing::RouteSet.new
+        def create_routes(config = nil)
+          @routes = ActionDispatch::Routing::RouteSet.new(config || ActionDispatch::Routing::RouteSet::DEFAULT_CONFIG)
           if @controller
             @controller = @controller.clone
             _routes = @routes

data/lib/action_dispatch/testing/integration.rb

@@ -184,7 +184,7 @@ module ActionDispatch
       # Returns `true` if the session is mimicking a secure HTTPS request.
       #
       #     if session.https?
-      #       ...
+      #       # ...
       #     end
       def https?
         @https
@@ -203,7 +203,7 @@ module ActionDispatch
       # *   `env`: Additional env to pass, as a Hash. The headers will be merged into
       #     the Rack env hash.
       # *   `xhr`: Set to `true` if you want to make an Ajax request. Adds request
-      #     headers characteristic of XMLHttpRequest e.g. HTTP_X_REQUESTED_WITH. The
+      #     headers characteristic of `XMLHttpRequest`, e.g. `HTTP_X_REQUESTED_WITH`. The
       #     headers will be merged into the Rack env hash.
       # *   `as`: Used for encoding the request with different content type. Supports
       #     `:json` by default and will set the appropriate request headers. The
@@ -218,9 +218,10 @@ module ActionDispatch
       # This method returns the response status, after performing the request.
       # Furthermore, if this method was called from an ActionDispatch::IntegrationTest
       # object, then that object's `@response` instance variable will point to a
-      # Response object which one can use to inspect the details of the response.
+      # ActionDispatch::TestResponse object which one can use to inspect the details of the response.
       #
       # Example:
+      #
       #     process :get, '/author', params: { since: 201501011400 }
       def process(method, path, params: nil, headers: nil, env: nil, xhr: false, as: nil)
         request_encoder = RequestEncoder.encoder(as)
@@ -284,7 +285,17 @@ module ActionDispatch
 
         # NOTE: rack-test v0.5 doesn't build a default uri correctly Make sure requested
         # path is always a full URI.
-        session.request(build_full_uri(path, request_env), request_env)
+        uri = build_full_uri(path, request_env)
+
+        if method == :get && String === request_env[:params]
+          # rack-test will needlessly parse and rebuild a :params
+          # querystring, using Rack's query parser. At best that's a
+          # waste of time; at worst it can change the value.
+
+          uri << "?" << request_env.delete(:params)
+        end
+
+        session.request(uri, request_env)
 
         @request_count += 1
         @request = ActionDispatch::Request.new(session.last_request.env)
@@ -539,7 +550,7 @@ module ActionDispatch
   #         https!(false)
   #         get "/articles/all"
   #         assert_response :success
-  #         assert_select 'h1', 'Articles'
+  #         assert_dom 'h1', 'Articles'
   #       end
   #     end
   #
@@ -578,7 +589,7 @@ module ActionDispatch
   #           def browses_site
   #             get "/products/all"
   #             assert_response :success
-  #             assert_select 'h1', 'Products'
+  #             assert_dom 'h1', 'Products'
   #           end
   #         end
   #
@@ -594,9 +605,8 @@ module ActionDispatch
   #         end
   #     end
   #
-  # See the [request helpers documentation]
-  # (rdoc-ref:ActionDispatch::Integration::RequestHelpers) for help
-  # on how to use `get`, etc.
+  # See the [request helpers documentation](rdoc-ref:ActionDispatch::Integration::RequestHelpers)
+  # for help on how to use `get`, etc.
   #
   # ### Changing the request encoding
   #
@@ -612,7 +622,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/testing/request_encoder.rb

@@ -3,6 +3,7 @@
 # :markup: markdown
 
 require "nokogiri"
+require "action_dispatch/http/mime_type"
 
 module ActionDispatch
   class RequestEncoder # :nodoc:
@@ -15,9 +16,9 @@ module ActionDispatch
 
     @encoders = { identity: IdentityEncoder.new }
 
-    attr_reader :response_parser
+    attr_reader :response_parser, :content_type
 
-    def initialize(mime_name, param_encoder, response_parser)
+    def initialize(mime_name, param_encoder, response_parser, content_type)
       @mime = Mime[mime_name]
 
       unless @mime
@@ -27,10 +28,7 @@ module ActionDispatch
 
       @response_parser = response_parser || -> body { body }
       @param_encoder   = param_encoder   || :"to_#{@mime.symbol}".to_proc
-    end
-
-    def content_type
-      @mime.to_s
+      @content_type    = content_type    || @mime.to_s
     end
 
     def accept_header
@@ -50,11 +48,13 @@ module ActionDispatch
       @encoders[name] || @encoders[:identity]
     end
 
-    def self.register_encoder(mime_name, param_encoder: nil, response_parser: nil)
-      @encoders[mime_name] = new(mime_name, param_encoder, response_parser)
+    def self.register_encoder(mime_name, param_encoder: nil, response_parser: nil, content_type: nil)
+      @encoders[mime_name] = new(mime_name, param_encoder, response_parser, content_type)
     end
 
-    register_encoder :html, response_parser: -> body { Rails::Dom::Testing.html_document.parse(body) }
+    register_encoder :html, response_parser: -> body { Rails::Dom::Testing.html_document.parse(body) },
+                            param_encoder: -> param { param },
+                            content_type: Mime[:url_encoded_form].to_s
     register_encoder :json, response_parser: -> body { JSON.parse(body, object_class: ActiveSupport::HashWithIndifferentAccess) }
   end
 end

data/lib/action_dispatch/testing/test_process.rb

@@ -9,8 +9,7 @@ module ActionDispatch
   module TestProcess
     module FixtureFile
       # Shortcut for
-      # `Rack::Test::UploadedFile.new(File.join(ActionDispatch::IntegrationTest.file_f
-      # ixture_path, path), type)`:
+      # `Rack::Test::UploadedFile.new(File.join(ActionDispatch::IntegrationTest.file_fixture_path, path), type)`:
       #
       #     post :change_avatar, params: { avatar: file_fixture_upload('david.png', 'image/png') }
       #

data/lib/action_dispatch.rb

@@ -30,7 +30,6 @@ require "active_support/core_ext/module/attribute_accessors"
 
 require "action_pack"
 require "rack"
-require "uri"
 require "action_dispatch/deprecator"
 
 module Rack # :nodoc:
@@ -48,16 +47,19 @@ end
 module ActionDispatch
   extend ActiveSupport::Autoload
 
-  RFC2396_PARSER = defined?(URI::RFC2396_PARSER) ? URI::RFC2396_PARSER : URI::RFC2396_Parser.new
-  private_constant :RFC2396_PARSER
-
   class MissingController < NameError
   end
 
   eager_autoload do
     autoload_under "http" do
       autoload :ContentSecurityPolicy
+      autoload :InvalidParameterError, "action_dispatch/http/param_error"
+      autoload :ParamBuilder
+      autoload :ParamError
+      autoload :ParameterTypeError, "action_dispatch/http/param_error"
+      autoload :ParamsTooDeepError, "action_dispatch/http/param_error"
       autoload :PermissionsPolicy
+      autoload :QueryParser
       autoload :Request
       autoload :Response
     end

data/lib/action_pack/gem_version.rb

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: actionpack
 version: !ruby/object:Gem::Version
-  version: 7.2.2.1
+  version: 8.0.5
 platform: ruby
 authors:
 - David Heinemeier Hansson
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-12-10 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.2.2.1
+        version: 8.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.2.2.1
+        version: 8.0.5
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +37,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.5
-- !ruby/object:Gem::Dependency
-  name: racc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -59,9 +44,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.4
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -69,9 +51,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.4
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rack-session
   requirement: !ruby/object:Gem::Requirement
@@ -148,28 +127,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.2.2.1
+        version: 8.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.2.2.1
+        version: 8.0.5
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.2.2.1
+        version: 8.0.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.2.2.1
+        version: 8.0.5
 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
@@ -253,8 +232,11 @@ files:
 - lib/action_dispatch/http/mime_negotiation.rb
 - lib/action_dispatch/http/mime_type.rb
 - lib/action_dispatch/http/mime_types.rb
+- lib/action_dispatch/http/param_builder.rb
+- lib/action_dispatch/http/param_error.rb
 - lib/action_dispatch/http/parameters.rb
 - lib/action_dispatch/http/permissions_policy.rb
+- lib/action_dispatch/http/query_parser.rb
 - lib/action_dispatch/http/rack_cache.rb
 - lib/action_dispatch/http/request.rb
 - lib/action_dispatch/http/response.rb
@@ -268,8 +250,6 @@ files:
 - lib/action_dispatch/journey/nfa/dot.rb
 - lib/action_dispatch/journey/nodes/node.rb
 - lib/action_dispatch/journey/parser.rb
-- lib/action_dispatch/journey/parser.y
-- lib/action_dispatch/journey/parser_extras.rb
 - lib/action_dispatch/journey/path/pattern.rb
 - lib/action_dispatch/journey/route.rb
 - lib/action_dispatch/journey/router.rb
@@ -369,12 +349,11 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v7.2.2.1/actionpack/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v7.2.2.1/
+  changelog_uri: https://github.com/rails/rails/blob/v8.0.5/actionpack/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v8.0.5/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v7.2.2.1/actionpack
+  source_code_uri: https://github.com/rails/rails/tree/v8.0.5/actionpack
   rubygems_mfa_required: 'true'
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -382,7 +361,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -390,8 +369,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.5.22
-signing_key: 
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Web-flow and rendering framework putting the VC in MVC (part of Rails).
 test_files: []

data/lib/action_dispatch/journey/parser.y

@@ -1,50 +0,0 @@
-class ActionDispatch::Journey::Parser
-  options no_result_var
-token SLASH LITERAL SYMBOL LPAREN RPAREN DOT STAR OR
-
-rule
-  expressions
-    : expression expressions  { Cat.new(val.first, val.last) }
-    | expression              { val.first }
-    | or
-    ;
-  expression
-    : terminal
-    | group
-    | star
-    ;
-  group
-    : LPAREN expressions RPAREN { Group.new(val[1]) }
-    ;
-  or
-    : expression OR expression { Or.new([val.first, val.last]) }
-    | expression OR or { Or.new([val.first, val.last]) }
-    ;
-  star
-    : STAR       { Star.new(Symbol.new(val.last, Symbol::GREEDY_EXP)) }
-    ;
-  terminal
-    : symbol
-    | literal
-    | slash
-    | dot
-    ;
-  slash
-    : SLASH              { Slash.new(val.first) }
-    ;
-  symbol
-    : SYMBOL             { Symbol.new(val.first) }
-    ;
-  literal
-    : LITERAL            { Literal.new(val.first) }
-    ;
-  dot
-    : DOT                { Dot.new(val.first) }
-    ;
-
-end
-
----- header
-# :stopdoc:
-
-require "action_dispatch/journey/parser_extras"

data/lib/action_dispatch/journey/parser_extras.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-# :markup: markdown
-
-require "action_dispatch/journey/scanner"
-require "action_dispatch/journey/nodes/node"
-
-module ActionDispatch
-  # :stopdoc:
-  module Journey
-    class Parser < Racc::Parser
-      include Journey::Nodes
-
-      def self.parse(string)
-        new.parse string
-      end
-
-      def initialize
-        @scanner = Scanner.new
-      end
-
-      def parse(string)
-        @scanner.scan_setup(string)
-        do_parse
-      end
-
-      def next_token
-        @scanner.next_token
-      end
-    end
-  end
-  # :startdoc:
-end