aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/routing
diff options
context:
space:
mode:
authorMichael S. Klishin <michael@novemberain.com>2008-12-29 00:50:06 +0300
committerMichael S. Klishin <michael@novemberain.com>2008-12-29 00:50:18 +0300
commit069534af4f0440215af1f12f7f6f1c9e14a2e8bd (patch)
tree4b92bcf839f994288ef794120f85ce0500607b42 /actionpack/lib/action_controller/routing
parent19208e7422e191098bdbe3d12b75296777e2c75d (diff)
parentc20c72e3d9321f8c00587aab479d962e80b02c35 (diff)
downloadrails-069534af4f0440215af1f12f7f6f1c9e14a2e8bd.tar.gz
rails-069534af4f0440215af1f12f7f6f1c9e14a2e8bd.tar.bz2
rails-069534af4f0440215af1f12f7f6f1c9e14a2e8bd.zip
Sync with rails/rails/master
Diffstat (limited to 'actionpack/lib/action_controller/routing')
-rw-r--r--actionpack/lib/action_controller/routing/route_set.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/routing/route_set.rb b/actionpack/lib/action_controller/routing/route_set.rb
index 5975977365..06aef6e169 100644
--- a/actionpack/lib/action_controller/routing/route_set.rb
+++ b/actionpack/lib/action_controller/routing/route_set.rb
@@ -427,6 +427,12 @@ module ActionController
end
end
+ def call(env)
+ request = Request.new(env)
+ app = Routing::Routes.recognize(request)
+ app.call(env).to_a
+ end
+
def recognize(request)
params = recognize_path(request.path, extract_request_environment(request))
request.path_parameters = params.with_indifferent_access