Changeset 8616

Timestamp:

01/10/08 02:51:09 (1 year ago)

Author:

bitsweat

Message:

UrlWriter respects relative_url_root. Closes #10748.

Files:

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

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* UrlWriter respects relative_url_root.  #10748 [Cheah Chu Yeow]
-
-* The asset_host block takes the controller request as an optional second argument. Example: use a single asset host for SSL requests.  #10549 [Cheah Chu Yeow, Peter B, Tom Taylor]

trunk/actionpack/lib/action_controller/url_rewriter.rb

@@ -1 @@
-  
+
-  # Write URLs from arbitrary places in your codebase, such as your mailers.
- 
+
-  # Example:
- 
+
-  #   class MyMailer
-  #     include ActionController::UrlWriter
-  #     default_url_options[:host] = 'www.basecamphq.com'
-     
+
-  #     def signup_url(token)
-  #       url_for(:controller => 'signup', action => 'index', :token => token)
-  #     end
-  #  end
- 
+
-  # In addition to providing +url_for+, named routes are also accessible after
-  # including UrlWriter.
@@ -20 +20 @@
-    mattr_accessor :default_url_options
-    self.default_url_options = {}
-
+
-    def self.included(base) #:nodoc:
- base 
+(base)
-      base.mattr_accessor :default_url_options
-      base.default_url_options ||= default_url_options
-    end
-
- 
+
+
-    # routes defined in routes.rb.  The following options are supported:
- 
+
-    # * <tt>:only_path</tt> If true, the relative url is returned. Defaults to false.
-    # * <tt>:protocol</tt> The protocol to connect to. Defaults to 'http'.
- 
- 
+
+
-    # * <tt>:port</tt> Optionally specify the port to connect to.
-    # * <tt>:anchor</tt> An anchor name to be appended to the path.
-
+
+
-    # Any other key(:controller, :action, etc...) given to <tt>url_for</tt> is forwarded to the Routes module.
- 
+
-    # Examples:
- 
+
-    #    url_for :controller => 'tasks', :action => 'testing', :host=>'somehost.org', :port=>'8080'    # => 'http://somehost.org:8080/tasks/testing'
-    #    url_for :controller => 'tasks', :action => 'testing', :host=>'somehost.org', :anchor => 'ok', :only_path => true    # => '/tasks/testing#ok'
-    #    url_for :controller => 'tasks', :action => 'testing', :host=>'somehost.org', :number => '33'  # => 'http://somehost.org/tasks/testing?number=33'
-    # 
-    def url_for(options)
-      options = self.class.default_url_options.merge(options)
-
+
-      url = ''
-
- :only_path
+(:only_path)
-        url << (options.delete(:protocol) || 'http')
- #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]
-
@@ -59 +59 @@
-        url << ":#{options.delete(:port)}" if options.key?(:port)
-      else
-
-].each { |k| options.delete k
+.
+, :skip_relative_url_root].each { |k| options.delete(k)
-      end
-
-
+
+
-      url << Routing::Routes.generate(options, {})
-      url << anchor if anchor
-
-return 
-    
+
+
-  end
-
+
-  # Rewrites URLs for Base.redirect_to and Base.url_for in the controller.
-  class UrlRewriter #:nodoc:
@@ -77 +78 @@
-      @request, @parameters = request, parameters
-    end
-
+
-    def rewrite(options = {})
-      rewrite_url(options)
@@ -124 +125 @@
-        Routing::Routes.generate(options, @request.symbolized_path_parameters)
-      end
-
+
-      def rewrite_authentication(options)
-        if options[:user] && options[:password]

trunk/actionpack/test/controller/url_rewriter_test.rb

@@ -150 +150 @@
-  end
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    ActionController::Routing::Routes.draw do |map|
-      map.no_args '/this/is/verbose', :controller => 'home', :action => 'index'
@@ -156 +168 @@
-      map.connect ':controller/:action/:id'
-    end
-
+
-    # We need to create a new class in order to install the new named route.
-    kls = Class.new { include ActionController::UrlWriter }
@@ -163 +175 @@
-    assert_equal 'http://www.basecamphq.com/home/sweet/home/again',
-      controller.send(:home_url, :host => 'www.basecamphq.com', :user => 'again')
-
+
-    assert_equal("/home/sweet/home/alabama", controller.send(:home_path, :user => 'alabama', :host => 'unused'))
-    assert_equal("http://www.basecamphq.com/home/sweet/home/alabama", controller.send(:home_url, :user => 'alabama', :host => 'www.basecamphq.com'))
@@ -170 +182 @@
-    ActionController::Routing::Routes.load!
-  end
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  def test_only_path
-    ActionController::Routing::Routes.draw do |map|