rack-test 0.6.1 → 0.6.2

data/Gemfile

@@ -3,4 +3,4 @@ source :rubygems
 gem 'rspec'
 gem "rack"
 gem "sinatra"
-gem 'rake'
+gem 'rake'

data/Gemfile.lock

@@ -1,21 +1,24 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.2)
-    rack (1.3.2)
+    diff-lcs (1.1.3)
+    rack (1.4.0)
+    rack-protection (1.2.0)
+      rack
     rake (0.9.2)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    sinatra (1.2.6)
-      rack (~> 1.1)
-      tilt (< 2.0, >= 1.2.2)
-    tilt (1.3.2)
+    rspec-mocks (2.8.0)
+    sinatra (1.3.2)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
+      tilt (~> 1.3, >= 1.3.3)
+    tilt (1.3.3)
 
 PLATFORMS
   java

data/History.txt

@@ -1,3 +1,16 @@
+== 0.6.2 / 2012-09-27
+
+* Minor enhancements
+
+  * Support HTTP PATCH method (Marjan Krekoten' #33)
+  * Preserve the exact query string when possible (Paul Grayson #63)
+  * Add a #delete method to CookieJar (Paul Grayson #63)
+
+* Bug fixes
+
+  * Fix HTTP Digest authentication when the URI has query params
+  * Don't append default ports to HTTP_HOST (David Lee #57)
+
 == 0.6.1 / 2011-07-27
 
 * Bug fixes

data/README.rdoc

@@ -1,7 +1,6 @@
-= Rack::Test
+= Rack::Test {<img src="https://codeclimate.com/badge.png" />}[https://codeclimate.com/github/brynary/rack-test]
 
 - Code: http://github.com/brynary/rack-test
-- Build: http://runcoderun.com/brynary/rack-test
 
 == Description
 
@@ -17,7 +16,7 @@ request helpers feature.
 * Set request headers to be used by all subsequent requests
 * Small footprint. Approximately 200 LOC
 
-== Example
+== Examples
 
   require "rack/test"
 
@@ -39,19 +38,48 @@ request helpers feature.
 
   end
 
+
+If you want to test one app in isolation, you just return that app as shown above. But if you want to test the entire app stack, including middlewares, cascades etc. you need to parse the app defined in config.ru.
+
+    OUTER_APP = Rack::Builder.parse_file('config.ru').first
+
+    class TestApp < Test::Unit::TestCase
+      include Rack::Test::Methods
+
+      def app
+        OUTER_APP
+      end
+
+      def test_root
+        get '/'
+        assert last_response.ok?
+      end
+    end
+
+
 == Install
 
 To install the latest release as a gem:
 
   sudo gem install rack-test
 
+Or via Bundler:
+
+  gem "rack-test", require: "rack/test"
+
 == Authors
 
 - Maintained by {Bryan Helmkamp}[mailto:bryan@brynary.com]
-- Contributions from Simon Rozet and Pat Nakajima
+- Contributions from Simon Rozet, Pat Nakajima and others
 - Much of the original code was extracted from Merb 1.0's request helper
 
 == License
 
 Copyright (c) 2008-2009 Bryan Helmkamp, Engine Yard Inc.
 See MIT-LICENSE.txt in this directory.
+
+== Releasing
+
+* Ensure History.txt is up-to-date
+* Bump VERSION in lib/rack/test.rb
+* thor :release

data/lib/rack/test.rb

@@ -9,7 +9,7 @@ require "rack/test/uploaded_file"
 
 module Rack
   module Test
-    VERSION = "0.6.1"
+    VERSION = "0.6.2"
 
     DEFAULT_HOST = "example.org"
     MULTIPART_BOUNDARY = "----------XnJLe9ZIbbGUYtzPQJ16u1"
@@ -75,6 +75,15 @@ module Rack
         process_request(uri, env, &block)
       end
 
+      # Issue a PATCH request for the given URI. See #get
+      #
+      # Example:
+      #   patch "/"
+      def patch(uri, params = {}, env = {}, &block)
+        env = env_for(uri, env.merge(:method => "PATCH", :params => params))
+        process_request(uri, env, &block)
+      end
+
       # Issue a DELETE request for the given URI. See #get
       #
       # Example:
@@ -173,7 +182,7 @@ module Rack
 
         env = default_env.merge(env)
 
-        env["HTTP_HOST"] ||= [uri.host, uri.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]
@@ -183,10 +192,12 @@ module Rack
         env["REQUEST_METHOD"] ||= env[:method] ? env[:method].to_s.upcase : "GET"
 
         if env["REQUEST_METHOD"] == "GET"
-          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)
+          # 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)
+          end
         elsif !env.has_key?(:input)
           env["CONTENT_TYPE"] ||= "application/x-www-form-urlencoded"
 
@@ -240,7 +251,7 @@ module Rack
           "username"  => @digest_username,
           "nc"        => "00000001",
           "cnonce"    => "nonsensenonce",
-          "uri"       => last_request.path_info,
+          "uri"       => last_request.fullpath,
           "method"    => last_request.env["REQUEST_METHOD"],
         })
 

