rack-test 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c4264ddd984ab1b662efcc68423ca74bc65927f4751cc8ac68a0f1cfe94375c
-  data.tar.gz: 7f4af2a9203533fae754b99db4e577cae6be7170fab447a238a2f266a8183e1b
+  metadata.gz: 98bb9656717c512790c5f65b20a8f0cfc7c2f14e4d9d98d5069e6e5910b256e5
+  data.tar.gz: 6305cac1636eef820a082a1431cef2bc24b445b1f902b65c550f976ba84f08e6
 SHA512:
-  metadata.gz: 7b4986db539c73a5776e15941a7393b14ebb31afe79068756c2b561211907e013b66a1a7a9980864431b029b71ec0c8180e2dbfe7b4942987ca6d59f01877cb5
-  data.tar.gz: f1c7d0733a7ed4d64e0a9ad51c753485c0472233667181c6fbf2ba09be40936de9a411558be90a49ef9aa5e4804c44dfc3d5c90deda05a22286916e6c7d16e90
+  metadata.gz: 420e60a08ec2fa5fd92a358d28c0b17e0a943eb30962756360185091753bdd4eb55b7b58005aa84bb1907cfb7e8129166d1aed6282596f45b8b0f42dd1003306
+  data.tar.gz: b7446d71bf41a0f69b9812e867f7b472488ee0534d6206435b77e8266617486687044a814dd6c085003b823e0e349c83b1ca47ea296f1f23346957d66cbed0bc

data/History.md

