Changeset 6235

Timestamp:

02/25/07 20:22:09 (2 years ago)

Author:

david

Message:

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

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/url_rewriter.rb (modified) (3 diffs)
• trunk/actionpack/test/controller/url_rewriter_test.rb (modified) (2 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*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]

trunk/actionpack/lib/action_controller/url_rewriter.rb

@@ -44 +44 @@
-      unless options.delete :only_path
-        url << (options.delete(:protocol) || 'http')
-
+ 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]
@@ -61 +61 @@
-  # Rewrites URLs for Base.redirect_to and Base.url_for in the controller.
-  class UrlRewriter #:nodoc:
-
+port, :
-    def initialize(request, parameters)
-      @request, @parameters = request, parameters
@@ -81 +81 @@
-        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
-

trunk/actionpack/test/controller/url_rewriter_test.rb

@@ -8 +8 @@
-  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'
@@ -86 +102 @@
-  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|