rack-test 0.6.3 → 0.8.0

data/lib/rack/test/version.rb

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

data/lib/rack/test.rb

@@ -1,18 +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 '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
-    VERSION = "0.6.3"
-
-    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
@@ -36,11 +35,13 @@ module Rack
       def initialize(mock_session)
         @headers = {}
         @env = {}
+        @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
@@ -54,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
@@ -63,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
@@ -72,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
@@ -81,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
@@ -90,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
@@ -99,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
@@ -108,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
@@ -120,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.
       #
@@ -159,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.
@@ -181,45 +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)
+        else
+          get(last_response['Location'], {}, 'HTTP_REFERER' => last_request.url)
         end
-
-        get(last_response["Location"], {}, { "HTTP_REFERER" => last_request.url })
       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 env["REQUEST_METHOD"] == "GET"
+        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)
-            params.update(parse_nested_query(uri.query))
-            uri.query = build_nested_query(params)
+
+            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
@@ -230,24 +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
-
         @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
@@ -258,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?
@@ -285,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
 
@@ -303,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

metadata

@@ -1,56 +1,158 @@
 --- !ruby/object:Gem::Specification
 name: rack-test
 version: !ruby/object:Gem::Version
-  version: 0.6.3
-  prerelease: 
+  version: 0.8.0
 platform: ruby
 authors:
 - Bryan Helmkamp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2017-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
-description: ! 'Rack::Test is a small, simple testing API for Rack apps. It can be
-  used on its
-
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.49'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.50'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.49'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.50'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.19'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.19'
+description: |-
+  Rack::Test is a small, simple testing API for Rack apps. It can be used on its
   own or as a reusable starting point for Web frameworks and testing libraries
-
-  to build on. Most of its initial functionality is an extraction of Merb 1.0''s
-
-  request helpers feature.'
+  to build on. Most of its initial functionality is an extraction of Merb 1.0's
+  request helpers feature.
 email: bryan@brynary.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.rdoc
-- MIT-LICENSE.txt
+extra_rdoc_files: []
 files:
-- .document
-- .gitignore
-- Gemfile
-- Gemfile.lock
-- History.txt
+- History.md
 - MIT-LICENSE.txt
-- README.rdoc
-- Rakefile
-- Thorfile
+- README.md
 - lib/rack/mock_session.rb
 - lib/rack/test.rb
 - lib/rack/test/cookie_jar.rb
@@ -58,52 +160,29 @@ files:
 - lib/rack/test/mock_digest_request.rb
 - lib/rack/test/uploaded_file.rb
 - lib/rack/test/utils.rb
-- rack-test.gemspec
-- spec/fixtures/bar.txt
-- spec/fixtures/config.ru
-- spec/fixtures/fake_app.rb
-- spec/fixtures/foo.txt
-- spec/rack/test/cookie_spec.rb
-- spec/rack/test/digest_auth_spec.rb
-- spec/rack/test/multipart_spec.rb
-- spec/rack/test/uploaded_file_spec.rb
-- spec/rack/test/utils_spec.rb
-- spec/rack/test_spec.rb
-- spec/spec_helper.rb
-- spec/support/matchers/body.rb
-- spec/support/matchers/challenge.rb
-homepage: http://github.com/brynary/rack-test
-licenses: []
+- lib/rack/test/version.rb
+homepage: http://github.com/rack-test/rack-test
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: rack-test
-rubygems_version: 1.8.23.2
+rubyforge_project: 
+rubygems_version: 2.6.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple testing API built on Rack
-test_files:
-- spec/fixtures/fake_app.rb
-- spec/rack/test/cookie_spec.rb
-- spec/rack/test/digest_auth_spec.rb
-- spec/rack/test/multipart_spec.rb
-- spec/rack/test/uploaded_file_spec.rb
-- spec/rack/test/utils_spec.rb
-- spec/rack/test_spec.rb
-- spec/spec_helper.rb
-- spec/support/matchers/body.rb
-- spec/support/matchers/challenge.rb
+test_files: []