rack-test 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a276395f953e48d223d387a9ca830fec7bc17f4
-  data.tar.gz: 75368392e7c13919d3073d9b69fb5c0e3c271b10
+  metadata.gz: 1c2c9dca5557f9f1d5894f9379e38e660698a178
+  data.tar.gz: aabbb52783cc359935090e319d462076cc0ce95c
 SHA512:
-  metadata.gz: 874eb9d53b22b2842d9659144acdc4bf222cb18474f4d8b496292e3209bf53d2564a2fcef5d9541dc81a825780766d48da46a1a7643ac8f04807fc41094bba11
-  data.tar.gz: 17b51e137c7bc2e2b59276bdaf90781dc6a701f082cd17b8faccbc179668c05914e34025474134ab87bd4e5a1c42821a07e0193665444062cfd77a6b24492e7a
+  metadata.gz: ed423ebaf4bbdb79a77804f3ed9314f88b5b9e97e9a0eeee0d596c43718bac918f62d4cfd8c1adaa72a0e8fce28f093f5bb7bc3268eec5025c6e47b7ce2556b9
+  data.tar.gz: a4ef34a8cb3e12bc432012444485af04c50c2780ec658ead424c337dbd3ecd3805a957065bb804b2b1dd73d495819094dfb018c0784cd9766a4f1be6110d7815

data/History.md

