aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/routing
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2010-03-09 21:00:24 -0600
committerJoshua Peek <josh@joshpeek.com>2010-03-09 21:00:24 -0600
commit4d2470f7daad8cebd0a69f5ea0509a41af0596b8 (patch)
tree9d936a15be606aa53ddb027b09e77622bd851b84 /actionpack/lib/action_dispatch/routing
parente38ea982ff8fea5b616297b458ca2c669de0d659 (diff)
downloadrails-4d2470f7daad8cebd0a69f5ea0509a41af0596b8.tar.gz
rails-4d2470f7daad8cebd0a69f5ea0509a41af0596b8.tar.bz2
rails-4d2470f7daad8cebd0a69f5ea0509a41af0596b8.zip
RouteSet#rewrite => url_for
Diffstat (limited to 'actionpack/lib/action_dispatch/routing')
-rw-r--r--actionpack/lib/action_dispatch/routing/route_set.rb3
-rw-r--r--actionpack/lib/action_dispatch/routing/url_for.rb2
2 files changed, 2 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index aa1e25aa8b..2b9fc9e0de 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -403,8 +403,7 @@ module ActionDispatch
RESERVED_OPTIONS = [:anchor, :params, :only_path, :host, :protocol, :port, :trailing_slash, :skip_relative_url_root]
- # TODO: Terrible method name
- def rewrite(options)
+ def url_for(options)
handle_positional_args(options)
rewritten_url = ""
diff --git a/actionpack/lib/action_dispatch/routing/url_for.rb b/actionpack/lib/action_dispatch/routing/url_for.rb
index 0ba04316d7..7ebd5e44e9 100644
--- a/actionpack/lib/action_dispatch/routing/url_for.rb
+++ b/actionpack/lib/action_dispatch/routing/url_for.rb
@@ -131,7 +131,7 @@ module ActionDispatch
when String
options
when nil, Hash
- _router.rewrite(url_options.merge(options || {}))
+ _router.url_for(url_options.merge(options || {}))
else
polymorphic_url(options)
end