data/lib/rack/test/cookie_jar.rb

@@ -115,6 +115,12 @@ module Rack
         merge("#{name}=#{Rack::Utils.escape(value)}")
       end
 
+      def delete(name)
+        @cookies.reject! do |cookie|
+          cookie.name == name
+        end
+      end
+
       def merge(raw_cookies, uri = nil)
         return unless raw_cookies
 

data/lib/rack/test/methods.rb

@@ -61,6 +61,7 @@ module Rack
         :get,
         :post,
         :put,
+        :patch,
         :delete,
         :options,
         :head,

data/rack-test.gemspec

@@ -1,17 +1,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{rack-test}
-  s.version = "0.6.1"
+  s.name = "rack-test"
+  s.version = "0.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bryan Helmkamp"]
-  s.date = %q{2011-07-27}
-  s.description = %q{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.}
-  s.email = %q{bryan@brynary.com}
+  s.date = "2012-09-27"
+  s.description = "Rack::Test is a small, simple testing API for Rack apps. It can be used on its\nown or as a reusable starting point for Web frameworks and testing libraries\nto build on. Most of its initial functionality is an extraction of Merb 1.0's\nrequest helpers feature."
+  s.email = "bryan@brynary.com"
   s.extra_rdoc_files = [
     "README.rdoc",
     "MIT-LICENSE.txt"
@@ -48,11 +45,11 @@ request helpers feature.}
     "spec/support/matchers/body.rb",
     "spec/support/matchers/challenge.rb"
   ]
