rack-test 0.5.5 → 0.5.6

data/History.txt

@@ -1,3 +1,11 @@
+== Git
+
+== 0.5.6 / 2010-09-25
+
+  * 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
@@ -5,7 +13,7 @@
   * Fix encoding of file uploads on Ruby 1.9 (Alan Kennedy)
   * Set env["HTTP_HOST"] when making requests (Istvan Hoka)
 
-== 0.5.4 / 2009-05-26
+== 0.5.4 / 2010-05-26
 
 * Bug fixes
 

data/lib/rack/test.rb

@@ -9,7 +9,7 @@ require "rack/test/uploaded_file"
 
 module Rack
   module Test
-    VERSION = "0.5.5"
+    VERSION = "0.5.6"
 
     DEFAULT_HOST = "example.org"
     MULTIPART_BOUNDARY = "----------XnJLe9ZIbbGUYtzPQJ16u1"
@@ -161,7 +161,7 @@ module Rack
         uri.path = "/#{uri.path}" unless uri.path[0] == ?/
         uri.host ||= @default_host
 
-        env["HTTP_HOST"] = [uri.host, uri.port].compact.join(":")
+        env["HTTP_HOST"] ||= [uri.host, uri.port].compact.join(":")
 
         env = default_env.merge(env)
 
@@ -175,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"
@@ -275,5 +275,9 @@ module Rack
 
     end
 
+    def self.encoding_aware_strings?
+      defined?(Encoding) && "".respond_to?(:encode)
+    end
+
   end
 end

data/lib/rack/test/utils.rb

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

data/rack-test.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rack-test}
-  s.version = "0.5.5"
+  s.version = "0.5.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bryan Helmkamp"]
-  s.date = %q{2010-09-22}
+  s.date = %q{2010-09-25}
   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
@@ -44,7 +44,6 @@ request helpers feature.}
     "spec/rack/test/utils_spec.rb",
     "spec/rack/test_spec.rb",
     "spec/spec_helper.rb",
-    "spec/support/core_ext/string.rb",
     "spec/support/matchers/body.rb",
     "spec/support/matchers/challenge.rb"
   ]
@@ -61,7 +60,6 @@ request helpers feature.}
     "spec/rack/test/utils_spec.rb",
     "spec/rack/test_spec.rb",
     "spec/spec_helper.rb",
-    "spec/support/core_ext/string.rb",
     "spec/support/matchers/body.rb",
     "spec/support/matchers/challenge.rb"
   ]

data/spec/rack/test/multipart_spec.rb

@@ -57,7 +57,7 @@ describe Rack::Test::Session do
       post "/", "photo" => uploaded_file, "foo" => "bar", "utf8" => "☃"
       last_request.POST["foo"].should == "bar"
 
-      if last_request.POST["utf8"].encoding_aware?
+      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"

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" }}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-test
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 5
-  - 5
-  version: 0.5.5
+  - 6
+  version: 0.5.6
 platform: ruby
 authors: 
 - Bryan Helmkamp
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-22 00:00:00 -04:00
+date: 2010-09-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -74,7 +74,6 @@ files:
 - spec/rack/test/utils_spec.rb
 - spec/rack/test_spec.rb
 - spec/spec_helper.rb
-- spec/support/core_ext/string.rb
 - spec/support/matchers/body.rb
 - spec/support/matchers/challenge.rb
 has_rdoc: true
@@ -119,6 +118,5 @@ test_files:
 - spec/rack/test/utils_spec.rb
 - spec/rack/test_spec.rb
 - spec/spec_helper.rb
-- spec/support/core_ext/string.rb
 - spec/support/matchers/body.rb
 - spec/support/matchers/challenge.rb

data/spec/support/core_ext/string.rb

@@ -1,12 +0,0 @@
-# Taken from ActiveSuport v3
-class String
-  if defined?(Encoding) && "".respond_to?(:encode)
-    def encoding_aware?
-      true
-    end
-  else
-    def encoding_aware?
-      false
-    end
-  end
-end