rack-test 0.5.3 → 0.5.4

data/.gitignore

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

data/History.txt

@@ -1,3 +1,12 @@
+== Git
+
+* Bug fixes
+
+  * Don't stomp on Content-Type's supplied via #header (Bryan Helmkamp)
+  * Fixed build_multipart to allow for arrays of files (Louis Rose)
+  * Don't raise an error if raw cookies contain a blank line (John Reilly)
+  * Handle parameter names with brackets properly (Tanner Donovan)
+
 == 0.5.3 / 2009-11-27
 
 * Bug fixes

data/lib/rack/test.rb

@@ -9,7 +9,7 @@ require "rack/test/uploaded_file"
 
 module Rack
   module Test
-    VERSION = "0.5.3"
+    VERSION = "0.5.4"
 
     DEFAULT_HOST = "example.org"
     MULTIPART_BOUNDARY = "----------XnJLe9ZIbbGUYtzPQJ16u1"
@@ -255,7 +255,8 @@ module Rack
         converted_headers = {}
 
         @headers.each do |name, value|
-          env_key = "HTTP_" + name.upcase.gsub("-", "_")
+          env_key = name.upcase.gsub("-", "_")
+          env_key = "HTTP_" + env_key unless "CONTENT_TYPE" == env_key
           converted_headers[env_key] = value
         end
 

data/lib/rack/test/cookie_jar.rb

@@ -118,7 +118,11 @@ module Rack
       def merge(raw_cookies, uri = nil)
         return unless raw_cookies
 
-        raw_cookies = raw_cookies.split("\n") if raw_cookies.is_a? String
+        if raw_cookies.is_a? String
+          raw_cookies = raw_cookies.split("\n")
+          raw_cookies.reject!{|c| c.empty? }
+        end
+
         raw_cookies.each do |raw_cookie|
           cookie = Cookie.new(raw_cookie, uri, @default_host)
           self << cookie if cookie.valid?(uri)

data/lib/rack/test/utils.rb

@@ -8,7 +8,10 @@ module Rack
         case value
         when Array
           value.map do |v|
-            build_nested_query(v, "#{prefix}[]")
+            unless unescape(prefix) =~ /\[\]$/
+              prefix = "#{prefix}[]"
+            end
+            build_nested_query(v, "#{prefix}")
           end.join("&")
         when Hash
           value.map do |k, v|
@@ -51,11 +54,17 @@ module Rack
 
           case value
           when Array
-            value.map { |v|
-              build_multipart(v, false).each { |subkey, subvalue|
-                flattened_params["#{k}[]#{subkey}"] = subvalue
-              }
-            }
+            value.map do |v|
+
+              if (v.is_a?(Hash))
+                build_multipart(v, false).each { |subkey, subvalue|
+                  flattened_params["#{k}[]#{subkey}"] = subvalue
+                }
+              else
+                flattened_params["#{k}[]"] = value
+              end
+
+            end
           when Hash
             build_multipart(value, false).each { |subkey, subvalue|
               flattened_params[k + subkey] = subvalue
@@ -66,35 +75,55 @@ module Rack
         end
 
         if first
-          flattened_params.map { |name, file|
-            if file.respond_to?(:original_filename)
-              ::File.open(file.path, "rb") do |f|
-                f.set_encoding(Encoding::BINARY) if f.respond_to?(:set_encoding)
+          build_parts(flattened_params)
+        else
+          flattened_params
+        end
+      end
+
+      module_function :build_multipart
+
+    private
+      def build_parts(parameters)
+        parameters.map { |name, value|
+          if value.respond_to?(:original_filename)
+            build_file_part(name, value)
+
+          elsif value.is_a?(Array) and value.all? { |v| v.respond_to?(:original_filename) }
+            value.map do |v|
+              build_file_part(name, v)
+            end.join
+
+          else
+            build_primitive_part(name, value)
+          end
+
+        }.join + "--#{MULTIPART_BOUNDARY}--\r"
+      end
+
+      def build_primitive_part(parameter_name, value)
 <<-EOF
 --#{MULTIPART_BOUNDARY}\r
-Content-Disposition: form-data; name="#{name}"; filename="#{escape(file.original_filename)}"\r
-Content-Type: #{file.content_type}\r
-Content-Length: #{::File.stat(file.path).size}\r
+Content-Disposition: form-data; name="#{parameter_name}"\r
 \r
-#{f.read}\r
+#{value}\r
 EOF
-              end
-            else
+      end
+
+      def build_file_part(parameter_name, uploaded_file)
+        ::File.open(uploaded_file.path, "rb") do |physical_file|
+          physical_file.set_encoding(Encoding::BINARY) if physical_file.respond_to?(:set_encoding)
 <<-EOF
 --#{MULTIPART_BOUNDARY}\r
-Content-Disposition: form-data; name="#{name}"\r
+Content-Disposition: form-data; name="#{parameter_name}"; filename="#{escape(uploaded_file.original_filename)}"\r
+Content-Type: #{uploaded_file.content_type}\r
+Content-Length: #{::File.stat(uploaded_file.path).size}\r
 \r
-#{file}\r
+#{physical_file.read}\r
 EOF
-            end
-          }.join + "--#{MULTIPART_BOUNDARY}--\r"
-        else
-          flattened_params
         end
       end
 
-      module_function :build_multipart
-
     end
 
   end

data/rack-test.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rack-test}
-  s.version = "0.5.3"
+  s.version = "0.5.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bryan Helmkamp"]
-  s.date = %q{2009-11-27}
+  s.date = %q{2010-05-26}
   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
