kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Do not swallow controller loading errors unless required.

Browse source
This commit is contained in:
José Valim 2010-02-16 22:09:42 +01:00
parent 01cd9d66ed
commit 72cb0bf414
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
actionpack/lib/action_dispatch/routing/route_set.rb
View file

@ -19,12 +19,7 @@ module ActionDispatch
def call(env)
params = env[PARAMETERS_KEY]
prepare_params!(params)
unless controller = controller(params)
return [404, {'X-Cascade' => 'pass'}, []]
end
controller.action(params[:action]).call(env)
controller(params).action(params[:action]).call(env)
end
def prepare_params!(params)
@ -39,14 +34,13 @@ module ActionDispatch
end
end
def controller(params)
def controller(params, swallow=false)
if params && params.has_key?(:controller)
controller = "#{params[:controller].camelize}Controller"
ActiveSupport::Inflector.constantize(controller)
end
rescue NameError => e
raise unless e.message.include?(controller)
nil
raise ActionController::RoutingError, e.message, e.backtrace unless swallow
end
private
@ -433,7 +427,7 @@ module ActionDispatch
req = Rack::Request.new(env)
@set.recognize(req) do |route, params|
dispatcher = route.app
if dispatcher.is_a?(Dispatcher) && dispatcher.controller(params)
if dispatcher.is_a?(Dispatcher) && dispatcher.controller(params, true)
dispatcher.prepare_params!(params)
return params
end