Permalink
Browse files

Renamed _path_segments to _recall

  • Loading branch information...
1 parent 422b3d7 commit d89161e7cc52a03455bf6d3b38a6c1a4b7adb524 @bogdan bogdan committed Aug 4, 2012
View
2 actionpack/lib/action_controller/metal/url_for.rb
@@ -27,7 +27,7 @@ def url_options
:host => request.host,
:port => request.optional_port,
:protocol => request.protocol,
- :_path_segments => request.symbolized_path_parameters
+ :_recall => request.symbolized_path_parameters
).freeze
if _routes.equal?(env["action_dispatch.routes"])
View
2 actionpack/lib/action_controller/test_case.rb
@@ -581,7 +581,7 @@ def build_request_uri(action, parameters)
:only_path => true,
:action => action,
:relative_url_root => nil,
- :_path_segments => @request.symbolized_path_parameters)
+ :_recall => @request.symbolized_path_parameters)
url, query_string = @routes.url_for(options).split("?", 2)
View
4 actionpack/lib/action_dispatch/routing/route_set.rb
@@ -605,13 +605,13 @@ def url_for(options)
options = default_url_options.merge(options || {})
user, password = extract_authentication(options)
- path_segments = options.delete(:_path_segments)
+ recall = options.delete(:_recall)
script_name = options.delete(:script_name).presence || _generate_prefix(options)
path_options = options.except(*RESERVED_OPTIONS)
path_options = yield(path_options) if block_given?
- path, params = generate(path_options, path_segments || {})
+ path, params = generate(path_options, recall || {})
params.merge!(options[:params] || {})
ActionDispatch::Http::URL.url_for(options.merge!({
View
2 actionpack/test/abstract_unit.rb
@@ -356,6 +356,6 @@ def get(uri_or_host, path = nil, port = nil)
module RoutingTestHelpers
def url_for(set, options, recall = nil)
- set.send(:url_for, options.merge(:only_path => true, :_path_segments => recall))
+ set.send(:url_for, options.merge(:only_path => true, :_recall => recall))
end
end

0 comments on commit d89161e

Please sign in to comment.