@@ -32,6 +32,7 @@ request helpers feature.}
     "lib/rack/test/uploaded_file.rb",
     "lib/rack/test/utils.rb",
     "rack-test.gemspec",
+    "spec/fixtures/bar.txt",
     "spec/fixtures/config.ru",
     "spec/fixtures/fake_app.rb",
     "spec/fixtures/foo.txt",
@@ -46,7 +47,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.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Simple testing API built on Rack}
   s.test_files = [
     "spec/fixtures/fake_app.rb",
@@ -62,7 +63,7 @@ request helpers feature.}
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rack>, [">= 1.0"])
     else
       s.add_dependency(%q<rack>, [">= 1.0"])

data/spec/fixtures/bar.txt

@@ -0,0 +1 @@
+baz

data/spec/fixtures/fake_app.rb

@@ -3,7 +3,7 @@ require "sinatra/base"
 module Rack
   module Test
 
-    class FakeApp < Sinatra::Default
+    class FakeApp < Sinatra::Base
       head "/" do
         "meh"
       end

data/spec/rack/test/cookie_spec.rb

@@ -161,6 +161,12 @@ describe Rack::Test::Session do
       last_request.cookies.should == { "value" => "10", "foo" => "bar" }
     end
 
+    it "skips emtpy string cookies" do
+      set_cookie "value=10\n\nfoo=bar"
+      get "/cookies/show"
+      last_request.cookies.should == { "value" => "10", "foo" => "bar" }
+    end
+
     it "parses multiple cookies properly" do
       get "/cookies/set-multiple"
       get "/cookies/show"

data/spec/rack/test/multipart_spec.rb

@@ -6,10 +6,18 @@ describe Rack::Test::Session do
     File.dirname(__FILE__) + "/../../fixtures/foo.txt"
   end
 
+  def second_test_file_path
+    File.dirname(__FILE__) + "/../../fixtures/bar.txt"
+  end
+
   def uploaded_file
     Rack::Test::UploadedFile.new(test_file_path)
   end
 
+  def second_uploaded_file
+    Rack::Test::UploadedFile.new(second_test_file_path)
+  end
+
   context "uploading a file" do
     it "sends the multipart/form-data content type" do
       post "/", "photo" => uploaded_file
@@ -84,4 +92,43 @@ describe Rack::Test::Session do
     end
   end
 
