Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Add RouteSet#named_route so that RouteSet instance methods do not sha…

…dow available route names

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1834 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit bf0b7588ee4e32353e0dc10c2d1c3d2b9ea952c4 1 parent 6ed16ff
@seckar seckar authored
View
2  actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Added named_route method to RouteSet instances so that RouteSet instance methods do not prevent certain names from being used. [Nicholas Seckar]
+
* Fixed routes so that routes which do not specify :action in the path or in the requirements have a default of :action => 'index', In addition, fixed url generation so that :action => 'index' does not need to be provided for such urls. [Nicholas Seckar, Markjuh]
* Worked around a Safari bug where it wouldn't pass headers through if the response was zero length by having render :nothing return ' ' instead of ''
View
16 actionpack/lib/action_controller/routing.rb
@@ -573,13 +573,21 @@ def empty?() @routes.empty? end
def each(&block) @routes.each(&block) end
- def method_missing(name, *args)
- return super(name, *args) unless (1..2).include?(args.length)
-
- route = connect(*args)
+ # Defines a new named route with the provided name and arguments.
+ # This method need only be used when you wish to use a name that a RouteSet instance
+ # method exists for, such as categories.
+ #
+ # For example, map.categories '/categories', :controller => 'categories' will not work
+ # due to RouteSet#categories.
+ def named_route(name, path, hash = {})
+ route = connect(path, hash)
NamedRoutes.name_route(route, name)
route
end
+
+ def method_missing(name, *args)
+ (1..2).include?(args.length) ? named_route(name, *args) : super(name, *args)
+ end
def extra_keys(options, recall = {})
generate(options.dup, recall).last.keys
View
12 actionpack/test/controller/routing_test.rb
@@ -862,6 +862,18 @@ def test_url_generated_when_forgetting_action
assert_equal ['/content/hi', {}], rs.generate({:controller => 'content', :action => 'hi'})
end
end
+
+ def test_named_route_method
+ rs.draw do
+ assert_raises(ArgumentError) { rs.categories 'categories', :controller => 'content', :action => 'categories' }
+
+ rs.named_route :categories, 'categories', :controller => 'content', :action => 'categories'
+ rs.connect ':controller/:action/:id'
+ end
+
+ assert_equal ['/categories', {}], rs.generate(:controller => 'content', :action => 'categories')
+ assert_equal ['/content/hi', {}], rs.generate({:controller => 'content', :action => 'hi'})
+ end
end
Please sign in to comment.
Something went wrong with that request. Please try again.