Changeset 6082

Timestamp:

01/28/07 17:29:51 (2 years ago)

Author:

ulysses

Message:

Allow Routes to generate all urls for a set of options by specifying :generate_all => true. References #1739.

Files:

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

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Allow Routes to generate all urls for a set of options by specifying :generate_all => true. Allows caching to properly set or expire all paths for a resource. References #1739. [Nicholas Seckar]
-
-* Change the query parser to map empty GET params to "" rather than nil. Closes #5694. [Nicholas Seckar]

trunk/actionpack/lib/action_controller/routing.rb

@@ -1215 +1215 @@
-      def generate(options, recall = {}, method=:generate)
-        named_route_name = options.delete(:use_route)
+        generate_all = options.delete(:generate_all)
-        if named_route_name
-          named_route = named_routes[named_route_name]
@@ -1250 +1251 @@
-
-          raise RoutingError, "Need controller and action!" unless controller && action
+          
+          if generate_all
+            # Used by caching to expire all paths for a resource
+            return routes.collect do |route|
+              route.send(method, options, merged, expire_on)
+            end.compact
+          end
+          
-          # don't use the recalled keys when determining which routes to check
-          routes = routes_by_controller[controller][action][options.keys.sort_by { |x| x.object_id }]

trunk/actionpack/test/controller/routing_test.rb

@@ -1720 +1720 @@
-  end
-  
+  def test_generate_all
+    set.draw do |map|
+      map.connect 'show_post/:id', :controller => 'post', :action => 'show'
+      map.connect ':controller/:action/:id'
+    end
+    all = set.generate(
+      {:action => 'show', :id => 10, :generate_all => true},
+      {:controller => 'post', :action => 'show'}
+    )
+    assert_equal 2, all.length
+    assert_equal '/show_post/10', all.first
+    assert_equal '/post/show/10', all.last
+  end
+  
-end
-