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

disconnect options and scope from the blocks method

Browse Source
This commit is contained in:
Aaron Patterson 2014-05-30 11:36:12 -07:00
parent e975b7d04e
commit 496e25aab7
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,6 +79,7 @@ def initialize(scope, path, options)
formatted = options.delete :format
via = Array(options.delete(:via) { [] })
@blocks = blocks(options[:constraints], scope[:blocks])
path = normalize_path! path, formatted
ast = path_ast path
@ -87,14 +88,14 @@ def initialize(scope, path, options)
constraints = constraints(options[:constraints], scope[:constraints])
normalize_requirements!(path_params, formatted, constraints)
normalize_requirements!(path_params, formatted, constraints)
normalize_conditions!(path_params, path, ast, via, constraints)
normalize_defaults!(formatted)
end
def to_route
[ app, conditions, requirements, defaults, as, anchor ]
[ app(@blocks), conditions, requirements, defaults, as, anchor ]
end
private
@ -232,7 +233,7 @@ def normalize_conditions!(path_params, path, ast, via, constraints)
end
end
def app
def app(blocks)
return to if Redirect === to
if to.respond_to?(:call)
@ -303,11 +304,11 @@ def translate_controller(controller)
yield
end
def blocks
if options[:constraints].present? && !options[:constraints].is_a?(Hash)
[options[:constraints]]
def blocks(options_constraints, scope_blocks)
if options_constraints.present? && !options_constraints.is_a?(Hash)
[options_constraints]
else
scope[:blocks] || []
scope_blocks || []
end
end