From b18f22d15c28fc5fe634928d59148c932bba4696 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Sun, 25 May 2014 14:26:48 -0700 Subject: pass the request object to the application --- actionpack/lib/action_dispatch/journey/router.rb | 2 +- actionpack/lib/action_dispatch/routing/mapper.rb | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'actionpack/lib') diff --git a/actionpack/lib/action_dispatch/journey/router.rb b/actionpack/lib/action_dispatch/journey/router.rb index 2ead6a4eb3..8ec223afc3 100644 --- a/actionpack/lib/action_dispatch/journey/router.rb +++ b/actionpack/lib/action_dispatch/journey/router.rb @@ -39,7 +39,7 @@ module ActionDispatch req.path_parameters = set_params.merge parameters - status, headers, body = route.app.call(req.env) + status, headers, body = route.app.serve(req) if 'pass' == headers['X-Cascade'] req.script_name = script_name diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index 702d998447..08a5e7c637 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -42,9 +42,8 @@ module ActionDispatch end end - def call(env) - req = @request.new(env) - matches?(req) ? @app.call(env) : [ 404, {'X-Cascade' => 'pass'}, [] ] + def serve(req) + matches?(req) ? @app.call(req.env) : [ 404, {'X-Cascade' => 'pass'}, [] ] ensure req.reset_parameters end -- cgit v1.2.3