rack-test 0.5.4 → 0.5.7

data/.gitignore

@@ -3,3 +3,4 @@ doc
 coverage
 VERSION
 *.rbc
+.bundle

data/Gemfile

@@ -0,0 +1,5 @@
+source :rubygems
+
+gem 'rspec'
+gem "rack"
+gem "sinatra"

data/Gemfile.lock

@@ -0,0 +1,23 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.1.2)
+    rack (1.2.1)
+    rspec (2.3.0)
+      rspec-core (~> 2.3.0)
+      rspec-expectations (~> 2.3.0)
+      rspec-mocks (~> 2.3.0)
+    rspec-core (2.3.1)
+    rspec-expectations (2.3.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.3.0)
+    sinatra (1.0)
+      rack (>= 1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rack
+  rspec
+  sinatra

data/History.txt

@@ -1,4 +1,25 @@
-== Git
+== 0.5.7 / 2011-01-01
+
+* Bug fixes
+
+  * If no URI is present, include all cookies (Pratik Naik)
+
+== 0.5.6 / 2010-09-25
+
+* Bug fixes
+
+  * Use parse_nested_query for parsing URI like Rack does (Eugene Bolshakov)
+  * Don't depend on ActiveSupport extension to String (Bryan Helmkamp)
+  * Do not overwrite HTTP_HOST if it is set (Krekoten' Marjan)
+
+== 0.5.5 / 2010-09-22
+
+* Bug fixes
+
+  * Fix encoding of file uploads on Ruby 1.9 (Alan Kennedy)
+  * Set env["HTTP_HOST"] when making requests (Istvan Hoka)
+
+== 0.5.4 / 2010-05-26
 
 * Bug fixes
 

data/Rakefile

@@ -1,31 +1,25 @@
 require "rubygems"
 
-begin
-  require "spec/rake/spectask"
-rescue LoadError
-  desc "Run specs"
-  task(:spec) { $stderr.puts '`gem install rspec` to run specs' }
-else
-  Spec::Rake::SpecTask.new do |t|
-    t.spec_opts = ['--options', "\"#{File.dirname(__FILE__)}/spec/spec.opts\""]
-    t.libs << 'lib'
-    t.libs << 'spec'
-    t.warning = true
-  end
 
-  task :default => :spec
+require 'rspec/core'
+require "rspec/core/rake_task"
 
-  desc "Run all specs in spec directory with RCov"
-  Spec::Rake::SpecTask.new(:rcov) do |t|
-    t.spec_opts = ['--options', "\"#{File.dirname(__FILE__)}/spec/spec.opts\""]
-    t.libs << 'lib'
-    t.libs << 'spec'
-    t.warning = true
-    t.rcov = true
-    t.rcov_opts = ['-x spec']
-  end
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = "./**/*_spec.rb"
+  t.ruby_opts = "-w"
 end
 
+task :default => :spec
+
+# desc "Run all specs in spec directory with RCov"
+# RSpec::Core::RakeTask.new(:rcov) do |t|
+#   t.libs << 'lib'
+#   t.libs << 'spec'
+#   t.warning = true
+#   t.rcov = true
+#   t.rcov_opts = ['-x spec']
+# end
+
 desc "Generate RDoc"
 task :docs do
   FileUtils.rm_rf("doc")

data/lib/rack/test/cookie_jar.rb

@@ -164,7 +164,7 @@ module Rack
         # so that when we are done, the cookies will be unique by name and
         # we'll have grabbed the most specific to the URI.
         @cookies.each do |cookie|
-          cookies[cookie.name] = cookie if cookie.matches?(uri)
+          cookies[cookie.name] = cookie if !uri || cookie.matches?(uri)
         end
 
         return cookies

data/lib/rack/test/utils.rb

@@ -95,7 +95,8 @@ module Rack
             end.join
 
           else
-            build_primitive_part(name, value)
+            primitive_part = build_primitive_part(name, value)
+            Rack::Test.encoding_aware_strings? ? primitive_part.force_encoding('BINARY') : primitive_part
           end
 
         }.join + "--#{MULTIPART_BOUNDARY}--\r"

data/lib/rack/test.rb

@@ -9,7 +9,7 @@ require "rack/test/uploaded_file"
 
 module Rack
   module Test
-    VERSION = "0.5.4"
+    VERSION = "0.5.7"
 
     DEFAULT_HOST = "example.org"
     MULTIPART_BOUNDARY = "----------XnJLe9ZIbbGUYtzPQJ16u1"
@@ -161,6 +161,8 @@ 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.update("HTTPS" => "on") if URI::HTTPS === uri
@@ -173,7 +175,7 @@ module Rack
         if env["REQUEST_METHOD"] == "GET"
           params = env[:params] || {}
           params = parse_nested_query(params) if params.is_a?(String)
-          params.update(parse_query(uri.query))
+          params.update(parse_nested_query(uri.query))
           uri.query = build_nested_query(params)
         elsif !env.has_key?(:input)
           env["CONTENT_TYPE"] ||= "application/x-www-form-urlencoded"
@@ -273,5 +275,9 @@ module Rack
 
     end
 
+    def self.encoding_aware_strings?
+      defined?(Encoding) && "".respond_to?(:encode)
+    end
+
   end
 end

data/rack-test.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rack-test}
-  s.version = "0.5.4"
+  s.version = "0.5.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bryan Helmkamp"]
-  s.date = %q{2010-05-26}
+  s.date = %q{2011-01-01}
   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