-  s.homepage = %q{http://github.com/brynary/rack-test}
+  s.homepage = "http://github.com/brynary/rack-test"
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{rack-test}
-  s.rubygems_version = %q{1.6.1}
-  s.summary = %q{Simple testing API built on Rack}
+  s.rubyforge_project = "rack-test"
+  s.rubygems_version = "1.8.23"
+  s.summary = "Simple testing API built on Rack"
   s.test_files = [
     "spec/fixtures/fake_app.rb",
     "spec/rack/test/cookie_spec.rb",

data/spec/fixtures/fake_app.rb

@@ -55,6 +55,17 @@ module Rack
         "Set"
       end
 
+      post "/cookies/default-path" do
+        raise if params["value"].nil?
+
+        response.set_cookie "simple", params["value"]
+        "Set"
+      end
+
+      get "/cookies/default-path" do
+        response.cookies.inspect
+      end
+
       get "/cookies/delete" do
         response.delete_cookie "value"
       end
@@ -119,6 +130,10 @@ module Rack
         "Hello, PUT: #{params.inspect}"
       end
 
+      patch "/" do
+        "Hello, PUT: #{params.inspect}"
+      end
+
       delete "/" do
         "Hello, DELETE: #{params.inspect}"
       end

data/spec/rack/test/cookie_spec.rb

@@ -20,12 +20,30 @@ describe Rack::Test::Session do
       last_request.cookies.should == {}
     end
 
+    it "cookie path defaults to the uri of the document that was requested" do
+      pending "See issue rack-test github issue #50" do
+        post "/cookies/default-path", "value" => "cookie"
+        get "/cookies/default-path"
+        check last_request.cookies.should == { "simple"=>"cookie" }
+        get "/cookies/show"
+        check last_request.cookies.should == { }
+      end
+    end
+
     it "escapes cookie values" do
       jar = Rack::Test::CookieJar.new
       jar["value"] = "foo;abc"
       jar["value"].should == "foo;abc"
     end
 
+    it "deletes cookies directly from the CookieJar" do
+      jar = Rack::Test::CookieJar.new
+      jar["abcd"] = "1234"
+      jar["abcd"].should == "1234"
+      jar.delete("abcd")
+      jar["abcd"].should == nil
+    end
+
     it "doesn't send cookies with the wrong domain" do
       get "http://www.example.com/cookies/set", "value" => "1"
       get "http://www.other.example/cookies/show"

data/spec/rack/test/digest_auth_spec.rb

@@ -24,6 +24,12 @@ describe Rack::Test::Session do
       response.should be_ok
     end
 
+    it "correctly authenticates GETs with params" do
+      digest_authorize "alice", "correct-password"
+      response = get "/", "foo" => "bar"
+      response.should be_ok
+    end
+
     it "correctly authenticates POSTs" do
       digest_authorize "alice", "correct-password"
       response = post "/"

data/spec/rack/test_spec.rb

@@ -34,6 +34,22 @@ describe Rack::Test::Session do
       last_request.env['HTTP_HOST'].should == "www.example.ua"
     end
 
+    it "sets HTTP_HOST with port for non-default ports" do
+      request "http://foo.com:8080"
+      last_request.env["HTTP_HOST"].should == "foo.com:8080"
+      request "https://foo.com:8443"
+      last_request.env["HTTP_HOST"].should == "foo.com:8443"
+    end
+
+    it "sets HTTP_HOST without port for default ports" do
+      request "http://foo.com"
+      last_request.env["HTTP_HOST"].should == "foo.com"
+      request "http://foo.com:80"
+      last_request.env["HTTP_HOST"].should == "foo.com"
+      request "https://foo.com:443"
+      last_request.env["HTTP_HOST"].should == "foo.com"
+    end
+
     it "defaults to GET" do
       request "/"
       last_request.env["REQUEST_METHOD"].should == "GET"
@@ -106,6 +122,11 @@ describe Rack::Test::Session do
       last_request.GET.should == { "baz" => "2", "foo" => { "bar" => "1" }}
     end
 
+    it "does not rewrite a GET query string when :params is not supplied" do
+      request "/foo?a=1&b=2&c=3&e=4&d=5"
+      last_request.query_string.should == "a=1&b=2&c=3&e=4&d=5"
+    end
+
     it "accepts params and builds url encoded params for POST requests" do
       request "/foo", :method => :post, :params => {:foo => {:bar => "1"}}
       last_request.env["rack.input"].read.should == "foo[bar]=1"
@@ -458,6 +479,19 @@ describe Rack::Test::Session do
     end
   end
 
+  describe "#patch" do
+    it_should_behave_like "any #verb methods"
+
+    def verb
+      "patch"
+    end
+
+    it "accepts a body" do
+      patch "/", "Lobsterlicious!"
+      last_request.body.read.should == "Lobsterlicious!"
+    end
+  end
+
   describe "#delete" do
     it_should_behave_like "any #verb methods"
 

metadata

@@ -1,52 +1,47 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rack-test
-version: !ruby/object:Gem::Version 
-  hash: 5
+version: !ruby/object:Gem::Version
+  version: 0.6.2
   prerelease: 
-  segments: 
-  - 0
-  - 6
-  - 1
-  version: 0.6.1
 platform: ruby
-authors: 
+authors:
 - Bryan Helmkamp
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-27 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-09-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rack
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id001
-description: |-
-  Rack::Test is a small, simple testing API for Rack apps. It can be used on its
+  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
+
   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: 
+extra_rdoc_files:
 - README.rdoc
 - MIT-LICENSE.txt
-files: 
+files:
 - .document
 - .gitignore
 - Gemfile
@@ -77,41 +72,31 @@ files:
 - spec/spec_helper.rb
 - spec/support/matchers/body.rb
 - spec/support/matchers/challenge.rb
-has_rdoc: true
 homepage: http://github.com/brynary/rack-test
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: rack-test
-rubygems_version: 1.6.1
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Simple testing API built on Rack
-test_files: 
+test_files:
 - spec/fixtures/fake_app.rb
 - spec/rack/test/cookie_spec.rb
 - spec/rack/test/digest_auth_spec.rb