rack-test 2.1.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98bb9656717c512790c5f65b20a8f0cfc7c2f14e4d9d98d5069e6e5910b256e5
-  data.tar.gz: 6305cac1636eef820a082a1431cef2bc24b445b1f902b65c550f976ba84f08e6
+  metadata.gz: 434b9a347a037eb6639e5e154affb301394d2067ba701dfaa5229189e7c2c895
+  data.tar.gz: 066fcdc1df73ec7bc4ecab58ba971762f6dd40cbf8df1f7e91bb6d72a31304e0
 SHA512:
-  metadata.gz: 420e60a08ec2fa5fd92a358d28c0b17e0a943eb30962756360185091753bdd4eb55b7b58005aa84bb1907cfb7e8129166d1aed6282596f45b8b0f42dd1003306
-  data.tar.gz: b7446d71bf41a0f69b9812e867f7b472488ee0534d6206435b77e8266617486687044a814dd6c085003b823e0e349c83b1ca47ea296f1f23346957d66cbed0bc
+  metadata.gz: 60c104aea1a7d8fef5be9a1e0103f5bafb81dcbdc47e3a3a91a3ea2667413ccdcf0cd6a6d9327cbd0a36f27bbb2e4a72ee6b442484b833a88ad24d90d3d1a001
+  data.tar.gz: 066d410b73e733a74b0dea06827f7a64b80b2d87d4d3081caf8456f0b63e3c9ba455ed1fc635440d4ba89c7844fe27e62cc745775ebd95869e66d78250384896

data/History.md

