Ticket #3843: rails_url_rewriter.2.diff

actionpack/lib/action_controller/url_rewriter.rb

@@ -54 +54 @@
-        elements = []
-        query_string = ""
-
+        build_elements(hash, only_keys, elements)
+        
+        query_string << ("?" + elements.join("&")) unless elements.empty?
+        query_string
+      end
+      
+      # Used to build the path elements recusively
+      def build_elements(hash, only_keys, elements, key_prefix = nil, key_suffix = nil)
-        only_keys ||= hash.keys
-        
-        only_keys.each do |key|
-
+
+
-          key = CGI.escape key.to_s
-
-
+
+
+
+
+
-          else
-
+
+
+
+
+
+
-          end
-          value.each { |val| elements << "#{key}=#{Routing.extract_parameter_value(val)}" }
-        end
-        
-        query_string << ("?" + elements.join("&")) unless elements.empty?
-        query_string
-      end
+
-  end
-end

actionpack/test/controller/url_rewriter_test.rb

@@ -24 +24 @@
-    assert_query_equal '?x=hello+world', @rewriter.send(:build_query_string, {:x => 'hello world', :y => 'goodbye world'}, [:x])
-  end
-
+  # This test goes through the router recognition and back, 
+  # because the hash is not guaranteed to iterate in the same order,
+  # thus we can't compare the strings.
+  def test_nested_hashes
+    # Setup
+    test_hash = { "a_key" => {"b_key" => "b_key", "c_key" => "c_value", "d_key" => "d_value", "e_value" => { "f_key" => "f_value", "g_key" => "g_value"}}, "h_key" => "h_value" }
+    
+    # Perform the URL generation
+    url = @rewriter.send(:build_query_string, test_hash)
+    # (we need to kill the leading '?' as CGIMethods doesn't like that)
+    url = url[1..url.length]
+    
+    # Now parse back through the routing code 
+    result_hash = CGIMethods.parse_query_parameters(url)
+    
+    # Compare and assert
+    assert_equal test_hash, result_hash
+  end
+  
-  def test_overwrite_params
-    @params[:controller] = 'hi'
-    @params[:action] = 'bye'