@@ -1,3 +1,29 @@
+## 2.1.0 / 2023-03-14
+
+* Breaking changes:
+  * Digest authentication support, deprecated in 2.0.0, has been
+    removed (Jeremy Evans #307)
+  * requiring rack/mock_session, deprecated in 2.0.0, has been removed
+    (Jeremy Evans #307)
+
+* Minor enhancements:
+  * The `original_filename` for `Rack::Test::UploadedFile` can now be
+    set even if the content of the file comes from a file path
+    (Stuart Chinery #314)
+  * Add `Rack::Test::Session#restore_state`, for executing a block
+    and restoring current state (last request, last response, and
+    cookies) after the block (Jeremy Evans #316)
+  * Make `Rack::Test::Methods` support `default_host` method similar to
+    `app`, which will set the default host used for requests to the app
+    (Jeremy Evans #317 #318)
+  * Allow responses to set cookie paths not matching the current
+    request URI. Such cookies will only be sent for paths matching
+    the cookie path (Chris Waters #322)
+  * Ignore leading dot for cookie domains, per RFC 6265 (Stephen Crosby
+    #329)
+  * Avoid creating empty multipart body if params is empty in
+    `Rack::Test::Session#env_for` (Ryunosuke Sato #331)
+
 ## 2.0.2 / 2022-06-28
 
 * Bug fixes:

data/README.md

@@ -41,7 +41,7 @@ class HomepageTest < Test::Unit::TestCase
     get '/'
 
     assert last_response.ok?
-    assert_equal last_response.body, 'All responses are OK'
+    assert_equal 'All responses are OK', last_response.body
   end
 
   def delete_with_url_params_and_body

data/lib/rack/test/cookie_jar.rb

@@ -30,8 +30,9 @@ module Rack
         @name, @value = parse_query(@raw, ';').to_a.first
         @options = parse_query(options, ';')
 
-        if @options['domain']
+        if domain = @options['domain']
           @exact_domain_match = false
+          domain[0] = '' if domain[0] == '.'
         else
           # If the domain attribute is not present in the cookie,
           # the domain must match exactly.
@@ -94,13 +95,12 @@ module Rack
 
         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.path =~ Regexp.new("^#{Regexp.escape(path)}"))
+          uri.host =~ Regexp.new("#{'^' if @exact_domain_match}#{Regexp.escape(real_domain)}$", Regexp::IGNORECASE))
       end
 
       # Cookies that do not match the URI will not be sent in requests to the URI.
       def matches?(uri)
-        !expired? && valid?(uri)
+        !expired? && valid?(uri) && uri.path.start_with?(path)
       end
 
       # Order cookies by name, path, and domain.
@@ -138,6 +138,12 @@ module Rack
         @cookies = cookies.sort!
       end
 
+      # Ensure the copy uses a distinct cookies array.
+      def initialize_copy(other)
+        super
+        @cookies = @cookies.dup
+      end
+
       # Return the value for first cookie with the given name, or nil
       # if no such cookie exists.
       def [](name)

data/lib/rack/test/methods.rb

@@ -42,7 +42,11 @@ module Rack
           # Backwards compatibility for capybara
           build_rack_mock_session
         else
-          Session.new(app)
+          if respond_to?(:default_host)
+            Session.new(app, default_host)
+          else
+            Session.new(app)
+          end
         end
       end
 
@@ -61,11 +65,6 @@ module Rack
         @_rack_test_current_session = session
       end
 
-      def digest_authorize(username, password) # :nodoc:
-        warn 'digest authentication support will be removed in rack-test 2.1', uplevel: 1
-        current_session._digest_authorize(username, password)
-      end
-
       def_delegators(:current_session,
         :request,
         :get,

data/lib/rack/test/uploaded_file.rb

@@ -27,16 +27,18 @@ module Rack
       # content :: is a path to a file, or an {IO} or {StringIO} object representing the content.
       # content_type :: MIME type of the file
       # binary :: Whether the file should be set to binmode (content treated as binary).
-      # original_filename :: The filename to use for the file if +content+ is a StringIO.
+      # original_filename :: The filename to use for the file. Required if content is StringIO, optional override if not
       def initialize(content, content_type = 'text/plain', binary = false, original_filename: nil)
+        @content_type = content_type
+        @original_filename = original_filename
+
         case content
         when StringIO
-          initialize_from_stringio(content, original_filename)
+          initialize_from_stringio(content)
         else
           initialize_from_file_path(content)
         end
 
-        @content_type = content_type
         @tempfile.binmode if binary
       end
 
@@ -85,16 +87,18 @@ module Rack
       private
 
       # Use the StringIO as the tempfile.
-      def initialize_from_stringio(stringio, original_filename)
+      def initialize_from_stringio(stringio)
+        raise(ArgumentError, 'Missing `original_filename` for StringIO object') unless @original_filename
+
         @tempfile = stringio
-        @original_filename = original_filename || raise(ArgumentError, 'Missing `original_filename` for StringIO object')
       end
 
-      # Create a tempfile and copy the content from the given path into the tempfile.
+      # Create a tempfile and copy the content from the given path into the tempfile, optionally renaming if
+      # original_filename has been set.
       def initialize_from_file_path(path)
         raise "#{path} file does not exist" unless ::File.exist?(path)
 
-        @original_filename = ::File.basename(path)
+        @original_filename ||= ::File.basename(path)
         extension = ::File.extname(@original_filename)
 
         @tempfile = Tempfile.new([::File.basename(@original_filename, extension), extension])

data/lib/rack/test/version.rb

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

data/lib/rack/test.rb

@@ -98,8 +98,6 @@ module Rack
       # If a block is given, #last_response is also yielded to the block.
       def initialize(app, default_host = DEFAULT_HOST)
         @env = {}
-        @digest_username = nil
-        @digest_password = nil
         @app = app
         @after_request = []
         @default_host = default_host
@@ -204,21 +202,6 @@ module Rack
 
       alias authorize basic_authorize
 
-      # Set the username and password for HTTP Digest authorization, to be
-      # included in subsequent requests in the HTTP_AUTHORIZATION header.
-      # This method is deprecated and will be removed in rack-test 2.1
-      #
-      # Example:
-      #   digest_authorize "bryan", "secret"
-      def digest_authorize(username, password)
-        warn 'digest authentication support will be removed in rack-test 2.1', uplevel: 1
-        _digest_authorize(username, password)
-      end
-      def _digest_authorize(username, password) # :nodoc:
-        @digest_username = username
-        @digest_password = password
-      end
-
       # Rack::Test will not follow any redirects automatically. This method
       # will follow the redirect returned (including setting the Referer header
       # on the new request) in the last response. If the last response was not
@@ -251,6 +234,25 @@ module Rack
         )
       end
 
+      # Yield to the block, and restore the last request, last response, and
+      # cookie jar to the state they were prior to block execution upon
+      # exiting the block.
+      def restore_state
+        request = @last_request
+        response = @last_response
+        cookie_jar = @cookie_jar.dup
+        after_request = @after_request.dup
+
+        begin
+          yield
+        ensure
+          @last_request = request
+          @last_response = response
+          @cookie_jar = cookie_jar
+          @after_request = after_request
+        end
+      end
+
       private
 
       # :nocov:
@@ -310,7 +312,7 @@ module Rack
           multipart = env.has_key?(:multipart) ? env.delete(:multipart) : env['CONTENT_TYPE'].start_with?('multipart/')
 
           if params.is_a?(Hash)
-            if data = build_multipart(params, false, multipart)
+            if !params.empty? && data = build_multipart(params, false, multipart)
               env[:input] = data
               env['CONTENT_LENGTH'] ||= data.length.to_s
               env['CONTENT_TYPE'] = "#{multipart_content_type(env)}; boundary=#{MULTIPART_BOUNDARY}"
@@ -363,43 +365,9 @@ module Rack
         @after_request.each(&:call)
         @last_response.finish
 
-        if retry_with_digest_auth?(env)
-          auth_env = env.merge('HTTP_AUTHORIZATION' => digest_auth_header,
-                               'rack-test.digest_auth_retry' => true)
-          auth_env.delete('rack.request')
-          process_request(uri, auth_env)
-        else
-          yield last_response if block_given?
-
-          last_response
-        end
-      end
-
-      def digest_auth_header
-        require_relative 'test/mock_digest_request'
-
-        challenge = last_response['WWW-Authenticate'].split(' ', 2).last
-        params = Rack::Auth::Digest::Params.parse(challenge)
-
-        params.merge!('username' => @digest_username,
-                      'nc'        => '00000001',
-                      'cnonce'    => 'nonsensenonce',
-                      'uri'       => last_request.fullpath,
-                      'method'    => last_request.env['REQUEST_METHOD'])
-
-        params['response'] = MockDigestRequest_.new(params).response(@digest_password)
+        yield @last_response if block_given?
 
-        "Digest #{params}"
-      end
-
-      def retry_with_digest_auth?(env)
-        last_response.status == 401 &&
-          digest_auth_configured? &&
-          !env['rack-test.digest_auth_retry']
-      end
-
-      def digest_auth_configured?
-        @digest_username
+        @last_response
       end
     end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rack-test
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Jeremy Evans
 - Bryan Helmkamp
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-28 00:00:00.000000000 Z
+date: 2023-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -81,11 +81,9 @@ files:
 - History.md
 - MIT-LICENSE.txt
 - README.md
-- lib/rack/mock_session.rb
 - lib/rack/test.rb
 - lib/rack/test/cookie_jar.rb
 - lib/rack/test/methods.rb
-- lib/rack/test/mock_digest_request.rb
 - lib/rack/test/uploaded_file.rb
 - lib/rack/test/utils.rb
 - lib/rack/test/version.rb
@@ -97,7 +95,7 @@ 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: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -112,8 +110,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key: 
+rubygems_version: 3.4.6
+signing_key:
 specification_version: 4
 summary: Simple testing API built on Rack
 test_files: []

data/lib/rack/mock_session.rb

@@ -1,2 +0,0 @@
-warn("requiring rack/mock_session is deprecated, require rack/test and use Rack::Test::Session", uplevel: 1)
-require_relative 'test'

data/lib/rack/test/mock_digest_request.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-# :nocov:
-require 'rack/auth/digest' unless defined?(Rack::Auth::Digest)
-# :nocov:
-
-module Rack
-  module Test
-    class MockDigestRequest_ # :nodoc:
-      def initialize(params)
-        @params = params
-      end
-
-      def method_missing(sym)
-        if @params.key? k = sym.to_s
-          return @params[k]
-        end
-
-        super
-      end
-
-      def method
-        @params['method']
-      end
-
-      def response(password)
-        Rack::Auth::Digest::MD5.new(nil).send :digest, self, password
-      end
-    end
-    MockDigestRequest = MockDigestRequest_
-    # :nocov:
-    deprecate_constant :MockDigestRequest if respond_to?(:deprecate_constant, true)
-    # :nocov:
-  end
-end