Merge pull request #1 from econsultancy/econsultancy-20110708

Fix support for params with arrays of hashes in multipart forms.

lib/rack/test/utils.rb

@@ -58,7 +58,8 @@ def build_multipart(params, first = true)
 
               if (v.is_a?(Hash))
                 build_multipart(v, false).each { |subkey, subvalue|
-                  flattened_params["#{k}[]#{subkey}"] = subvalue
+                  flattened_params["#{k}[]#{subkey}"] ||= []
+                  flattened_params["#{k}[]#{subkey}"] << subvalue
                 }
               else
                 flattened_params["#{k}[]"] = value

spec/rack/test/utils_spec.rb

@@ -104,6 +104,22 @@
       check params["foo"].should == ["1", "2"]
     end
 
+    it "builds nested multipart bodies with an array of hashes" do
+      files = Rack::Test::UploadedFile.new(multipart_file("foo.txt"))
+      data  = build_multipart("files" => files, "foo" => [{"id" => "1"}, {"id" => "2"}])
+
+      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["files"][:filename].should == "foo.txt"
+      params["files"][:tempfile].read.should == "bar\n"
+      check params["foo"].should == [{"id" => "1"}, {"id" => "2"}]
+    end
+
     it "returns nil if no UploadedFiles were used" do
       data = build_multipart("people" => [{"submit-name" => "Larry", "files" => "contents"}])
       data.should be_nil