@@ -19,6 +19,8 @@ request helpers feature.}
   s.files = [
     ".document",
     ".gitignore",
+    "Gemfile",
+    "Gemfile.lock",
     "History.txt",
     "MIT-LICENSE.txt",
     "README.rdoc",
@@ -41,8 +43,9 @@ request helpers feature.}
     "spec/rack/test/multipart_spec.rb",
     "spec/rack/test/utils_spec.rb",
     "spec/rack/test_spec.rb",
-    "spec/spec.opts",
-    "spec/spec_helper.rb"
+    "spec/spec_helper.rb",
+    "spec/support/matchers/body.rb",
+    "spec/support/matchers/challenge.rb"
   ]
   s.homepage = %q{http://github.com/brynary/rack-test}
   s.require_paths = ["lib"]
@@ -56,7 +59,9 @@ request helpers feature.}
     "spec/rack/test/multipart_spec.rb",
     "spec/rack/test/utils_spec.rb",
     "spec/rack/test_spec.rb",
-    "spec/spec_helper.rb"
+    "spec/spec_helper.rb",
+    "spec/support/matchers/body.rb",
+    "spec/support/matchers/challenge.rb"
   ]
 
   if s.respond_to? :specification_version then

data/spec/fixtures/fake_app.rb

@@ -1,3 +1,4 @@
+require "rubygems"
 require "sinatra/base"
 
 module Rack

data/spec/rack/test/cookie_spec.rb

@@ -1,11 +1,6 @@
 require "spec_helper"
 
 describe Rack::Test::Session do
-  def have_body(string)
-    simple_matcher "have body #{string.inspect}" do |response|
-      response.body.should == string
-    end
-  end
 
   context "cookies" do
     it "keeps a cookie jar" do
@@ -118,6 +113,7 @@ describe Rack::Test::Session do
 
       get "https://example.com/cookies/show"
       last_request.cookies.should == { "secure-cookie" => "set" }
+      rack_mock_session.cookie_jar['secure-cookie'].should == 'set'
     end
 
     it "keeps separate cookie jars for different domains" do

data/spec/rack/test/digest_auth_spec.rb

@@ -12,14 +12,6 @@ describe Rack::Test::Session do
       app
     end
 
-    def be_challenge
-      simple_matcher "a HTTP Digest challenge response" do |response|
-        response.status == 401 &&
-        response['WWW-Authenticate'] =~ /^Digest / &&
-        response.body.empty?
-      end
-    end
-
     it 'incorrectly authenticates GETs' do
       digest_authorize 'foo', 'bar'
       get '/'

data/spec/rack/test/multipart_spec.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require "spec_helper"
 
 describe Rack::Test::Session do
@@ -51,6 +53,17 @@ describe Rack::Test::Session do
       last_request.POST["foo"].should == "bar? baz"
     end
 
+    it "sends params encoded as ISO-8859-1" do
+      post "/", "photo" => uploaded_file, "foo" => "bar", "utf8" => "☃"
+      last_request.POST["foo"].should == "bar"
+
+      if Rack::Test.encoding_aware_strings?
+        last_request.POST["utf8"].should == "\xE2\x98\x83".force_encoding("BINARY")
+      else
+        last_request.POST["utf8"].should == "\xE2\x98\x83"
+      end
+    end
+
     it "sends params with parens in names" do
       post "/", "photo" => uploaded_file, "foo(1i)" => "bar"
       last_request.POST["foo(1i)"].should == "bar"

data/spec/rack/test/utils_spec.rb

@@ -103,7 +103,7 @@ describe Rack::Test::Utils do
       params["people"][0]["files"][:tempfile].read.should == "bar\n"
     end
 