@@ -1,3 +1,20 @@
+## 0.8.0 / 2017-11-20
+
+* Minor enhancements
+  * Add a required_ruby_version of >= 2.2.2, similar to rack 2.0.1.
+    (Samuel Giddins #194)
+  * Remove new line from basic auth. (Felix Kleinschmidt #185)
+  * Rubocop fixes (Per Lundberg #196)
+  * Add how to install rack-test from github to README. (Jun Aruga #189)
+  * Update CodeClimate badges (Toshimaru #195)
+  * Add the ability to create Test::UploadedFile instances without
+    the file system (Adam Milligan #149)
+  * Add custom_request, remove duplication (Johannes Barre #184)
+  * README.md: Added note about how to post JSON (Per Lundberg #198)
+  * README.md: Added version badge (Per Lundberg #199)
+* Bug fixes
+  * Bugfix for Cookies with multiple paths (Kyle Welsby #197)
+
 ## 0.7.0 / 2017-07-10
 
 * Major enhancements

data/README.md

@@ -1,7 +1,8 @@
 # Rack::Test
+[![Gem Version](https://badge.fury.io/rb/rack-test.svg)](https://badge.fury.io/rb/rack-test)
 [<img src="https://travis-ci.org/rack-test/rack-test.svg?branch=master" />](https://travis-ci.org/rack-test/rack-test)
-[<img src="https://codeclimate.com/github/rack-test/rack-test.png" />](https://codeclimate.com/github/rack-test/rack-test)
-[<img src="https://codeclimate.com/github/rack-test/rack-test/coverage.png" />](https://codeclimate.com/github/rack-test/rack-test)
+[![Code Climate](https://codeclimate.com/github/codeclimate/codeclimate/badges/gpa.svg)](https://codeclimate.com/github/codeclimate/codeclimate)
+[![Test Coverage](https://codeclimate.com/github/codeclimate/codeclimate/badges/coverage.svg)](https://codeclimate.com/github/codeclimate/codeclimate/coverage)
 
 Code: https://github.com/rack-test/rack-test
 
@@ -18,7 +19,18 @@ to build on.
 * Set request headers to be used by all subsequent requests
 * Small footprint. Approximately 200 LOC
 
+## Supported platforms
+
+* 2.2.2+
+* 2.3
+* 2.4
+* JRuby 9.1.+
+
+If you are using Ruby 1.8, 1.9 or JRuby 1.7, use rack-test 0.6.3.
+
 ## Examples
+(The examples use `Test::Unit` but it's equally possible to use `rack-test` with other testing frameworks like `rspec`.)
+
 ```ruby
 require "test/unit"
 require "rack/test"
@@ -33,25 +45,32 @@ class HomepageTest < Test::Unit::TestCase
   end
 
   def test_response_is_ok
-    get "/"
+    get '/'
 
     assert last_response.ok?
-    assert_equal last_response.body, "All responses are OK"
+    assert_equal last_response.body, 'All responses are OK'
   end
-  
+
   def set_request_headers
     headers 'Accept-Charset', 'utf-8'
-    get "/"
+    get '/'
 
     assert last_response.ok?
-    assert_equal last_response.body, "All responses are OK"
+    assert_equal last_response.body, 'All responses are OK'
   end
 
   def test_response_is_ok_for_other_paths
-    get "/other_paths"
+    get '/other_paths'
 
     assert last_response.ok?
-    assert_equal last_response.body, "All responses are OK"
+    assert_equal last_response.body, 'All responses are OK'
+  end
+  
+  def post_with_json
+    # No assertion in this, we just demonstrate how you can post a JSON-encoded string.
+    # By default, Rack::Test will use HTTP form encoding if you pass in a Hash as the
+    # parameters, so make sure that `json` below is already a JSON-serialized string.
+    post(uri, json, { 'CONTENT_TYPE' => 'application/json' })
   end
 end
 ```
@@ -80,11 +99,21 @@ end
 
 To install the latest release as a gem:
 
-`gem install rack-test`
+```
+gem install rack-test
+```
 
 Or via Bundler:
 
-`gem "rack-test", require: "rack/test"`
+```
+gem 'rack-test', require: 'rack/test'
+```
+
+Or to install unreleased version via Bundler:
+
+```
+gem 'rack-test', github: 'rack-test', branch: 'master'
+```
 
 ## Authors
 

data/lib/rack/mock_session.rb

@@ -1,5 +1,4 @@
 module Rack
-
   class MockSession # :nodoc:
     attr_writer :cookie_jar
     attr_reader :default_host
@@ -25,16 +24,16 @@ module Rack
     end
 
     def request(uri, env)
-      env["HTTP_COOKIE"] ||= cookie_jar.for(uri)
+      env['HTTP_COOKIE'] ||= cookie_jar.for(uri)
       @last_request = Rack::Request.new(env)
       status, headers, body = @app.call(@last_request.env)
 
-      @last_response = MockResponse.new(status, headers, body, env["rack.errors"].flush)
+      @last_response = MockResponse.new(status, headers, body, env['rack.errors'].flush)
       body.close if body.respond_to?(:close)
 
-      cookie_jar.merge(last_response.headers["Set-Cookie"], uri)
+      cookie_jar.merge(last_response.headers['Set-Cookie'], uri)
 
-      @after_request.each { |hook| hook.call }
+      @after_request.each(&:call)
 
       if @last_response.respond_to?(:finish)
         @last_response.finish
@@ -46,21 +45,19 @@ module Rack
     # Return the last request issued in the session. Raises an error if no
     # requests have been sent yet.
     def last_request
-      raise Rack::Test::Error.new("No request yet. Request a page first.") unless @last_request
+      raise Rack::Test::Error, 'No request yet. Request a page first.' unless @last_request
       @last_request
     end
 
     # Return the last response received in the session. Raises an error if
     # no requests have been sent yet.
     def last_response
-      raise Rack::Test::Error.new("No response yet. Request a page first.") unless @last_response
+      raise Rack::Test::Error, 'No response yet. Request a page first.' unless @last_response
       @last_response
     end
 
     def cookie_jar
       @cookie_jar ||= Rack::Test::CookieJar.new([], @default_host)
     end
-
   end
-
 end

data/lib/rack/test.rb

@@ -1,17 +1,17 @@
-require "uri"
-require "rack"
-require "rack/mock_session"
-require "rack/test/cookie_jar"
-require "rack/test/mock_digest_request"
-require "rack/test/utils"
-require "rack/test/methods"
-require "rack/test/uploaded_file"
-require "rack/test/version"
+require 'uri'
+require 'rack'
+require 'rack/mock_session'
+require 'rack/test/cookie_jar'
+require 'rack/test/mock_digest_request'
+require 'rack/test/utils'
+require 'rack/test/methods'
+require 'rack/test/uploaded_file'
+require 'rack/test/version'
 
 module Rack
   module Test
-    DEFAULT_HOST = "example.org"
-    MULTIPART_BOUNDARY = "----------XnJLe9ZIbbGUYtzPQJ16u1"
+    DEFAULT_HOST = 'example.org'.freeze
+    MULTIPART_BOUNDARY = '----------XnJLe9ZIbbGUYtzPQJ16u1'.freeze
 
     # The common base class for exceptions raised by Rack::Test
     class Error < StandardError; end
@@ -38,10 +38,10 @@ module Rack
         @digest_username = nil
         @digest_password = nil
 
-        if mock_session.is_a?(MockSession)
-          @rack_mock_session = mock_session
+        @rack_mock_session = if mock_session.is_a?(MockSession)
+          mock_session
         else
-          @rack_mock_session = MockSession.new(mock_session)
+          MockSession.new(mock_session)
         end
 
         @default_host = @rack_mock_session.default_host
@@ -55,8 +55,7 @@ module Rack
       # Example:
       #   get "/"
       def get(uri, params = {}, env = {}, &block)
-        env = env_for(uri, env.merge(:method => "GET", :params => params))
-        process_request(uri, env, &block)
+        custom_request('GET', uri, params, env, &block)
       end
 
       # Issue a POST request for the given URI. See #get
@@ -64,8 +63,7 @@ module Rack
       # Example:
       #   post "/signup", "name" => "Bryan"
       def post(uri, params = {}, env = {}, &block)
-        env = env_for(uri, env.merge(:method => "POST", :params => params))
-        process_request(uri, env, &block)
+        custom_request('POST', uri, params, env, &block)
       end
 
       # Issue a PUT request for the given URI. See #get
@@ -73,8 +71,7 @@ module Rack
       # Example:
       #   put "/"
       def put(uri, params = {}, env = {}, &block)
-        env = env_for(uri, env.merge(:method => "PUT", :params => params))
-        process_request(uri, env, &block)
+        custom_request('PUT', uri, params, env, &block)
       end
 
       # Issue a PATCH request for the given URI. See #get
@@ -82,8 +79,7 @@ module Rack
       # Example:
       #   patch "/"
       def patch(uri, params = {}, env = {}, &block)
-        env = env_for(uri, env.merge(:method => "PATCH", :params => params))
-        process_request(uri, env, &block)
+        custom_request('PATCH', uri, params, env, &block)
       end
 
       # Issue a DELETE request for the given URI. See #get
@@ -91,8 +87,7 @@ module Rack
       # Example:
       #   delete "/"
       def delete(uri, params = {}, env = {}, &block)
-        env = env_for(uri, env.merge(:method => "DELETE", :params => params))
-        process_request(uri, env, &block)
+        custom_request('DELETE', uri, params, env, &block)
       end
 
       # Issue an OPTIONS request for the given URI. See #get
@@ -100,8 +95,7 @@ module Rack
       # Example:
       #   options "/"
       def options(uri, params = {}, env = {}, &block)
-        env = env_for(uri, env.merge(:method => "OPTIONS", :params => params))
-        process_request(uri, env, &block)
+        custom_request('OPTIONS', uri, params, env, &block)
       end
 
       # Issue a HEAD request for the given URI. See #get
@@ -109,8 +103,7 @@ module Rack
       # Example:
       #   head "/"
       def head(uri, params = {}, env = {}, &block)
-        env = env_for(uri, env.merge(:method => "HEAD", :params => params))
-        process_request(uri, env, &block)
+        custom_request('HEAD', uri, params, env, &block)
       end
 
       # Issue a request to the Rack app for the given URI and optional Rack
@@ -121,10 +114,21 @@ module Rack
       # Example:
       #   request "/"
       def request(uri, env = {}, &block)
+        uri = parse_uri(uri, env)
         env = env_for(uri, env)
         process_request(uri, env, &block)
       end
 
+      # Issue a request using the given verb for the given URI. See #get
+      #
+      # Example:
+      #   custom_request "LINK", "/"
+      def custom_request(verb, uri, params = {}, env = {}, &block)
+        uri = parse_uri(uri, env)
+        env = env_for(uri, env.merge(method: verb.to_s.upcase, params: params))
+        process_request(uri, env, &block)
+      end
+
       # Set a header to be included on all subsequent requests through the
       # session. Use a value of nil to remove a previously configured header.
       #
@@ -160,11 +164,11 @@ module Rack
       # Example:
       #   basic_authorize "bryan", "secret"
       def basic_authorize(username, password)
-        encoded_login = ["#{username}:#{password}"].pack("m*")
+        encoded_login = ["#{username}:#{password}"].pack('m0')
         header('Authorization', "Basic #{encoded_login}")
       end
 
-      alias_method :authorize, :basic_authorize
+      alias authorize basic_authorize
 
       # Set the username and password for HTTP Digest authorization, to be
       # included in subsequent requests in the HTTP_AUTHORIZATION header.
@@ -182,48 +186,52 @@ module Rack
       # a redirect, an error will be raised.
       def follow_redirect!
         unless last_response.redirect?
-          raise Error.new("Last response was not a redirect. Cannot follow_redirect!")
+          raise Error, 'Last response was not a redirect. Cannot follow_redirect!'
         end
         if last_response.status == 307
-          send(last_request.request_method.downcase.to_sym, last_response["Location"], last_request.params, { "HTTP_REFERER" => last_request.url })
+          send(last_request.request_method.downcase.to_sym, last_response['Location'], last_request.params, 'HTTP_REFERER' => last_request.url)
         else
-          get(last_response["Location"], {}, { "HTTP_REFERER" => last_request.url })
+          get(last_response['Location'], {}, 'HTTP_REFERER' => last_request.url)
         end
       end
 
-    private
+      private
 
-      def env_for(path, env)
-        uri = URI.parse(path)
-        uri.path = "/#{uri.path}" unless uri.path[0] == ?/
-        uri.host ||= @default_host
+      def parse_uri(path, env)
+        URI.parse(path).tap do |uri|
+          uri.path = "/#{uri.path}" unless uri.path[0] == '/'
+          uri.host ||= @default_host
+          uri.scheme ||= 'https' if env['HTTPS'] == 'on'
+        end
+      end
 
+      def env_for(uri, env)
         env = default_env.merge(env)
 
-        env["HTTP_HOST"] ||= [uri.host, (uri.port if uri.port != uri.default_port)].compact.join(":")
+        env['HTTP_HOST'] ||= [uri.host, (uri.port if uri.port != uri.default_port)].compact.join(':')
 
-        env.update("HTTPS" => "on") if URI::HTTPS === uri
-        env["HTTP_X_REQUESTED_WITH"] = "XMLHttpRequest" if env[:xhr]
+        env.update('HTTPS' => 'on') if URI::HTTPS === uri
+        env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest' if env[:xhr]
 
         # TODO: Remove this after Rack 1.1 has been released.
         # Stringifying and upcasing methods has be commit upstream
-        env["REQUEST_METHOD"] ||= env[:method] ? env[:method].to_s.upcase : "GET"
+        env['REQUEST_METHOD'] ||= env[:method] ? env[:method].to_s.upcase : 'GET'
 
-        if ["GET", "DELETE"].include?(env["REQUEST_METHOD"])
+        if %w[GET DELETE].include?(env['REQUEST_METHOD'])
           # merge :params with the query string
           if params = env[:params]
             params = parse_nested_query(params) if params.is_a?(String)
 
-            uri.query = [uri.query, build_nested_query(params)].compact.reject { |v| v == '' }.join("&")
+            uri.query = [uri.query, build_nested_query(params)].compact.reject { |v| v == '' }.join('&')
           end
-        elsif !env.has_key?(:input)
-          env["CONTENT_TYPE"] ||= "application/x-www-form-urlencoded"
+        elsif !env.key?(:input)
+          env['CONTENT_TYPE'] ||= 'application/x-www-form-urlencoded'
 
           if env[:params].is_a?(Hash)
             if data = build_multipart(env[:params])
               env[:input] = data
-              env["CONTENT_LENGTH"] ||= data.length.to_s
-              env["CONTENT_TYPE"] = "multipart/form-data; boundary=#{MULTIPART_BOUNDARY}"
+              env['CONTENT_LENGTH'] ||= data.length.to_s
+              env['CONTENT_TYPE'] = "multipart/form-data; boundary=#{MULTIPART_BOUNDARY}"
             else
               env[:input] = params_to_string(env[:params])
             end
@@ -234,25 +242,17 @@ module Rack
 
         env.delete(:params)
 
-        if env.has_key?(:cookie)
-          set_cookie(env.delete(:cookie), uri)
-        end
+        set_cookie(env.delete(:cookie), uri) if env.key?(:cookie)
 
         Rack::MockRequest.env_for(uri.to_s, env)
       end
 
       def process_request(uri, env)
-        uri = URI.parse(uri)
-        uri.host ||= @default_host
-        uri.scheme ||= "https" if env["HTTPS"] == "on"
-
         @rack_mock_session.request(uri, env)
 
         if retry_with_digest_auth?(env)
-          auth_env = env.merge({
-            "HTTP_AUTHORIZATION"          => digest_auth_header,
-            "rack-test.digest_auth_retry" => true
-          })
+          auth_env = env.merge('HTTP_AUTHORIZATION' => digest_auth_header,
+                               'rack-test.digest_auth_retry' => true)
           auth_env.delete('rack.request')
           process_request(uri.path, auth_env)
         else
@@ -263,26 +263,24 @@ module Rack
       end
 
       def digest_auth_header
-        challenge = last_response["WWW-Authenticate"].split(" ", 2).last
+        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.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)
+        params['response'] = MockDigestRequest.new(params).response(@digest_password)
 
         "Digest #{params}"
       end
 
       def retry_with_digest_auth?(env)
         last_response.status == 401 &&
-        digest_auth_configured? &&
-        !env["rack-test.digest_auth_retry"]
+          digest_auth_configured? &&
+          !env['rack-test.digest_auth_retry']
       end
 
       def digest_auth_configured?
@@ -290,15 +288,15 @@ module Rack
       end
 
       def default_env
-        { "rack.test" => true, "REMOTE_ADDR" => "127.0.0.1" }.merge(@env).merge(headers_for_env)
+        { 'rack.test' => true, 'REMOTE_ADDR' => '127.0.0.1' }.merge(@env).merge(headers_for_env)
       end
 
       def headers_for_env
         converted_headers = {}
 
         @headers.each do |name, value|
-          env_key = name.upcase.gsub("-", "_")
-          env_key = "HTTP_" + env_key unless "CONTENT_TYPE" == env_key
+          env_key = name.upcase.tr('-', '_')
+          env_key = 'HTTP_' + env_key unless env_key == 'CONTENT_TYPE'
           converted_headers[env_key] = value
         end
 
@@ -308,16 +306,14 @@ module Rack
       def params_to_string(params)
         case params
         when Hash then build_nested_query(params)
-        when nil  then ""
+        when nil  then ''
         else params
         end
       end
-
     end
 
     def self.encoding_aware_strings?
-      defined?(Encoding) && "".respond_to?(:encode)
+      defined?(Encoding) && ''.respond_to?(:encode)
     end
-
   end
 end

data/lib/rack/test/cookie_jar.rb

@@ -1,9 +1,8 @@
-require "uri"
-require "time"
+require 'uri'
+require 'time'
 
 module Rack
   module Test
-
     class Cookie # :nodoc:
       include Rack::Utils
 
@@ -21,8 +20,8 @@ module Rack
         @name, @value = parse_query(@name_value_raw, ';').to_a.first
         @options = parse_query(options, ';')
 
-        @options["domain"]  ||= (uri.host || default_host)
-        @options["path"]    ||= uri.path.sub(/\/[^\/]*\Z/, "")
+        @options['domain']  ||= (uri.host || default_host)
+        @options['path']    ||= uri.path.sub(/\/[^\/]*\Z/, '')
       end
 
       def replaces?(other)
@@ -41,25 +40,25 @@ module Rack
 
       # :api: private
       def domain
-        @options["domain"]
+        @options['domain']
       end
 
       def secure?
-        @options.has_key?("secure")
+        @options.key?('secure')
       end
 
       def http_only?
-        @options.has_key?('HttpOnly')
+        @options.key?('HttpOnly')
       end
 
       # :api: private
       def path
-        @options["path"].strip || "/"
+        ([*@options['path']].first.split(',').first || '/').strip
       end
 
       # :api: private
       def expires
-        Time.parse(@options["expires"]) if @options["expires"]
+        Time.parse(@options['expires']) if @options['expires']
       end
 
       # :api: private
@@ -71,19 +70,17 @@ module Rack
       def valid?(uri)
         uri ||= default_uri
 
-        if uri.host.nil?
-          uri.host = @default_host
-        end
+        uri.host = @default_host if uri.host.nil?
 
         real_domain = domain =~ /^\./ ? domain[1..-1] : domain
-        (!secure? || (secure? && uri.scheme == "https")) &&
-        uri.host =~ Regexp.new("#{Regexp.escape(real_domain)}$", Regexp::IGNORECASE) &&
-        uri.path =~ Regexp.new("^#{Regexp.escape(path)}")
+        (!secure? || (secure? && uri.scheme == 'https')) &&
+          uri.host =~ Regexp.new("#{Regexp.escape(real_domain)}$", Regexp::IGNORECASE) &&
+          uri.path =~ Regexp.new("^#{Regexp.escape(path)}")
       end
 
       # :api: private
       def matches?(uri)
-        ! expired? && valid?(uri)
+        !expired? && valid?(uri)
       end
 
       # :api: private
@@ -91,25 +88,24 @@ module Rack
         # Orders the cookies from least specific to most
         [name, path, domain.reverse] <=> [other.name, other.path, other.domain.reverse]
       end
+
       def to_h
         @options.merge(
           'value'    => @value,
           'HttpOnly' => http_only?,
-          'secure'   => secure?,
+          'secure'   => secure?
         )
       end
-      alias_method :to_hash, :to_h
+      alias to_hash to_h
 
-    protected
+      protected
 
       def default_uri
-        URI.parse("//" + @default_host + "/")
+        URI.parse('//' + @default_host + '/')
       end
-
     end
 
     class CookieJar # :nodoc:
-
       # :api: private
       def initialize(cookies = [], default_host = DEFAULT_HOST)
         @default_host = default_host
@@ -128,7 +124,7 @@ module Rack
       end
 
       def get_cookie(name)
-        hash_for(nil).fetch(name,nil)
+        hash_for(nil).fetch(name, nil)
       end
 
       def delete(name)
@@ -142,7 +138,7 @@ module Rack
 
         if raw_cookies.is_a? String
           raw_cookies = raw_cookies.split("\n")
-          raw_cookies.reject!{|c| c.empty? }
+          raw_cookies.reject!(&:empty?)
         end
 
         raw_cookies.each do |raw_cookie|
@@ -162,7 +158,7 @@ module Rack
 
       # :api: private
       def for(uri)
-        hash_for(uri).values.map { |c| c.raw }.join(';')
+        hash_for(uri).values.map(&:raw).join(';')
       end
 
       def to_hash
@@ -172,10 +168,10 @@ module Rack
           cookies[name] = cookie.value
         end
 
-        return cookies
+        cookies
       end
 
-    protected
+      protected
 
       def hash_for(uri = nil)
         cookies = {}
@@ -189,10 +185,8 @@ module Rack
           cookies[cookie.name] = cookie if !uri || cookie.matches?(uri)
         end
 
-        return cookies
+        cookies
       end
-
     end
-
   end
 end

data/lib/rack/test/methods.rb

@@ -1,8 +1,7 @@
-require "forwardable"
+require 'forwardable'
 
 module Rack
   module Test
-
     # This module serves as the primary integration point for using Rack::Test
     # in a testing environment. It depends on an app method being defined in the
     # same context, and provides the Rack::Test API methods (see Rack::Test::Session
@@ -56,26 +55,27 @@ module Rack
         @_current_session_names ||= [:default]
       end
 
-      METHODS = [
-        :request,
-        :get,
-        :post,
-        :put,
-        :patch,
-        :delete,
-        :options,
-        :head,
-        :follow_redirect!,
-        :header,
-        :env,
-        :set_cookie,
-        :clear_cookies,
-        :authorize,
-        :basic_authorize,
-        :digest_authorize,
-        :last_response,
-        :last_request
-      ]
+      METHODS = %i[
+        request
+        get
+        post
+        put
+        patch
+        delete
+        options
+        head
+        custom_request
+        follow_redirect!
+        header
+        env
+        set_cookie
+        clear_cookies
+        authorize
+        basic_authorize
+        digest_authorize
+        last_response
+        last_request
+      ].freeze
 
       def_delegators :current_session, *METHODS
     end

data/lib/rack/test/mock_digest_request.rb

@@ -1,14 +1,12 @@
 module Rack
   module Test
-
     class MockDigestRequest # :nodoc:
-
       def initialize(params)
         @params = params
       end
 
       def method_missing(sym)
-        if @params.has_key? k = sym.to_s
+        if @params.key? k = sym.to_s
           return @params[k]
         end
 
@@ -22,8 +20,6 @@ module Rack
       def response(password)
         Rack::Auth::Digest::MD5.new(nil).send :digest, self, password
       end
-
     end
-
   end
 end

data/lib/rack/test/uploaded_file.rb

@@ -1,16 +1,14 @@
-require "tempfile"
-require "fileutils"
+require 'tempfile'
+require 'fileutils'
 
 module Rack
   module Test
-
     # Wraps a Tempfile with a content type. Including one or more UploadedFile's
     # in the params causes Rack::Test to build and issue a multipart request.
     #
     # Example:
     #   post "/photos", "file" => Rack::Test::UploadedFile.new("me.jpg", "image/jpeg")
     class UploadedFile
-
       # The filename, *not* including the path, of the "uploaded" file
       attr_reader :original_filename
 
@@ -20,33 +18,28 @@ module Rack
       # The content type of the "uploaded" file
       attr_accessor :content_type
 
-      def initialize(path, content_type = "text/plain", binary = false)
-        raise "#{path} file does not exist" unless ::File.exist?(path)
-
+      def initialize(content, content_type = 'text/plain', binary = false, original_filename: nil)
+        if content.respond_to?(:read)
+          initialize_from_io(content, original_filename)
+        else
+          initialize_from_file_path(content)
+        end
         @content_type = content_type
-        @original_filename = ::File.basename(path)
-
-        @tempfile = Tempfile.new([@original_filename, ::File.extname(path)])
-        @tempfile.set_encoding(Encoding::BINARY) if @tempfile.respond_to?(:set_encoding)
         @tempfile.binmode if binary
-
-        ObjectSpace.define_finalizer(self, self.class.finalize(@tempfile))
-
-        FileUtils.copy_file(path, @tempfile.path)
       end
 
       def path
-        @tempfile.path
+        tempfile.path
       end
 
-      alias_method :local_path, :path
+      alias local_path path
 
       def method_missing(method_name, *args, &block) #:nodoc:
-        @tempfile.__send__(method_name, *args, &block)
+        tempfile.public_send(method_name, *args, &block)
       end
 
-      def respond_to?(method_name, include_private = false) #:nodoc:
-        @tempfile.respond_to?(method_name, include_private) || super
+      def respond_to_missing?(method_name, include_private = false) #:nodoc:
+        tempfile.respond_to?(method_name, include_private) || super
       end
 
       def self.finalize(file)
@@ -58,7 +51,25 @@ module Rack
         file.unlink
       end
 
-    end
+      private
 
+      def initialize_from_io(io, original_filename)
+        @tempfile = io
+        @original_filename = original_filename || raise(ArgumentError, 'Missing `original_filename` for IO')
+      end
+
+      def initialize_from_file_path(path)
+        raise "#{path} file does not exist" unless ::File.exist?(path)
+
+        @original_filename = ::File.basename(path)
+
+        @tempfile = Tempfile.new([@original_filename, ::File.extname(path)])
+        @tempfile.set_encoding(Encoding::BINARY) if @tempfile.respond_to?(:set_encoding)
+
+        ObjectSpace.define_finalizer(self, self.class.finalize(@tempfile))
+
+        FileUtils.copy_file(path, @tempfile.path)
+      end
+    end
   end
 end

data/lib/rack/test/utils.rb

@@ -1,6 +1,5 @@
 module Rack
   module Test
-
     module Utils # :nodoc:
       include Rack::Utils
       extend Rack::Utils
@@ -12,16 +11,14 @@ module Rack
             "#{prefix}[]="
           else
             value.map do |v|
-              unless unescape(prefix) =~ /\[\]$/
-                prefix = "#{prefix}[]"
-              end
-              build_nested_query(v, "#{prefix}")
-            end.join("&")
+              prefix = "#{prefix}[]" unless unescape(prefix) =~ /\[\]$/
+              build_nested_query(v, prefix.to_s)
+            end.join('&')
           end
         when Hash
           value.map do |k, v|
             build_nested_query(v, prefix ? "#{prefix}[#{escape(k)}]" : escape(k))
-          end.join("&")
+          end.join('&')
         when NilClass
           prefix.to_s
         else
@@ -32,9 +29,7 @@ module Rack
 
       def build_multipart(params, first = true, multipart = false)
         if first
-          unless params.is_a?(Hash)
-            raise ArgumentError, "value must be a Hash"
-          end
+          raise ArgumentError, 'value must be a Hash' unless params.is_a?(Hash)
 
           query = lambda { |value|
             case value
@@ -50,7 +45,7 @@ module Rack
           return nil unless multipart
         end
 
-        flattened_params = Hash.new
+        flattened_params = {}
 
         params.each do |key, value|
           k = first ? key.to_s : "[#{key}]"
@@ -58,23 +53,21 @@ module Rack
           case value
           when Array
             value.map do |v|
-
-              if (v.is_a?(Hash))
+              if v.is_a?(Hash)
                 nested_params = {}
-                build_multipart(v, false).each { |subkey, subvalue|
+                build_multipart(v, false).each do |subkey, subvalue|
                   nested_params[subkey] = subvalue
-                }
+                end
                 flattened_params["#{k}[]"] ||= []
                 flattened_params["#{k}[]"] << nested_params
               else
                 flattened_params["#{k}[]"] = value
               end
-
             end
           when Hash
-            build_multipart(value, false).each { |subkey, subvalue|
+            build_multipart(value, false).each do |subkey, subvalue|
               flattened_params[k + subkey] = subvalue
-            }
+            end
           else
             flattened_params[k] = value
           end
@@ -89,24 +82,25 @@ module Rack
       module_function :build_multipart
 
       private
+
       def build_parts(parameters)
         get_parts(parameters).join + "--#{MULTIPART_BOUNDARY}--\r"
       end
       module_function :build_parts
 
       def get_parts(parameters)
-        parameters.map { |name, value|
-          if name =~ /\[\]\Z/ && value.is_a?(Array) && value.all? {|v| v.is_a?(Hash)}
-            value.map { |hash|
+        parameters.map do |name, value|
+          if name =~ /\[\]\Z/ && value.is_a?(Array) && value.all? { |v| v.is_a?(Hash) }
+            value.map do |hash|
               new_value = {}
-              hash.each { |k, v| new_value[name+k] = v }
+              hash.each { |k, v| new_value[name + k] = v }
               get_parts(new_value).join
-            }.join
+            end.join
           else
             if value.respond_to?(:original_filename)
               build_file_part(name, value)
 
-            elsif value.is_a?(Array) and value.all? { |v| v.respond_to?(:original_filename) }
+            elsif value.is_a?(Array) && value.all? { |v| v.respond_to?(:original_filename) }
               value.map do |v|
                 build_file_part(name, v)
               end.join
@@ -116,14 +110,12 @@ module Rack
               Rack::Test.encoding_aware_strings? ? primitive_part.force_encoding('BINARY') : primitive_part
             end
           end
-        }
+        end
       end
       module_function :get_parts
 
       def build_primitive_part(parameter_name, value)
-        unless value.is_a? Array
-          value = [value]
-        end
+        value = [value] unless value.is_a? Array
         value.map do |v|
           <<-EOF
 --#{MULTIPART_BOUNDARY}\r
@@ -136,21 +128,17 @@ EOF
       module_function :build_primitive_part
 
       def build_file_part(parameter_name, uploaded_file)
-        ::File.open(uploaded_file.path, "rb") do |physical_file|
-          physical_file.set_encoding(Encoding::BINARY) if physical_file.respond_to?(:set_encoding)
-          <<-EOF
+        uploaded_file.set_encoding(Encoding::BINARY) if uploaded_file.respond_to?(:set_encoding)
+        <<-EOF
 --#{MULTIPART_BOUNDARY}\r
 Content-Disposition: form-data; name="#{parameter_name}"; filename="#{escape(uploaded_file.original_filename)}"\r
 Content-Type: #{uploaded_file.content_type}\r
-Content-Length: #{::File.stat(uploaded_file.path).size}\r
+Content-Length: #{uploaded_file.size}\r
 \r
-#{physical_file.read}\r
+#{uploaded_file.read}\r
 EOF
-        end
       end
       module_function :build_file_part
-
     end
-
   end
 end

data/lib/rack/test/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module Test
-    VERSION = '0.7.0'.freeze
+    VERSION = '0.8.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-test
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Bryan Helmkamp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-10 00:00:00.000000000 Z
+date: 2017-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -173,7 +173,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="