Get rid of the instance-level URL rewriter

5 files changed, 25 insertions, 71 deletions

diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 7e0a833dfa..c43e560ac1 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -339,9 +339,13 @@ module ActionController
     def build_request_uri(action, parameters)
       unless @request.env["PATH_INFO"]
         options = @controller.__send__(:url_options).merge(parameters)
-        options.update(:only_path => true, :action => action, :relative_url_root => nil)
-        rewriter = ActionController::UrlRewriter.new(@request, parameters)
+        options.update(
+          :only_path => true,
+          :action => action,
+          :relative_url_root => nil,
+          :_path_segments => @request.symbolized_path_parameters)
 
+        rewriter = ActionController::UrlRewriter
         url, query_string = rewriter.rewrite(@router, options).split("?", 2)
 
         @request.env["SCRIPT_NAME"] = @controller.config.relative_url_root
diff --git a/actionpack/lib/action_controller/url_rewriter.rb b/actionpack/lib/action_controller/url_rewriter.rb
index 981865517f..b387d49593 100644
--- a/actionpack/lib/action_controller/url_rewriter.rb
+++ b/actionpack/lib/action_controller/url_rewriter.rb
@@ -2,37 +2,16 @@ require 'active_support/core_ext/hash/except'
 
 module ActionController
   # Rewrites URLs for Base.redirect_to and Base.url_for in the controller.
-  class UrlRewriter #:nodoc:
+  module UrlRewriter #:nodoc:
     RESERVED_OPTIONS = [:anchor, :params, :only_path, :host, :protocol, :port, :trailing_slash, :skip_relative_url_root]
 
-    def initialize(request, parameters)
-      @request, @parameters = request, parameters
-    end
-
-    def rewrite(router, options = {})
-      options[:host]     ||= @request.host_with_port
-      options[:protocol] ||= @request.protocol
-
-      self.class.rewrite(router, options, @request.symbolized_path_parameters) do |options|
-        process_path_options(options)
-      end
-    end
-
-    def to_str
-      "#{@request.protocol}, #{@request.host_with_port}, #{@request.path}, #{@parameters[:controller]}, #{@parameters[:action]}, #{@request.parameters.inspect}"
-    end
-
-    alias_method :to_s, :to_str
-
     # ROUTES TODO: Class method code smell
-    def self.rewrite(router, options, path_segments=nil)
+    def self.rewrite(router, options)
       handle_positional_args(options)
 
       rewritten_url = ""
 
-      # ROUTES TODO: Fix the tests
-      segments = options.delete(:_path_segments)
-      path_segments = path_segments ? path_segments.merge(segments || {}) : segments
+      path_segments = options.delete(:_path_segments)
 
       unless options[:only_path]
         rewritten_url << (options[:protocol] || "http")
@@ -81,18 +60,5 @@ module ActionController
       end
     end
 
-    # Given a Hash of options, generates a route
-    def process_path_options(options)
-      options = options.symbolize_keys
-      options.update(options[:params].symbolize_keys) if options[:params]
-
-      if (overwrite = options.delete(:overwrite_params))
-        options.update(@parameters.symbolize_keys)
-        options.update(overwrite.symbolize_keys)
-      end
-
-      options
-    end
-
   end
 end
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index 11ef3cdd92..2be91893d4 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -64,7 +64,7 @@ class PageCachingTest < ActionController::TestCase
     @controller.cache_store = :file_store, FILE_STORE_PATH
 
     @params = {:controller => 'posts', :action => 'index', :only_path => true, :skip_relative_url_root => true}
-    @rewriter = ActionController::UrlRewriter.new(@request, @params)
+    @rewriter = ActionController::UrlRewriter
 
     FileUtils.rm_rf(File.dirname(FILE_STORE_PATH))
     FileUtils.mkdir_p(FILE_STORE_PATH)
diff --git a/actionpack/test/controller/url_rewriter_test.rb b/actionpack/test/controller/url_rewriter_test.rb
index 199b824a7a..3bc8bec3fb 100644
--- a/actionpack/test/controller/url_rewriter_test.rb
+++ b/actionpack/test/controller/url_rewriter_test.rb
@@ -4,10 +4,24 @@ require 'controller/fake_controllers'
 ActionController::UrlRewriter
 
 class UrlRewriterTests < ActionController::TestCase
+  class Rewriter
+    def initialize(request)
+      @options = {
+        :host => request.host_with_port,
+        :protocol => request.protocol
+      }
+    end
+
+    def rewrite(router, options)
+      options = @options.merge(options)
+      ActionController::UrlRewriter.rewrite(router, options)
+    end
+  end
+
   def setup
     @request = ActionController::TestRequest.new
     @params = {}
-    @rewriter = ActionController::UrlRewriter.new(@request, @params)
+    @rewriter = Rewriter.new(@request) #.new(@request, @params)
   end
 
   def test_port
@@ -61,34 +75,6 @@ class UrlRewriterTests < ActionController::TestCase
     )
   end
 
-  def test_overwrite_params
-    @params[:controller] = 'hi'
-    @params[:action] = 'bye'
-    @params[:id] = '2'
-
-    assert_equal '/hi/hi/2', @rewriter.rewrite(@router, :only_path => true, :overwrite_params => {:action => 'hi'})
-    u = @rewriter.rewrite(@router, :only_path => false, :overwrite_params => {:action => 'hi'})
-    assert_match %r(/hi/hi/2$), u
-  end
-
-  def test_overwrite_removes_original
-    @params[:controller] = 'search'
-    @params[:action] = 'list'
-    @params[:list_page] = 1
-
-    assert_equal '/search/list?list_page=2', @rewriter.rewrite(@router, :only_path => true, :overwrite_params => {"list_page" => 2})
-    u = @rewriter.rewrite(@router, :only_path => false, :overwrite_params => {:list_page => 2})
-    assert_equal 'http://test.host/search/list?list_page=2', u
-  end
-
-  def test_to_str
-    @params[:controller] = 'hi'
-    @params[:action] = 'bye'
-    @request.parameters[:id] = '2'
-
-    assert_equal 'http://, test.host, /, hi, bye, {"id"=>"2"}', @rewriter.to_str
-  end
-
   def test_trailing_slash
     options = {:controller => 'foo', :action => 'bar', :id => '3', :only_path => true}
     assert_equal '/foo/bar/3', @rewriter.rewrite(@router, options)
diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb
index 38ab5521fe..165cb655da 100644
--- a/actionpack/test/template/url_helper_test.rb
+++ b/actionpack/test/template/url_helper_test.rb
@@ -122,7 +122,6 @@ class UrlHelperTest < ActionView::TestCase
     url = {:controller => 'weblog', :action => 'show'}
     @controller = ActionController::Base.new
     @controller.request = ActionController::TestRequest.new
-    @controller.url = ActionController::UrlRewriter.new(@controller.request, url)
     assert_dom_equal(%q{<a href="/weblog/show">Test Link</a>}, link_to('Test Link', url))
   end
 
@@ -131,7 +130,6 @@ class UrlHelperTest < ActionView::TestCase
     url = {:controller => 'weblog', :action => 'show', :host => 'www.example.com'}
     @controller = ActionController::Base.new
     @controller.request = ActionController::TestRequest.new
-    @controller.url = ActionController::UrlRewriter.new(@controller.request, url)
     assert_dom_equal(%q{<a href="http://www.example.com/weblog/show">Test Link</a>}, link_to('Test Link', url))
   end