-    it "should return nil if no UploadedFiles were used" do
+    it "returns nil if no UploadedFiles were used" do
       data = build_multipart("people" => [{"submit-name" => "Larry", "files" => "contents"}])
       data.should be_nil
     end

data/spec/rack/test_spec.rb

@@ -29,6 +29,11 @@ describe Rack::Test::Session do
       last_request.env["X-Foo"].should == "bar"
     end
 
+    it "allows HTTP_HOST to be set" do
+      request "/", "HTTP_HOST" => "www.example.ua"
+      last_request.env['HTTP_HOST'].should == "www.example.ua"
+    end
+
     it "defaults to GET" do
       request "/"
       last_request.env["REQUEST_METHOD"].should == "GET"
@@ -91,6 +96,11 @@ describe Rack::Test::Session do
       last_request.GET.should == { "baz" => "2", "foo" => { "bar" => "1" }}
     end
 
+    it "parses query strings with repeated variable names correctly" do
+      request "/foo?bar=2&bar=3"
+      last_request.GET.should == { "bar" => "3" }
+    end
+
     it "accepts raw input in params for GET requests" do
       request "/foo?baz=2", :params => "foo[bar]=1"
       last_request.GET.should == { "baz" => "2", "foo" => { "bar" => "1" }}
@@ -146,12 +156,12 @@ describe Rack::Test::Session do
     end
 
     context "when input is given" do
-      it "should send the input" do
+      it "sends the input" do
         request "/", :method => "POST", :input => "foo"
         last_request.env["rack.input"].read.should == "foo"
       end
 
-      it "should not send a multipart request" do
+      it "does not send a multipart request" do
         request "/", :method => "POST", :input => "foo"
         last_request.env["CONTENT_TYPE"].should_not == "application/x-www-form-urlencoded"
       end

data/spec/spec_helper.rb

@@ -1,12 +1,16 @@
 require "rubygems"
-require "spec"
+require "bundler/setup"
 
-gem "rack", "~> 1.0.0"
+require "rack"
+require "rspec"
+
+Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
 
 require "rack/test"
 require File.dirname(__FILE__) + "/fixtures/fake_app"
 
-Spec::Runner.configure do |config|
+Rspec.configure do |config|
+  config.mock_with :rspec
   config.include Rack::Test::Methods
 
   def app
@@ -18,7 +22,7 @@ Spec::Runner.configure do |config|
 
 end
 
-describe "any #verb methods", :shared => true do
+shared_examples_for "any #verb methods" do
   it "requests the URL using VERB" do
     send(verb, "/")
 
@@ -42,6 +46,16 @@ describe "any #verb methods", :shared => true do
     yielded.should be_true
   end
 
+  it "sets the HTTP_HOST header with port" do
+    send(verb, "http://example.org:8080/uri")
+    last_request.env["HTTP_HOST"].should == "example.org:8080"
+  end
+
+  it "sets the HTTP_HOST header without port" do
+    send(verb, "/uri")
+    last_request.env["HTTP_HOST"].should == "example.org"
+  end
+
   context "for a XHR" do
     it "sends XMLHttpRequest for the X-Requested-With header" do
       send(verb, "/", {}, { :xhr => true })

data/spec/support/matchers/body.rb

@@ -0,0 +1,9 @@
+RSpec::Matchers.define :have_body do |expected|
+  match do |response|
+    response.body.should == expected
+  end
+
+  description do
+    "have body #{expected.inspect}"
+  end
+end

data/spec/support/matchers/challenge.rb

@@ -0,0 +1,11 @@
+RSpec::Matchers.define :be_challenge do
+  match do |actual_response|
+    actual_response.status == 401 &&
+    actual_response['WWW-Authenticate'] =~ /^Digest / &&
+    actual_response.body.empty?
+  end
+
+  description do
+    "a HTTP Digest challenge response"
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-test
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 5
-  - 4
-  version: 0.5.4
+  - 7
+  version: 0.5.7
 platform: ruby
 authors: 
 - Bryan Helmkamp
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-26 00:00:00 -04:00
+date: 2011-01-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,6 +49,8 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- Gemfile
+- Gemfile.lock
 - History.txt
 - MIT-LICENSE.txt
 - README.rdoc
@@ -71,8 +73,9 @@ files:
 - spec/rack/test/multipart_spec.rb
 - spec/rack/test/utils_spec.rb
 - spec/rack/test_spec.rb
-- spec/spec.opts
 - 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: []
@@ -115,3 +118,5 @@ test_files:
 - 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

data/spec/spec.opts

@@ -1,2 +0,0 @@
---color
--fs