Arrays sent via multipart posts are converted to strings #1032 [dj@om…

…elia.org] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1397 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
rails · Jun 10, 2005 · f6ec9e3 · f6ec9e3
1 parent 6cff848
commit f6ec9e3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Arrays sent via multipart posts are converted to strings #1032 [dj@omelia.org]
+
 * render(:layout => true) is a synonym for render(:layout => nil)
 
 * Make sure the benchmarking render method always returns the output of the render.

diff --git a/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb b/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb
@@ -69,7 +69,7 @@ def CGIMethods.get_typed_value(value)
         # Value as part of a multipart request
         value.read
       elsif value.class == Array
-          value
+        value.collect { | e | e.respond_to?(:read) ? e.read : e }
       else
         # Standard value (not a multipart request)
         value.to_s

diff --git a/actionpack/test/controller/cgi_test.rb b/actionpack/test/controller/cgi_test.rb
@@ -94,12 +94,16 @@ def test_parse_params_from_multipart_upload
 
     input = {
       "something" => [ StringIO.new("") ],
+      "array_of_stringios" => [[ StringIO.new("One"), StringIO.new("Two") ]],
+      "mixed_types_array" => [[ StringIO.new("Three"), "NotStringIO" ]],
       "products[string]" => [ StringIO.new("Apple Computer") ],
       "products[file]" => [ mock_file ]
     }
 
     expected_output =  {
       "something" => "",
+      "array_of_stringios" => ["One", "Two"],
+      "mixed_types_array" => [ "Three", "NotStringIO" ],
       "products"  => {
         "string"  => "Apple Computer",
         "file"    => mock_file
@@ -169,3 +173,4 @@ def test_parse_params_with_unmatched_brackets_and_array
     assert_equal expected, CGIMethods.parse_request_parameters(input)
   end
 end
+