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

pass the parsed path from mapper to the Strexp

Browse Source
This commit is contained in:
Aaron Patterson 2014-05-29 15:27:46 -07:00
parent 15ffbedf3b
commit 333a4d09ab
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
actionpack/lib/action_dispatch/routing/mapper.rb
View File

@ -80,7 +80,7 @@ def initialize(set, scope, path, options)
path_params = path_params ast
@options = normalize_options!(options, path_params, ast)
normalize_requirements!(path_params)
normalize_conditions!(path_params, path)
normalize_conditions!(path_params, path, ast)
normalize_defaults!
end
@ -192,8 +192,9 @@ def verify_callable_constraint(callable_constraint)
end
end
def normalize_conditions!(path_params, path)
def normalize_conditions!(path_params, path, ast)
@conditions[:path_info] = path
@conditions[:parsed_path_info] = ast
constraints.each do |key, condition|
unless path_params.include?(key) || key == :controller

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

@ -418,7 +418,9 @@ def add_route(app, conditions = {}, requirements = {}, defaults = {}, name = nil
"http://guides.rubyonrails.org/routing.html#restricting-the-routes-created"
end
path = build_path(conditions.delete(:path_info), requirements, SEPARATORS, anchor)
path = conditions.delete :path_info
ast = conditions.delete :parsed_path_info
path = build_path(path, ast, requirements, SEPARATORS, anchor)
conditions = build_conditions(conditions, path.names.map { |x| x.to_sym })
route = @set.add_route(app, path, conditions, defaults, name)
@ -426,8 +428,9 @@ def add_route(app, conditions = {}, requirements = {}, defaults = {}, name = nil
route
end
def build_path(path, requirements, separators, anchor)
strexp = Journey::Router::Strexp.build(
def build_path(path, ast, requirements, separators, anchor)
strexp = Journey::Router::Strexp.new(
ast,
path,
requirements,
SEPARATORS,