rack-test 0.5.7 → 0.6.0

data/Gemfile.lock

@@ -2,7 +2,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.2)
-    rack (1.2.1)
+    rack (1.2.2)
     rspec (2.3.0)
       rspec-core (~> 2.3.0)
       rspec-expectations (~> 2.3.0)
@@ -11,10 +11,13 @@ GEM
     rspec-expectations (2.3.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
-    sinatra (1.0)
-      rack (>= 1.0)
+    sinatra (1.2.3)
+      rack (~> 1.1)
+      tilt (< 2.0, >= 1.2.2)
+    tilt (1.2.2)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES

data/History.txt

@@ -1,3 +1,11 @@
+== 0.6.0 / 2011-05-03
+
+* Bug fixes
+
+  * Add support for HTTP OPTIONS verb (Paolo "Nusco" Perrotta)
+  * Call #finish on MockResponses if it's available (Aaron Patterson)
+  * Allow HTTP_HOST to be set via #header (Geoff Buesing)
+
 == 0.5.7 / 2011-01-01
 
 * Bug fixes

data/lib/rack/mock_session.rb

@@ -35,7 +35,12 @@ module Rack
       cookie_jar.merge(last_response.headers["Set-Cookie"], uri)
 
       @after_request.each { |hook| hook.call }
-      @last_response
+
+      if @last_response.respond_to?(:finish)
+        @last_response.finish
+      else
+        @last_response
+      end
     end
 
     # Return the last request issued in the session. Raises an error if no

data/lib/rack/test.rb

@@ -9,7 +9,7 @@ require "rack/test/uploaded_file"
 
 module Rack
   module Test
-    VERSION = "0.5.7"
+    VERSION = "0.6.0"
 
     DEFAULT_HOST = "example.org"
     MULTIPART_BOUNDARY = "----------XnJLe9ZIbbGUYtzPQJ16u1"
@@ -84,6 +84,15 @@ module Rack
         process_request(uri, env, &block)
       end
 
+      # Issue an OPTIONS request for the given URI. See #get
+      #
+      # Example:
+      #   options "/"
+      def options(uri, params = {}, env = {}, &block)
+        env = env_for(uri, env.merge(:method => "OPTIONS", :params => params))
+        process_request(uri, env, &block)
+      end
+
       # Issue a HEAD request for the given URI. See #get
       #
       # Example:
@@ -161,10 +170,10 @@ module Rack
         uri.path = "/#{uri.path}" unless uri.path[0] == ?/
         uri.host ||= @default_host
 
-        env["HTTP_HOST"] ||= [uri.host, uri.port].compact.join(":")
-
         env = default_env.merge(env)
 
+        env["HTTP_HOST"] ||= [uri.host, uri.port].compact.join(":")
+
         env.update("HTTPS" => "on") if URI::HTTPS === uri
         env["HTTP_X_REQUESTED_WITH"] = "XMLHttpRequest" if env[:xhr]
 

data/lib/rack/test/methods.rb

@@ -62,6 +62,7 @@ module Rack
         :post,
         :put,
         :delete,
+        :options,
         :head,
         :follow_redirect!,
         :header,

data/rack-test.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rack-test}
-  s.version = "0.5.7"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bryan Helmkamp"]
-  s.date = %q{2011-01-01}
+  s.date = %q{2011-05-03}
   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
@@ -50,7 +50,7 @@ request helpers feature.}
   s.homepage = %q{http://github.com/brynary/rack-test}
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rack-test}
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.1}
   s.summary = %q{Simple testing API built on Rack}
   s.test_files = [
     "spec/fixtures/fake_app.rb",
@@ -65,7 +65,6 @@ request helpers feature.}
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/spec/fixtures/fake_app.rb

@@ -9,6 +9,10 @@ module Rack
         "meh"
       end
 
+      options "/" do
+        [200, {}, ""]
+      end
+
       get "/" do
         "Hello, GET: #{params.inspect}"
       end

data/spec/rack/test/multipart_spec.rb

@@ -58,7 +58,7 @@ describe Rack::Test::Session do
       last_request.POST["foo"].should == "bar"
 
       if Rack::Test.encoding_aware_strings?
-        last_request.POST["utf8"].should == "\xE2\x98\x83".force_encoding("BINARY")
+        last_request.POST["utf8"].should == "☃"
       else
         last_request.POST["utf8"].should == "\xE2\x98\x83"
       end

data/spec/rack/test_spec.rb

@@ -228,6 +228,13 @@ describe Rack::Test::Session do
 
       last_request.env["CONTENT_TYPE"].should == "application/json"
     end
+    
+    it "sets a Host to be sent with requests" do
+      header "Host", "www.example.ua"
+      request "/"
+
+      last_request.env["HTTP_HOST"].should == "www.example.ua"
+    end
 
     it "persists across multiple requests" do
       header "User-Agent", "Firefox"
@@ -325,7 +332,7 @@ describe Rack::Test::Session do
   describe "#last_response" do
     it "returns the most recent response" do
       request "/"
-      last_response["Content-Type"].should == "text/html"
+      last_response["Content-Type"].should == "text/html;charset=utf-8"
     end
 
     it "raises an error if no requests have been issued" do
@@ -457,4 +464,12 @@ describe Rack::Test::Session do
       "delete"
     end
   end
+
+  describe "#options" do
+    it_should_behave_like "any #verb methods"
+
+    def verb
+      "options"
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-test
 version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
   - 0
-  - 5
-  - 7
-  version: 0.5.7
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Bryan Helmkamp
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-01 00:00:00 -05:00
+date: 2011-05-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rack-test
-rubygems_version: 1.3.7
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Simple testing API built on Rack