Merge pull request rails#9111 from jsomara/3-0-json-fix

Fix rails#8832 - Parse '{"person":[]}' JSON/XML as {'person' => []}.
dylanahsmith · Jan 30, 2013 · 10513d2 · 10513d2
2 parents 20c3b4b + f20b598
commit 10513d2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
@@ -263,9 +263,12 @@ def deep_munge(hash)
       hash.each do |k, v|
         case v
         when Array
+          if v.size > 0 && v.all?(&:nil?)
+            hash[k] = nil
+            next
+          end
           v.grep(Hash) { |x| deep_munge(x) }
           v.compact!
-          hash[k] = nil if v.empty?
         when Hash
           deep_munge(v)
         end

diff --git a/actionpack/test/dispatch/request/json_params_parsing_test.rb b/actionpack/test/dispatch/request/json_params_parsing_test.rb
@@ -31,6 +31,10 @@ def teardown
   end
 
   test "nils are stripped from collections" do
+    assert_parses(
+      {"person" => []},
+      "{\"person\":[]}", { 'CONTENT_TYPE' => 'application/json' }
+    )
     assert_parses(
       {"person" => nil},
       "{\"person\":[null]}", { 'CONTENT_TYPE' => 'application/json' }

diff --git a/actionpack/test/dispatch/request/xml_params_parsing_test.rb b/actionpack/test/dispatch/request/xml_params_parsing_test.rb
@@ -41,6 +41,9 @@ def assert_parses(expected, xml)
     assert_parses(
       {"hash" => { "person" => nil} },
       "<hash><person type=\"array\"><person nil=\"true\"/></person></hash>")
+    assert_parses(
+      {"hash" => { "person" => []} },
+      "<hash><person type=\"array\"></person></hash>")
     assert_parses(
       {"hash" => { "person" => ['foo']} },
       "<hash><person type=\"array\"><person>foo</person><person nil=\"true\"/></person>\n</hash>")