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

pass the instantiated request to the find_routes method

Browse Source
This commit is contained in:
Aaron Patterson 2014-05-22 15:46:38 -07:00
parent 8d8ebe3db5
commit 1b76c7e9f6
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
actionpack/lib/action_dispatch/journey/router.rb
View File

@ -56,7 +56,9 @@ def initialize(routes, options)
def call(env)
env['PATH_INFO'] = Utils.normalize_path(env['PATH_INFO'])
find_routes(env).each do |match, parameters, route|
req = request_class.new(env)
find_routes(env, req).each do |match, parameters, route|
script_name, path_info, set_params = env.values_at('SCRIPT_NAME',
'PATH_INFO',
@params_key)
@ -84,7 +86,9 @@ def call(env)
end
def recognize(req)
find_routes(req.env).each do |match, parameters, route|
rails_req = request_class.new(req.env)
find_routes(req.env, rails_req).each do |match, parameters, route|
unless route.path.anchored
req.env['SCRIPT_NAME'] = match.to_s
req.env['PATH_INFO'] = match.post_match.sub(/^([^\/])/, '/\1')
@ -124,9 +128,7 @@ def filter_routes(path)
simulator.memos(path) { [] }
end
def find_routes env
req = request_class.new(env)
def find_routes env, req
routes = filter_routes(req.path_info).concat custom_routes.find_all { |r|
r.path.match(req.path_info)
}