1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

Merge pull request #21502 from bernerdschaefer/bs-polymorphic-url_for-dups-arguments

`url_for` does not modify polymorphic options
This commit is contained in:
Rafael Mendonça França 2015-09-08 13:49:22 -03:00
commit f883867dd6
6 changed files with 47 additions and 3 deletions

View file

@ -1,3 +1,7 @@
* `url_for` does not modify its arguments when generating polymorphic URLs.
*Bernerd Schaefer*
* Make it easier to opt in to `config.force_ssl` and `config.ssl_options` by * Make it easier to opt in to `config.force_ssl` and `config.ssl_options` by
making them less dangerous to try and easier to disable. making them less dangerous to try and easier to disable.

View file

@ -180,7 +180,8 @@ module ActionDispatch
when Symbol when Symbol
HelperMethodBuilder.url.handle_string_call self, options HelperMethodBuilder.url.handle_string_call self, options
when Array when Array
polymorphic_url(options, options.extract_options!) components = options.dup
polymorphic_url(components, components.extract_options!)
when Class when Class
HelperMethodBuilder.url.handle_class_call self, options HelperMethodBuilder.url.handle_class_call self, options
else else

View file

@ -451,6 +451,26 @@ module AbstractController
end end
end end
def test_url_for_with_array_is_unmodified
with_routing do |set|
set.draw do
namespace :admin do
resources :posts
end
end
kls = Class.new { include set.url_helpers }
kls.default_url_options[:host] = 'www.basecamphq.com'
original_components = [:new, :admin, :post, { param: 'value' }]
components = original_components.dup
kls.new.url_for(components)
assert_equal(original_components, components)
end
end
private private
def extract_params(url) def extract_params(url)
url.split('?', 2).last.split('&').sort url.split('?', 2).last.split('&').sort

View file

@ -1,3 +1,7 @@
* `url_for` does not modify its arguments when generating polymorphic URLs.
*Bernerd Schaefer*
* `number_to_currency` and `number_with_delimiter` now accept custom `delimiter_pattern` option * `number_to_currency` and `number_with_delimiter` now accept custom `delimiter_pattern` option
to handle placement of delimiter, to support currency formats like INR to handle placement of delimiter, to support currency formats like INR

View file

@ -105,10 +105,11 @@ module ActionView
when :back when :back
_back_url _back_url
when Array when Array
components = options.dup
if _generate_paths_by_default if _generate_paths_by_default
polymorphic_path(options, options.extract_options!) polymorphic_path(components, components.extract_options!)
else else
polymorphic_url(options, options.extract_options!) polymorphic_url(components, components.extract_options!)
end end
else else
method = _generate_paths_by_default ? :path : :url method = _generate_paths_by_default ? :path : :url

View file

@ -785,6 +785,13 @@ class SessionsController < ActionController::Base
@session = Session.new(params[:id]) @session = Session.new(params[:id])
render inline: "<%= url_for([@workshop, @session]) %>\n<%= link_to('Session', [@workshop, @session]) %>" render inline: "<%= url_for([@workshop, @session]) %>\n<%= link_to('Session', [@workshop, @session]) %>"
end end
def edit
@workshop = Workshop.new(params[:workshop_id])
@session = Session.new(params[:id])
@url = [@workshop, @session, format: params[:format]]
render inline: "<%= url_for(@url) %>\n<%= link_to('Session', @url) %>"
end
end end
class PolymorphicControllerTest < ActionController::TestCase class PolymorphicControllerTest < ActionController::TestCase
@ -815,4 +822,11 @@ class PolymorphicControllerTest < ActionController::TestCase
get :show, params: { workshop_id: 1, id: 1 } get :show, params: { workshop_id: 1, id: 1 }
assert_equal %{/workshops/1/sessions/1\n<a href="/workshops/1/sessions/1">Session</a>}, @response.body assert_equal %{/workshops/1/sessions/1\n<a href="/workshops/1/sessions/1">Session</a>}, @response.body
end end
def test_existing_nested_resource_with_params
@controller = SessionsController.new
get :edit, params: { workshop_id: 1, id: 1, format: "json" }
assert_equal %{/workshops/1/sessions/1.json\n<a href="/workshops/1/sessions/1.json">Session</a>}, @response.body
end
end end