+
+  context "uploading two files" do
+    it "sends the multipart/form-data content type" do
+      post "/", "photos" => [uploaded_file, second_uploaded_file]
+      last_request.env["CONTENT_TYPE"].should include("multipart/form-data;")
+    end
+
+    it "sends files with the filename" do
+      post "/", "photos" => [uploaded_file, second_uploaded_file]
+      last_request.POST["photos"].collect{|photo| photo[:filename]}.should == ["foo.txt", "bar.txt"]
+    end
+
+    it "sends files with the text/plain MIME type by default" do
+      post "/", "photos" => [uploaded_file, second_uploaded_file]
+      last_request.POST["photos"].collect{|photo| photo[:type]}.should == ["text/plain", "text/plain"]
+    end
+
+    it "sends files with the right names" do
+      post "/", "photos" => [uploaded_file, second_uploaded_file]
+      last_request.POST["photos"].all?{|photo| photo[:name].should == "photos[]" }
+    end
+
+    it "allows mixed content types" do
+      image_file = Rack::Test::UploadedFile.new(test_file_path, "image/jpeg")
+
+      post "/", "photos" => [uploaded_file, image_file]
+      last_request.POST["photos"].collect{|photo| photo[:type]}.should == ["text/plain", "image/jpeg"]
+    end
+
+    it "sends files with a Content-Length in the header" do
+      post "/", "photos" => [uploaded_file, second_uploaded_file]
+      last_request.POST["photos"].all?{|photo| photo[:head].should include("Content-Length: 4") }
+    end
+
+    it "sends both files as Tempfiles" do
+      post "/", "photos" => [uploaded_file, second_uploaded_file]
+      last_request.POST["photos"].all?{|photo| photo[:tempfile].should be_a(::Tempfile) }
+    end
+  end
 end

data/spec/rack/test/utils_spec.rb

@@ -33,6 +33,10 @@ describe Rack::Test::Utils do
       build_nested_query(:a => [1, 2]).should == "a[]=1&a[]=2"
     end
 
+    it "converts arrays with brackets '[]' in the name" do
+      build_nested_query("a[]" => [1, 2]).should == "a%5B%5D=1&a%5B%5D=2"
+    end
+
     it "converts nested hashes" do
       build_nested_query(:a => { :b => 1 }).should == "a[b]=1"
     end
@@ -63,6 +67,26 @@ describe Rack::Test::Utils do
       params["files"][:tempfile].read.should == "bar\n"
     end
 
+   it "builds multipart bodies from array of files" do
+      files = [Rack::Test::UploadedFile.new(multipart_file("foo.txt")), Rack::Test::UploadedFile.new(multipart_file("bar.txt"))]
+      data  = build_multipart("submit-name" => "Larry", "files" => files)
+
+      options = {
+        "CONTENT_TYPE" => "multipart/form-data; boundary=#{Rack::Test::MULTIPART_BOUNDARY}",
+        "CONTENT_LENGTH" => data.length.to_s,
+        :input => StringIO.new(data)
+      }
+      env = Rack::MockRequest.env_for("/", options)
+      params = Rack::Utils::Multipart.parse_multipart(env)
+      check params["submit-name"].should == "Larry"
+
+      check params["files"][0][:filename].should == "foo.txt"
+      params["files"][0][:tempfile].read.should == "bar\n"
+
+      check params["files"][1][:filename].should == "bar.txt"
+      params["files"][1][:tempfile].read.should == "baz\n"
+    end
+
     it "builds nested multipart bodies" do
       files = Rack::Test::UploadedFile.new(multipart_file("foo.txt"))
       data  = build_multipart("people" => [{"submit-name" => "Larry", "files" => files}])

data/spec/rack/test_spec.rb

@@ -212,6 +212,13 @@ describe Rack::Test::Session do
       last_request.env["HTTP_USER_AGENT"].should == "Firefox"
     end
 
+    it "sets a Content-Type to be sent with requests" do
+      header "Content-Type", "application/json"
+      request "/"
+
+      last_request.env["CONTENT_TYPE"].should == "application/json"
+    end
+
     it "persists across multiple requests" do
       header "User-Agent", "Firefox"
       request "/"

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-test
 version: !ruby/object:Gem::Version 
-  version: 0.5.3
+  hash: 3
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  - 4
+  version: 0.5.4
 platform: ruby
 authors: 
 - Bryan Helmkamp
@@ -9,19 +15,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-27 00:00:00 -05:00
+date: 2010-05-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
         version: "1.0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 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
@@ -51,6 +62,7 @@ files:
 - lib/rack/test/uploaded_file.rb
 - lib/rack/test/utils.rb
 - rack-test.gemspec
+- spec/fixtures/bar.txt
 - spec/fixtures/config.ru
 - spec/fixtures/fake_app.rb
 - spec/fixtures/foo.txt
@@ -71,21 +83,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: rack-test
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Simple testing API built on Rack