Ticket #4947: url_rewriter_patch2.diff

test/controller/url_rewriter_test.rb

@@ -10 +10 @@
-  def test_simple_build_query_string
-    assert_query_equal '?x=1&y=2', @rewriter.send(:build_query_string, :x => '1', :y => '2')
-  end
+
-  def test_convert_ints_build_query_string
-    assert_query_equal '?x=1&y=2', @rewriter.send(:build_query_string, :x => 1, :y => 2)
-  end
+
-  def test_escape_spaces_build_query_string
-    assert_query_equal '?x=hello+world&y=goodbye+world', @rewriter.send(:build_query_string, :x => 'hello world', :y => 'goodbye world')
-  end
+  
-  def test_expand_array_build_query_string
-    assert_query_equal '?x[]=1&x[]=2', @rewriter.send(:build_query_string, :x => [1, 2])
-  end
@@ -24 +27 @@
-    assert_query_equal '?x=hello+world', @rewriter.send(:build_query_string, {:x => 'hello world', :y => 'goodbye world'}, [:x])
-  end
-
+  def test_expand_params_into_parent_with_unescaped_parent_key
+    output = {"some key[a]" => 2, "some key[b]" => 3 }
+    assert_equal output, @rewriter.send(:build_query_string, {:a => 2, :b => 3}, nil, parent = "some key")
+  end
+  
+  def test_expand_deeply_nested_params
+    assert_query_equal '?a=1&b=2&c[a]=4&c[b]=5', @rewriter.send(:build_query_string, {:a => 1, :b => 2, :c => {:a => 4, :b => 5}})
+  end
+  
+  def test_expand_hashes_within_arrays
+    assert_query_equal "?a=1&b=2&c[]=a4b5", @rewriter.send(:build_query_string, {:a => 1, :b => 2, :c => [{:a => 4, :b => 5}] })
+  end
+  
-  def test_overwrite_params
-    @params[:controller] = 'hi'
-    @params[:action] = 'bye'

lib/action_controller/url_rewriter.rb

@@ -49 +49 @@
-      end
-
-      # Returns a query string with escaped keys and values from the passed hash. If the passed hash contains an "id" it'll
-
-def build_query_string(hash, only_keys = nil)
-  elements = []
-  query_string = ""
-
+ If parent is passed, it will return an array of
+# parameters, keyed into the parent. Both keys and values are escaped. It will expand nested hashes of unlimited depth,
+# but will not expand the hashes within arrays.
+def build_query_string (hash, only_keys = nil, parent = nil)
+
-        only_keys ||= hash.keys
-        
-
-
-
-
-
+
+
+
+
+
+
-          else
-value = [ value 
+params[param_key] = hash[key
-          end
-          value.each { |val| elements << "#{key}=#{Routing.extract_parameter_value(val)}" }
-        end
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      end
-  end
-end