Added :port and :host handling to UrlRewriter (which unified url_for usage, regardless of whether it's called in view or controller) #7616 [alancfrancis]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6235 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

3 files changed, 32 insertions, 2 deletions

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 59a3ab413e..557ddfb633 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Added :port and :host handling to UrlRewriter (which unified url_for usage, regardless of whether it's called in view or controller) #7616 [alancfrancis]
+
 * Allow send_file/send_data to use a registered mime type as the :type parameter #7620 [jonathan]
 
 * Allow routing requirements on map.resource(s) #7633 [quixoten]. Example:
diff --git a/actionpack/lib/action_controller/url_rewriter.rb b/actionpack/lib/action_controller/url_rewriter.rb
index 71f87ad373..0d13f2721f 100644
--- a/actionpack/lib/action_controller/url_rewriter.rb
+++ b/actionpack/lib/action_controller/url_rewriter.rb
@@ -43,7 +43,7 @@ module ActionController
       url = ''
       unless options.delete :only_path
         url << (options.delete(:protocol) || 'http')
-        url << '://'
+        url << '://' unless url.match("://") #dont add separator if its already been specified in :protocol 
         
         raise "Missing host to link to! Please provide :host parameter or set default_url_options[:host]" unless options[:host]
         url << options.delete(:host)
@@ -60,7 +60,7 @@ module ActionController
   
   # Rewrites URLs for Base.redirect_to and Base.url_for in the controller.
   class UrlRewriter #:nodoc:
-    RESERVED_OPTIONS = [:anchor, :params, :only_path, :host, :protocol, :trailing_slash, :skip_relative_url_root]
+    RESERVED_OPTIONS = [:anchor, :params, :only_path, :host, :protocol, :port, :trailing_slash, :skip_relative_url_root]
     def initialize(request, parameters)
       @request, @parameters = request, parameters
     end
@@ -80,7 +80,9 @@ module ActionController
         rewritten_url = ""
         unless options[:only_path]
           rewritten_url << (options[:protocol] || @request.protocol)
+          rewritten_url << "://" unless rewritten_url.match("://")
           rewritten_url << (options[:host] || @request.host_with_port)
+          rewritten_url << ":#{options.delete(:port)}" if options.key?(:port)
         end
 
         rewritten_url << @request.relative_url_root.to_s unless options[:skip_relative_url_root]
diff --git a/actionpack/test/controller/url_rewriter_test.rb b/actionpack/test/controller/url_rewriter_test.rb
index d3bee976a2..f24e5c9c37 100644
--- a/actionpack/test/controller/url_rewriter_test.rb
+++ b/actionpack/test/controller/url_rewriter_test.rb
@@ -7,6 +7,22 @@ class UrlRewriterTests < Test::Unit::TestCase
     @rewriter = ActionController::UrlRewriter.new(@request, @params)
   end 
 
+  def test_port
+    assert_equal('http://test.host:1271/c/a/i',
+      @rewriter.rewrite(:controller => 'c', :action => 'a', :id => 'i', :port => 1271)
+    )
+  end
+
+  def test_protocol_with_and_without_separator
+    assert_equal('https://test.host/c/a/i',
+      @rewriter.rewrite(:protocol => 'https', :controller => 'c', :action => 'a', :id => 'i')
+    )
+
+    assert_equal('https://test.host/c/a/i',
+      @rewriter.rewrite(:protocol => 'https://', :controller => 'c', :action => 'a', :id => 'i')
+    )
+  end
+  
   def test_overwrite_params
     @params[:controller] = 'hi'
     @params[:action] = 'bye'
@@ -85,6 +101,16 @@ class UrlWriterTests < Test::Unit::TestCase
     )
   end
   
+  def test_protocol_with_and_without_separator
+    add_host!
+    assert_equal('https://www.basecamphq.com/c/a/i',
+      W.new.url_for(:controller => 'c', :action => 'a', :id => 'i', :protocol => 'https')
+    )
+    assert_equal('https://www.basecamphq.com/c/a/i',
+      W.new.url_for(:controller => 'c', :action => 'a', :id => 'i', :protocol => 'https://')
+    )
+  end
+
   def test_named_route
     ActionController::Routing::Routes.draw do |map|
       map.home '/home/sweet/home/:user', :controller => 'home', :action => 'index'