Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Update UrlWriter to support :only_path.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5054 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 00685ad8fdc9f15d935aebe52597037f3ca93be8 1 parent 9365997
@seckar seckar authored
View
2  actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Update UrlWriter to support :only_path. [Nicholas Seckar, Dave Thomas]
+
* Fixed JavaScriptHelper#link_to_function and JavaScriptHelper#button_to_function to have the script argument be optional [DHH]. So what used to require a nil, like this:
link_to("Hider", nil, :class => "hider_link") { |p| p[:something].hide }
View
17 actionpack/lib/action_controller/url_rewriter.rb
@@ -40,13 +40,18 @@ def self.included(base) #:nodoc:
def url_for(options)
options = self.class.default_url_options.merge(options)
- raise "Missing host to link to! Please provide :host parameter or set default_url_options[:host]" unless options[:host]
-
url = ''
- url << (options.delete(:protocol) || 'http')
- url << '://'
- url << options.delete(:host)
- url << ":#{options.delete(:port)}" if options.key?(:port)
+ unless options.delete :only_path
+ url << (options.delete(:protocol) || 'http')
+ url << '://'
+
+ raise "Missing host to link to! Please provide :host parameter or set default_url_options[:host]" unless options[:host]
+ url << options.delete(:host)
+ url << ":#{options.delete(:port)}" if options.key?(:port)
+ else
+ # Delete the unused options to prevent their appearance in the query string
+ [:protocol, :host, :port].each { |k| options.delete k }
+ end
url << Routing::Routes.generate(options, {})
return url
end
View
26 actionpack/test/controller/url_rewriter_test.rb
@@ -84,10 +84,32 @@ def test_named_route
# We need to create a new class in order to install the new named route.
kls = Class.new { include ActionController::UrlWriter }
- assert kls.new.respond_to?(:home_url)
+ controller = kls.new
+ assert controller.respond_to?(:home_url)
assert_equal 'http://www.basecamphq.com/home/sweet/home/again',
- kls.new.send(:home_url, :host => 'www.basecamphq.com', :user => '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'))
ensure
ActionController::Routing::Routes.load!
end
+
+ def test_only_path
+ ActionController::Routing::Routes.draw do |map|
+ map.home '/home/sweet/home/:user'
+ 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 }
+ controller = kls.new
+ assert controller.respond_to?(:home_url)
+ assert_equal '/brave/new/world',
+ controller.send(:url_for, :controller => 'brave', :action => 'new', :id => 'world', :only_path => true)
+
+ assert_equal("/home/sweet/home/alabama", controller.send(:home_url, :user => 'alabama', :host => 'unused', :only_path => true))
+ ensure
+ ActionController::Routing::Routes.load!
+ end
+
end
Please sign in to comment.
Something went wrong with that request. Please try again.