From 4d2470f7daad8cebd0a69f5ea0509a41af0596b8 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 9 Mar 2010 21:00:24 -0600
Subject: RouteSet#rewrite => url_for

---
 actionpack/lib/action_dispatch/routing/route_set.rb | 3 +--
 actionpack/lib/action_dispatch/routing/url_for.rb   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'actionpack/lib/action_dispatch')

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
-- 
cgit v1.2.3