TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Extended url_for to handle specifying which router should be used.

Browse Source 
A few examples:
url_for Blog::Engine, :posts_path
url_for Blog::Engine, @post
url_for Blog::Engine, :action => "main", :controller => "index"
This commit is contained in:
Piotr Sarnacki 2010-07-14 00:46:42 +02:00
parent b697ba9fd7
commit b53efd2105
7 changed files with 136 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
View File

@ -111,7 +111,7 @@ def polymorphic_url(record_or_hash_or_array, options = {})
args.last.kind_of?(Hash) ? args.last.merge!(url_options) : args << url_options
end
send(named_route, *args)
url_for _routes.url_helpers.__send__("hash_for_#{named_route}", *args)
end
# Returns the path component of a URL for the given record. It uses

24
actionpack/lib/action_dispatch/routing/route_set.rb
View File

@ -158,10 +158,17 @@ def define_hash_access(route, name, kind, options)
# We use module_eval to avoid leaks
@module.module_eval <<-END_EVAL, __FILE__, __LINE__ + 1
def #{selector}(options = nil) # def hash_for_users_url(options = nil)
options ? #{options.inspect}.merge(options) : #{options.inspect} # options ? {:only_path=>false}.merge(options) : {:only_path=>false}
end # end
protected :#{selector} # protected :hash_for_users_url
def #{selector}(*args)
options = args.extract_options!
if args.any?
options[:_positional_args] = args
options[:_positional_keys] = #{route.segment_keys.inspect}
end
options ? #{options.inspect}.merge(options) : #{options.inspect}
end
protected :#{selector}
END_EVAL
helpers << selector
end
@ -185,14 +192,7 @@ def define_url_helper(route, name, kind, options)
@module.module_eval <<-END_EVAL, __FILE__, __LINE__ + 1
def #{selector}(*args)
options = #{hash_access_method}(args.extract_options!)
if args.any?
options[:_positional_args] = args
options[:_positional_keys] = #{route.segment_keys.inspect}
end
url_for(options)
url_for(#{hash_access_method}(*args))
end
END_EVAL
helpers << selector

45
actionpack/lib/action_dispatch/routing/url_for.rb
View File

@ -123,27 +123,40 @@ def url_options
# url_for :controller => 'tasks', :action => 'testing', :host=>'somehost.org', :anchor => 'ok', :only_path => true # => '/tasks/testing#ok'
# url_for :controller => 'tasks', :action => 'testing', :trailing_slash=>true # => 'http://somehost.org/tasks/testing/'
# url_for :controller => 'tasks', :action => 'testing', :host=>'somehost.org', :number => '33' # => 'http://somehost.org/tasks/testing?number=33'
def url_for(options = nil)
case options
when String
options
when nil, Hash
routes = (options ? options.delete(:routes) : nil) || _routes
_with_routes(routes) do
routes.url_for((options || {}).reverse_merge!(url_options).symbolize_keys)
def url_for(*args)
if args.first.respond_to?(:routes)
app = args.shift
_with_routes(app.routes) do
if args.first.is_a? Symbol
named_route = args.shift
url_for _routes.url_helpers.__send__("hash_for_#{named_route}", *args)
else
url_for(*args)
end
end
else
polymorphic_url(options)
options = args.first
case options
when String
options
when nil, Hash
routes = (options ? options.delete(:routes) : nil) || _routes
_with_routes(routes) do
routes.url_for((options || {}).reverse_merge!(url_options).symbolize_keys)
end
else
polymorphic_url(options)
end
end
end
def _with_routes(routes)
old_routes, @_routes = @_routes, routes
yield
ensure
@_routes = old_routes
end
protected
def _with_routes(routes)
old_routes, @_routes = @_routes, routes
yield
ensure
@_routes = old_routes
end
end
end
end

52
actionpack/test/dispatch/url_for_test.rb Normal file
View File

@ -0,0 +1,52 @@
require 'abstract_unit'
module UrlForGeneration
class UrlForTest < ActionDispatch::IntegrationTest
Routes = ActionDispatch::Routing::RouteSet.new
Routes.draw { match "/foo", :to => "my_route_generating#index", :as => :foo }
class BlogEngine
def self.routes
@routes ||= begin
routes = ActionDispatch::Routing::RouteSet.new
routes.draw do
resources :posts
end
routes
end
end
end
class Post
extend ActiveModel::Naming
def to_param
"1"
end
def self.model_name
klass = "Post"
def klass.name; self end
ActiveModel::Name.new(klass)
end
end
include Routes.url_helpers
test "url_for with named url helpers" do
assert_equal "/posts", url_for(BlogEngine, :posts_path)
end
test "url_for with polymorphic routes" do
assert_equal "http://www.example.com/posts/1", url_for(BlogEngine, Post.new)
end
test "url_for with named url helper with arguments" do
assert_equal "/posts/1", url_for(BlogEngine, :post_path, 1)
assert_equal "/posts/1", url_for(BlogEngine, :post_path, :id => 1)
assert_equal "/posts/1.json", url_for(BlogEngine, :post_path, :id => 1, :format => :json)
end
end
end

1
actionpack/test/dispatch/url_generation_test.rb
View File

@ -41,3 +41,4 @@ def app
end
end
end

90
actionpack/test/template/form_helper_test.rb
View File

@ -77,13 +77,35 @@ def @post.to_param; '123'; end
@post.written_on = Date.new(2004, 6, 15)
end
Routes = ActionDispatch::Routing::RouteSet.new
Routes.draw do
resources :posts do
resources :comments
end
namespace :admin do
resources :posts do
resources :comments
end
end
match "/foo", :to => "controller#action"
root :to => "main#index"
end
def _routes
Routes
end
include Routes.url_helpers
def url_for(object)
@url_for_options = object
if object.is_a?(Hash)
"http://www.example.com"
else
super
if object.is_a?(Hash) && object[:use_route].blank? && object[:controller].blank?
object.merge!(:controller => "main", :action => "index")
end
object
super
end
def test_label
@ -628,7 +650,7 @@ def test_form_for
end
expected =
"<form accept-charset='UTF-8' action='http://www.example.com' id='create-post' method='post'>" +
"<form accept-charset='UTF-8' action='/' id='create-post' method='post'>" +
snowman +
"<label for='post_title'>The Title</label>" +
"<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
@ -683,7 +705,7 @@ def test_form_for_with_method
end
end
expected = whole_form("http://www.example.com", "create-post", nil, "put") do
expected = whole_form("/", "create-post", nil, "put") do
"<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
"<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
"<input name='post[secret]' type='hidden' value='0' />" +
@ -702,7 +724,7 @@ def test_form_for_with_remote
end
end
expected = whole_form("http://www.example.com", "create-post", nil, :method => "put", :remote => true) do
expected = whole_form("/", "create-post", nil, :method => "put", :remote => true) do
"<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
"<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
"<input name='post[secret]' type='hidden' value='0' />" +
@ -721,7 +743,7 @@ def test_form_for_with_remote_without_html
end
end
expected = whole_form("http://www.example.com", nil, nil, :remote => true) do
expected = whole_form("/", nil, nil, :remote => true) do
"<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
"<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
"<input name='post[secret]' type='hidden' value='0' />" +
@ -738,7 +760,7 @@ def test_form_for_without_object
concat f.check_box(:secret)
end
expected = whole_form("http://www.example.com", "create-post") do
expected = whole_form("/", "create-post") do
"<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
"<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
"<input name='post[secret]' type='hidden' value='0' />" +
@ -1478,7 +1500,7 @@ def test_form_for_and_fields_for
end
expected =
"<form accept-charset='UTF-8' action='http://www.example.com' id='create-post' method='post'>" +
"<form accept-charset='UTF-8' action='/' id='create-post' method='post'>" +
snowman +
"<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
"<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
@ -1502,7 +1524,7 @@ def test_form_for_and_fields_for_with_object
end
expected =
whole_form("http://www.example.com", "create-post") do
whole_form("/", "create-post") do
"<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
"<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
"<input name='post[comment][name]' type='text' id='post_comment_name' value='new comment' size='30' />"
@ -1546,7 +1568,7 @@ def snowman(method = nil)
txt << %{</div>}
end
def form_text(action = "http://www.example.com", id = nil, html_class = nil, remote = nil)
def form_text(action = "/", id = nil, html_class = nil, remote = nil)
txt = %{<form accept-charset="UTF-8" action="#{action}"}
txt << %{ data-remote="true"} if remote
txt << %{ class="#{html_class}"} if html_class
@ -1554,7 +1576,7 @@ def form_text(action = "http://www.example.com", id = nil, html_class = nil, rem
txt << %{ method="post">}
end
def whole_form(action = "http://www.example.com", id = nil, html_class = nil, options = nil)
def whole_form(action = "/", id = nil, html_class = nil, options = nil)
contents = block_given? ? yield : ""
if options.is_a?(Hash)
@ -1655,7 +1677,7 @@ def test_form_for_with_html_options_adds_options_to_form_tag
assert_deprecated do
form_for(:post, @post, :html => {:id => 'some_form', :class => 'some_class'}) do |f| end
end
expected = whole_form("http://www.example.com", "some_form", "some_class")
expected = whole_form("/", "some_form", "some_class")
assert_dom_equal expected, output_buffer
end
@ -1710,14 +1732,14 @@ def test_form_for_with_existing_object_in_list
@comment.save
form_for([@post, @comment]) {}
expected = whole_form(comment_path(@post, @comment), "edit_comment_1", "edit_comment", "put")
expected = whole_form(post_comment_path(@post, @comment), "edit_comment_1", "edit_comment", "put")
assert_dom_equal expected, output_buffer
end
def test_form_for_with_new_object_in_list
form_for([@post, @comment]) {}
expected = whole_form(comments_path(@post), "new_comment", "new_comment")
expected = whole_form(post_comments_path(@post), "new_comment", "new_comment")
assert_dom_equal expected, output_buffer
end
@ -1725,14 +1747,14 @@ def test_form_for_with_existing_object_and_namespace_in_list
@comment.save
form_for([:admin, @post, @comment]) {}
expected = whole_form(admin_comment_path(@post, @comment), "edit_comment_1", "edit_comment", "put")
expected = whole_form(admin_post_comment_path(@post, @comment), "edit_comment_1", "edit_comment", "put")
assert_dom_equal expected, output_buffer
end
def test_form_for_with_new_object_and_namespace_in_list
form_for([:admin, @post, @comment]) {}
expected = whole_form(admin_comments_path(@post), "new_comment", "new_comment")
expected = whole_form(admin_post_comments_path(@post), "new_comment", "new_comment")
assert_dom_equal expected, output_buffer
end
@ -1749,38 +1771,6 @@ def test_fields_for_returns_block_result
end
protected
def comments_path(post)
"/posts/#{post.id}/comments"
end
alias_method :post_comments_path, :comments_path
def comment_path(post, comment)
"/posts/#{post.id}/comments/#{comment.id}"
end
alias_method :post_comment_path, :comment_path
def admin_comments_path(post)
"/admin/posts/#{post.id}/comments"
end
alias_method :admin_post_comments_path, :admin_comments_path
def admin_comment_path(post, comment)
"/admin/posts/#{post.id}/comments/#{comment.id}"
end
alias_method :admin_post_comment_path, :admin_comment_path
def posts_path
"/posts"
end
def post_path(post, options = {})
if options[:format]
"/posts/#{post.id}.#{options[:format]}"
else
"/posts/#{post.id}"
end
end
def protect_against_forgery?
false
end

2
actionpack/test/template/test_test.rb
View File

@ -39,7 +39,7 @@ def test_link_to_person
with_test_route_set do
person = mock(:name => "David")
person.class.extend ActiveModel::Naming
expects(:mocha_mock_path).with(person).returns("/people/1")
_routes.url_helpers.expects(:hash_for_mocha_mock_path).with(person).returns("/people/1")
assert_equal '<a href="/people/1">David</a>', link_to_person(person)
end
end