Ticket #11460: hash_for_method_with_ordered_parameters_bug_patch.diff

test/controller/routing_test.rb

@@ -1588 +1588 @@
-      controller.send(:hash_for_show_path, :id => 5)
-    )
-  end
+  
+    def test_named_route_hash_access_method_with_ordered_parameters
+    controller = setup_named_route_test
-
+    assert_equal(
+      { :controller => 'people', :action => 'show', :id => 5, :use_route => :show, :only_path => false },
+      controller.send(:hash_for_show_url, 5)
+    )
+    assert_equal(
+      { :controller => 'people', :action => 'show', :id => 5, :use_route => :show, :only_path => true },
+      controller.send(:hash_for_show_path, 5)
+    )
+    assert_equal(
+      { :controller => 'people', :action => 'multi', :foo => 5, 
+        :bar=> "text", :id=>69, :use_route => :multi, :only_path => false },
+      controller.send(:hash_for_multi_url, 5, "text", 69)
+    )
+    assert_equal(
+      { :controller => 'people', :action => 'multi', :foo => 5, 
+        :bar=> "text", :id=>69, :use_route => :multi, :only_path => true },
+      controller.send(:hash_for_multi_path, 5, "text", 69)
+    )
+
+  end
+
-  def test_named_route_url_method
-    controller = setup_named_route_test
-    

lib/action_controller/routing/route_set.rb

@@ -138 +138 @@
-
-          def define_hash_access(route, name, kind, options)
-            selector = hash_access_name(name, kind)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-            # allow ordered parameters to be associated with corresponding
-            # dynamic segments, so you can do
-            #
-
+hash_for_
-            #
-            # instead of
-            #
-
+hash_for_
-            #
-            # Also allow options hash, so you can do
-            #
-
+hash_for_
-            #
-            @module.module_eval <<-end_eval # We use module_eval to avoid leaks
-              def #{selector}(*args)
-                #{generate_optimisation_block(route, kind)}
-
-                opts = if args.empty? || Hash === args.first
-                  args.first || {}
-                else
@@ -180 +164 @@
-                  end
-                  options.merge(args)
-                end
+                opts ? #{options.inspect}.merge(opts) : #{options.inspect}
+              end
+              protected :#{selector}
+            end_eval
+            helpers << selector
+          end
-
-
+
+
+
+
+
+
+
+
+
-              end
-              protected :#{selector}
-            end_eval