@@ -1,3 +1,37 @@
+## 2.3.0 / 2026-10-21
+
+* Bug fixes:
+  * Do not mutate arguments given to `Rack::Utils.build_multipart`
+    (Oskar Eichler #361)
+  * Rewind `tempfile` if there are errors when appending in
+    `UploadedFile#append_to` (Oskar Eichler #363)
+  * Preserve request method and params for 308 redirects (requires
+    Rack 2+) (Oskar Eichler #364)
+  * Reuse `rack.input` in 307/308 redirect request if it is rewindable,
+    fixing cases that use application/json and other content types
+    (Oskar Eichler #367)
+  * Don't use query string parameters from original request as request
+    body parameters in 307/308 redirects (Jeremy Evans)
+
+* Minor enhancements:
+  * Add `Rack::Test::Session#default_input_content_type` and
+    `#convert_input_hash_to_string` private methods to allow for
+    easier overriding of default behavior. (Haruki Kobayashi #359)
+
+## 2.2.0 / 2024-12-23
+
+* Bug fixes:
+  * `Rack::Test::Cookie` now parses cookie parameters using a
+    case-insensitive approach (Guillaume Malette #349)
+
+* Minor enhancements:
+  * Arrays of cookies containing a blank cookie are now handled
+    correctly when processing responses.  (Martin Emde #343)
+  * `Rack::Test::UploadedFile` no longer uses a finalizer for named
+    paths to close and unlink the created Tempfile.  Tempfile itself
+    uses a finalizer to close and unlink itself, so there is no
+    reason for `Rack::Test::UploadedFile` to do so (Jeremy Evans #338)
+
 ## 2.1.0 / 2023-03-14
 
 * Breaking changes:

data/MIT-LICENSE.txt

@@ -1,5 +1,5 @@
 Copyright (c) 2008-2009 Bryan Helmkamp, Engine Yard Inc.
-Copyright (c) 2022 Jeremy Evans
+Copyright (c) 2022-2026 Jeremy Evans and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -89,6 +89,22 @@ class TestApp < Test::Unit::TestCase
 end
 ```
 
+If your application does not automatically use the `Rack::Lint` middleware in test mode,
+and you want to test that requests to and responses from your application are compliant
+with the Rack specification, you should manually use the `Rack::Lint` middleware:
+
+```ruby
+class TestApp < Test::Unit::TestCase
+  include Rack::Test::Methods
+
+  APP = Rack::Lint.new(YOUR_APP)
+
+  def app
+    APP
+  end
+end
+```
+
 ## Install
 
 To install the latest release as a gem:

data/lib/rack/test/cookie_jar.rb

@@ -12,7 +12,7 @@ module Rack
 
       # The name of the cookie, will be a string
       attr_reader :name
-      
+
       # The value of the cookie, will be a string or nil if there is no value.
       attr_reader :value
 
@@ -28,7 +28,7 @@ module Rack
         @raw, options = raw.split(/[;,] */n, 2)
 
         @name, @value = parse_query(@raw, ';').to_a.first
-        @options = parse_query(options, ';')
+        @options = Hash[parse_query(options, ';').map { |k, v| [k.downcase, v] }]
 
         if domain = @options['domain']
           @exact_domain_match = false
@@ -45,7 +45,7 @@ module Rack
         @options['path'] ||= uri.path.sub(/\/[^\/]*\Z/, '')
       end
 
-      # Wether the given cookie can replace the current cookie in the cookie jar.
+      # Whether the given cookie can replace the current cookie in the cookie jar.
       def replaces?(other)
         [name.downcase, domain, path] == [other.name.downcase, other.domain, other.path]
       end
@@ -69,7 +69,7 @@ module Rack
       # Whether the cookie has the httponly flag, indicating it is not available via
       # a javascript API.
       def http_only?
-        @options.key?('HttpOnly') || @options.key?('httponly')
+        @options.key?('httponly')
       end
 
       # The explicit or implicit path for the cookie.
@@ -93,9 +93,8 @@ module Rack
 
         uri.host = @default_host if uri.host.nil?
 
-        real_domain = domain =~ /^\./ ? domain[1..-1] : domain
         !!((!secure? || (secure? && uri.scheme == 'https')) &&
-          uri.host =~ Regexp.new("#{'^' if @exact_domain_match}#{Regexp.escape(real_domain)}$", Regexp::IGNORECASE))
+          uri.host =~ Regexp.new("#{'^' if @exact_domain_match}#{Regexp.escape(domain)}$", Regexp::IGNORECASE))
       end
 
       # Cookies that do not match the URI will not be sent in requests to the URI.
@@ -110,11 +109,13 @@ module Rack
 
       # A hash of cookie options, including the cookie value, but excluding the cookie name.
       def to_h
-        @options.merge(
+        hash = @options.merge(
           'value'    => @value,
           'HttpOnly' => http_only?,
           'secure'   => secure?
         )
+        hash.delete('httponly')
+        hash
       end
       alias to_hash to_h
 
@@ -183,12 +184,10 @@ module Rack
       def merge(raw_cookies, uri = nil)
         return unless raw_cookies
 
-        if raw_cookies.is_a? String
-          raw_cookies = raw_cookies.split("\n")
-          raw_cookies.reject!(&:empty?)
-        end
+        raw_cookies = raw_cookies.split("\n") if raw_cookies.is_a? String
 
         raw_cookies.each do |raw_cookie|
+          next if raw_cookie.empty?
           cookie = Cookie.new(raw_cookie, uri, @default_host)
           self << cookie if cookie.valid?(uri)
         end

data/lib/rack/test/uploaded_file.rb

@@ -50,6 +50,7 @@ module Rack
 
       # Delegate all methods not handled to the tempfile.
       def method_missing(method_name, *args, &block)
+        # TODO: After Ruby <2.7.3 support is dropped, switch to ...
         tempfile.public_send(method_name, *args, &block)
       end
 
@@ -60,30 +61,19 @@ module Rack
       def append_to(buffer)
         tempfile.rewind
 
-        buf = String.new
-        buffer << tempfile.readpartial(65_536, buf) until tempfile.eof?
-
-        tempfile.rewind
-
-        nil
+        begin
+          buf = String.new
+          buffer << tempfile.readpartial(65_536, buf) until tempfile.eof?
+          nil
+        ensure
+          tempfile.rewind
+        end
       end
 
       def respond_to_missing?(method_name, include_private = false) #:nodoc:
         tempfile.respond_to?(method_name, include_private) || super
       end
 
-      # A proc that can be used as a finalizer to close and unlink the tempfile.
-      def self.finalize(file)
-        proc { actually_finalize file }
-      end
-
-      # Close and unlink the given file, used as a finalizer for the tempfile,
-      # if the tempfile is backed by a file in the filesystem.
-      def self.actually_finalize(file)
-        file.close
-        file.unlink
-      end
-
       private
 
       # Use the StringIO as the tempfile.
@@ -104,8 +94,6 @@ module Rack
         @tempfile = Tempfile.new([::File.basename(@original_filename, extension), extension])
         @tempfile.set_encoding(Encoding::BINARY)
 
-        ObjectSpace.define_finalizer(self, self.class.finalize(@tempfile))
-
         FileUtils.copy_file(path, @tempfile.path)
       end
     end

data/lib/rack/test/utils.rb

@@ -6,9 +6,16 @@ module Rack
       include Rack::Utils
       extend self
 
+      class << self
+        attr_accessor :override_build_nested_query
+      end
+      self.override_build_nested_query = false
+
       # Build a query string for the given value and prefix. The value
       # can be an array or hash of parameters.
       def build_nested_query(value, prefix = nil)
+        return super if Rack::Test::Utils.override_build_nested_query
+
         case value
         when Array
           if value.empty?
@@ -67,16 +74,10 @@ module Rack
 
           case value
           when Array
-            value.map do |v|
-              if v.is_a?(Hash)
-                nested_params = {}
-                normalize_multipart_params(v).each do |subkey, subvalue|
-                  nested_params[subkey] = subvalue
-                end
-                (flattened_params["#{k}[]"] ||= []) << nested_params
-              else
-                flattened_params["#{k}[]"] = value
-              end
+            next if value.empty?
+
+            flattened_params["#{k}[]"] = value.map do |v|
+              v.is_a?(Hash) ? normalize_multipart_params(v) : v
             end
           when Hash
             normalize_multipart_params(value).each do |subkey, subvalue|
@@ -98,15 +99,19 @@ module Rack
 
       # Append each multipart parameter value to the buffer.
       def _build_parts(buffer, parameters)
-        parameters.map do |name, value|
-          if name =~ /\[\]\Z/ && value.is_a?(Array) && value.all? { |v| v.is_a?(Hash) }
-            value.each do |hash|
+        parameters.each do |name, value|
+          if name =~ /\[\]\z/ && value.is_a?(Array) && value.any? { |v| v.is_a?(Hash) }
+            value.each do |item|
               new_value = {}
-              hash.each { |k, v| new_value[name + k] = v }
+              if item.is_a?(Hash)
+                item.each { |k, v| new_value[name + k] = v }
+              else
+                new_value[name] = item
+              end
               _build_parts(buffer, new_value)
             end
           else
-            [value].flatten.map do |v|
+            [value].flatten.each do |v|
               if v.respond_to?(:original_filename)
                 build_file_part(buffer, name, v)
               else

data/lib/rack/test/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module Test
-    VERSION = '2.1.0'.freeze
+    VERSION = '2.3.0'.freeze
   end
 end

data/lib/rack/test.rb

@@ -2,7 +2,7 @@
 
 require 'uri'
 
-# :nocov:
+# simplecov:disable
 begin
   require "rack/version"
 rescue LoadError
@@ -16,7 +16,7 @@ else
     require "rack"
   end
 end
-# :nocov:
+# simplecov:enable
 
 require 'forwardable'
 
@@ -211,12 +211,29 @@ module Rack
           raise Error, 'Last response was not a redirect. Cannot follow_redirect!'
         end
 
-        if last_response.status == 307
+        env = {
+          'HTTP_REFERER' => last_request.url,
+          'rack.session' => last_request.session,
+          'rack.session.options' => last_request.session_options
+        }
+
+        params = {}
+        case last_response.status
+        when 307, 308
           request_method = last_request.request_method
-          params = last_request.params
+          if (input = last_request.body)
+            if input.respond_to?(:rewind)
+              input.rewind
+              env[:input] = input
+              %w[CONTENT_TYPE CONTENT_LENGTH].each do |key|
+                env[key] = last_request.env[key] if last_request.env.key?(key)
+              end
+            else
+              params = last_request.POST
+            end
+          end
         else
           request_method = 'GET'
-          params = {}
         end
 
         # Compute the next location by appending the location header with the
@@ -228,9 +245,7 @@ module Rack
           request_method,
           next_location.to_s,
           params,
-          'HTTP_REFERER' => last_request.url,
-          'rack.session' => last_request.session,
-          'rack.session.options' => last_request.session_options
+          env
         )
       end
 
@@ -255,12 +270,12 @@ module Rack
 
       private
 
-      # :nocov:
+      # simplecov:disable
       if !defined?(Rack::RELEASE) || Gem::Version.new(Rack::RELEASE) < Gem::Version.new('2.2.2')
         def close_body(body)
           body.close if body.respond_to?(:close)
         end
-      # :nocov:
+      # simplecov:enable
       else
         # close() gets called automatically in newer Rack versions.
         def close_body(body)
@@ -281,11 +296,11 @@ module Rack
         'REMOTE_ADDR' => '127.0.0.1',
         'SERVER_PROTOCOL' => 'HTTP/1.0',
       }
-      # :nocov:
+      # simplecov:disable
       unless Rack.release >= '2.3'
         DEFAULT_ENV['HTTP_VERSION'] = DEFAULT_ENV['SERVER_PROTOCOL']
       end
-      # :nocov:
+      # simplecov:enable
       DEFAULT_ENV.freeze
       private_constant :DEFAULT_ENV
 
@@ -307,7 +322,7 @@ module Rack
             append_query_params(query_array, params)
           end
         elsif !env.key?(:input)
-          env['CONTENT_TYPE'] ||= 'application/x-www-form-urlencoded'
+          env['CONTENT_TYPE'] ||= default_input_content_type
           params ||= {}
           multipart = env.has_key?(:multipart) ? env.delete(:multipart) : env['CONTENT_TYPE'].start_with?('multipart/')
 
@@ -317,7 +332,7 @@ module Rack
               env['CONTENT_LENGTH'] ||= data.length.to_s
               env['CONTENT_TYPE'] = "#{multipart_content_type(env)}; boundary=#{MULTIPART_BOUNDARY}"
             else
-              env[:input] = build_nested_query(params)
+              env[:input] = convert_input_hash_to_string(params)
             end
           else
             env[:input] = params
@@ -369,6 +384,16 @@ module Rack
 
         @last_response
       end
+
+      # Return the default content type to use when none is given.
+      def default_input_content_type
+        'application/x-www-form-urlencoded'
+      end
+
+      # Convert the given params hash into a request body string.
+      def convert_input_hash_to_string(value, prefix = nil)
+        build_nested_query(value, prefix)
+      end
     end
 
     # Whether the version of rack in use handles encodings.

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-test
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Jeremy Evans
 - Bryan Helmkamp
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-14 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -95,7 +94,6 @@ metadata:
   bug_tracker_uri: https://github.com/rack/rack-test/issues
   mailing_list_uri: https://github.com/rack/rack-test/discussions
   changelog_uri: https://github.com/rack/rack-test/blob/main/History.md
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -110,8 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
-signing_key:
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Simple testing API built on Rack
 test_files: []