Changeset 8169

Timestamp:

11/20/07 21:25:25 (1 year ago)

Author:

nzkoz

Message:

Ensure that the routing optimisation code isn't used when additional arguments are passed to the named route. Closes #10209 [bscofield, Koz]

Files:

• trunk/actionpack/lib/action_controller/routing.rb (modified) (3 diffs)
• trunk/actionpack/test/controller/routing_test.rb (modified) (1 diff)

trunk/actionpack/lib/action_controller/routing.rb

@@ -273 +273 @@
-
-    HTTP_METHODS = [:get, :head, :post, :put, :delete]
+
+    ALLOWED_REQUIREMENTS_FOR_OPTIMISATION = [:controller, :action].to_set
-
-    # The root paths which may contain controller files
@@ -354 +356 @@
-        @requirements = {}
-        @conditions = {}
+        @optimise = true
-      end
-
@@ -1022 +1025 @@
-        route.conditions = conditions
-
+        if !route.significant_keys.include?(:action) && !route.requirements[:action]
+          route.requirements[:action] = "index"
+          route.significant_keys << :action
+        end
+
-        # Routes cannot use the current string interpolation method
-        # if there are user-supplied :requirements as the interpolation
-        # code won't raise RoutingErrors when generating
-
-
-
-
+
+
-        end
-

trunk/actionpack/test/controller/routing_test.rb

@@ -213 +213 @@
-      x = setup_for_named_route
-      x.expects(:url_for).never
-# 
+
-      x.send(:users_path)
-# 
+
-      x.send(:user_path, 3, :bar=>"foo")
-    end
+    
+    def test_optimized_named_route_with_host 
+        rs.add_named_route :pages, 'pages', :controller => 'content', :action => 'show_page', :host => 'foo.com' 
+        x = setup_for_named_route 
+        x.expects(:url_for).with(:host => 'foo.com', :only_path => false, :controller => 'content', :action => 'show_page', :use_route => :pages).once
+      x.send(:pages_url)
+    end
+    
-  end
-