Ticket #10101: properly_handle_depth_first_array_param_order_as_from_prototype_form_serialize.r8628.diff

activesupport/lib/active_support/core_ext/hash/indifferent_access.rb

@@ -80 +80 @@
-      when Hash
-        value.with_indifferent_access
-      when Array
-
+
+
+
+
+
-      else
-        value
-      end
@@ -92 +96 @@
-    module Hash #:nodoc:
-      module IndifferentAccess #:nodoc:
-        def with_indifferent_access
+          return self if self.is_a?(HashWithIndifferentAccess)
+
-          hash = HashWithIndifferentAccess.new(self)
-          hash.default = self.default
-          hash

actionpack/test/controller/request_test.rb

@@ -456 +456 @@
-    )
-  end
-
+  def test_deep_query_string_with_array_of_hashes_with_multiple_pairs_in_depth_first_order
+    assert_equal(
+      {'x' => {'y' => [{'z' => '10', 'w' => 'a'}, {'z' => '20', 'w' => 'b'}]}},
+      ActionController::AbstractRequest.parse_query_parameters('x[y][][z]=10&x[y][][z]=20&x[y][][w]=a&x[y][][w]=b')
+    )
+  end
+
+  def test_deep_query_string_with_multiple_pairs_in_breadth_first_order_cannot_have_holes
+    assert_equal(
+      {'x' => {'y' => [{'z' => '10', 'w' => 'a'}, {'z' => '20', 'w' => 'c'}, {'z' => '30'}]}},
+      ActionController::AbstractRequest.parse_query_parameters('x[y][][z]=10&x[y][][w]=a&x[y][][z]=20&x[y][][z]=30&x[y][][w]=c')
+    )
+  end
+  
+  def test_deep_query_string_lots_of_arrays_and_hashes
+    assert_equal(
+      {"a" => {"b" => [{"c" => {"d" => ["1"]}}, {"c" => {"d" => ["2"]}}, {"c" => {"d" => ["3"]}}]}},
+      ActionController::AbstractRequest.parse_query_parameters('a[b][][c][d][]=1&a[b][][c][d][]=2&a[b][][c][d][]=3')
+    )
+  end
+
-  def test_query_string_with_nil
-    assert_equal(
-      { "action" => "create_customer", "full_name" => ''},

actionpack/lib/action_controller/request.rb

@@ -602 +602 @@
-    end
-  end
-
+  # RADAR result of refactoring parser to properly handle array params in 
+  # depth-first order (as returned by Prototype 1.5.1+) is that if array
+  # params are in breadth-first order, all rows must have all keys for
+  # the result to match that of the previous parser.
+  # ie, "x[][a]=a1&x[][b]=b1&x[][a]=a2&x[][a]=a3&x[][b]=b3"
+  # will parse to {x=>[{a=>'a1', b=>'b1}, {a=>'a2', b=>'b3'}, {a=>'a3'}]}
+  # not {x=>[{a=>'a1', b=>'b1}, {a=>'a2'}, {a=>'a3', b=>'b3'}]} as before.
+  # However the previous parser and this one return the same result when
+  # the "hole" is the first param:
+  # 'x[][a]=a1&x[][b]=b1&x[][b]=b2&x[][a]=a3&x[][b]=b3' will parse to
+  # {"x"=>[{"a"=>"a1", "b"=>"b1"}, {"a"=>"a3", "b"=>"b2"}, {"b"=>"b3"}]}
+  # with both parsers.
+  #
+  # Handle new checkbox hack (which prepends the method_name component of the name
+  # of the hidden field element with '!').
+  #  
-  class UrlEncodedPairParser < StringScanner #:nodoc:
-
-
+
-    def initialize(pairs = [])
-      super('')
-
+
+
+
-      pairs.each { |key, value| parse(key, value) }
-    end
-
-    KEY_REGEXP = %r{([^\[\]=&]+)}
-+
-
+*
+
-    # Parse the query string
-    def parse(key, value)
+      pointer = @result
-      self.string = key
-
-
-
-
-
-
-
+
+
-      until eos?
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            else
-
-
+
-            end
-          else
-
+
+
+
+
-          end
-
-
-
-
+
+
+
+
+
+
+
+
+
-        else
-
+
+
-        end
-
-        return value
-      end
+      @last_key = checkbox_key ? nil : prev_key
+    end
-
-
-
-
+
+
+
+
-  end
-
-  module UploadedFile