josh-rack-test 0.4.1 → 0.4.2

data/History.txt

@@ -1,11 +1,15 @@
-== Git
+== 0.4.2 / 2009-09-01
 
 * Minor enhancements
 
+  * Merge in rack/master's build_multipart method which covers additional cases
+  * Accept raw :params string input and merge it with the query string
   * Stringify and upcase request method (e.g. :post => "POST") (Josh Peek)
 
 * Bug fixes
 
+  * Properly convert hashes with nil values (e.g. :foo => nil becomes simply "foo", not "foo=")
+  * Prepend a slash to the URI path if it doesn't start with one (Josh Peek)
   * Requiring Rack-Test never modifies the Ruby load path anymore (Josh Peek)
   * Fixed using multiple cookies in a string on Ruby 1.8 (Tuomas Kareinen and Hermanni Hyytiälä)
 

data/lib/rack/test.rb

@@ -9,7 +9,7 @@ require "rack/test/uploaded_file"
 
 module Rack
   module Test
-    VERSION = "0.4.1"
+    VERSION = "0.4.2"
 
     DEFAULT_HOST = "example.org"
     MULTIPART_BOUNDARY = "----------XnJLe9ZIbbGUYtzPQJ16u1"
@@ -141,6 +141,7 @@ module Rack
 
       def env_for(path, env)
         uri = URI.parse(path)
+        uri.path = "/#{uri.path}" unless uri.path[0] == ?/
         uri.host ||= @default_host
 
         env = default_env.merge(env)
@@ -154,8 +155,8 @@ 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))
-
           uri.query = build_nested_query(params)
         elsif !env.has_key?(:input)
           env["CONTENT_TYPE"] ||= "application/x-www-form-urlencoded"
@@ -173,6 +174,8 @@ module Rack
           end
         end
 
+        env.delete(:params)
+
         if env.has_key?(:cookie)
           set_cookie(env.delete(:cookie), uri)
         end

data/lib/rack/test/utils.rb

@@ -14,6 +14,8 @@ module Rack
           value.map do |k, v|
             build_nested_query(v, prefix ? "#{prefix}[#{escape(k)}]" : escape(k))
           end.join("&")
+        when NilClass
+          prefix.to_s
         else
           "#{prefix}=#{escape(value)}"
         end

data/rack-test.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rack-test}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bryan Helmkamp"]
-  s.date = %q{2009-08-06}
+  s.date = %q{2009-09-01}
   s.email = %q{bryan@brynary.com}
   s.extra_rdoc_files = [
     "MIT-LICENSE.txt",
@@ -46,7 +46,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rack-test}
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Simple testing API built on Rack}
   s.test_files = [
     "spec/fixtures/fake_app.rb",

data/spec/rack/test/utils_spec.rb

@@ -8,8 +8,12 @@ describe Rack::Test::Utils do
       build_nested_query("").should == "="
     end
 
-    it "converts nil to =" do
-      build_nested_query(nil).should == "="
+    it "converts nil to an empty string" do
+      build_nested_query(nil).should == ""
+    end
+
+    it "converts hashes with nil values" do
+      build_nested_query(:a => nil).should == "a"
     end
 
     it "converts hashes" do

data/spec/rack/test_spec.rb

@@ -71,11 +71,41 @@ describe Rack::Test::Session do
       last_response.body.should be_empty
     end
 
-    it "stringify and upcases method" do
+    it "allows passing :input in for POSTs" do
       request "/", :method => :post, :input => "foo"
       last_request.env["rack.input"].read.should == "foo"
     end
 
+    it "converts method names to a uppercase strings" do
+      request "/", :method => :put
+      last_request.env["REQUEST_METHOD"].should == "PUT"
+    end
+
+    it "prepends a slash to the URI path" do
+      request "foo"
+      last_request.env["PATH_INFO"].should == "/foo"
+    end
+
+    it "accepts params and builds query strings for GET requests" do
+      request "/foo?baz=2", :params => {:foo => {:bar => "1"}}
+      last_request.env["QUERY_STRING"].should == "baz=2&foo[bar]=1"
+    end
+
+    it "accepts raw input in params for GET requests" do
+      request "/foo?baz=2", :params => "foo[bar]=1"
+      last_request.env["QUERY_STRING"].should == "baz=2&foo[bar]=1"
+    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"
+    end
+    
+    it "accepts raw input in params for POST requests" do
+      request "/foo", :method => :post, :params => "foo[bar]=1"
+      last_request.env["rack.input"].read.should == "foo[bar]=1"
+    end
+
     context "when input is given" do
       it "should send the input" do
         request "/", :method => "POST", :input => "foo"
@@ -110,6 +140,11 @@ describe Rack::Test::Session do
     end
 
     context "when the URL is https://" do
+      it "sets rack.url_scheme to https" do
+        get "https://example.org/"
+        last_request.env["rack.url_scheme"].should == "https"
+      end
+
       it "sets SERVER_PORT to 443" do
         get "https://example.org/"
         last_request.env["SERVER_PORT"].should == "443"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: josh-rack-test
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Bryan Helmkamp
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-06 00:00:00 -07:00
+date: 2009-09-01 00:00:00 -07:00
 default_executable: 
 dependencies: []