2 files changed, 12 insertions, 13 deletions

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 8de68b3174..0e9291490c 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -367,9 +367,9 @@ module ActionDispatch
 
           def actions
             if only = options[:only]
-              only.map(&:to_sym)
+              Array(only).map(&:to_sym)
             elsif except = options[:except]
-              default_actions - except.map(&:to_sym)
+              default_actions - Array(except).map(&:to_sym)
             else
               default_actions
             end
@@ -443,7 +443,7 @@ module ActionDispatch
         def resource(*resources, &block)
           options = resources.extract_options!
 
-          if verify_common_behavior_for(:resource, resources, options, &block)
+          if apply_common_behavior_for(:resource, resources, options, &block)
             return self
           end
 
@@ -468,7 +468,7 @@ module ActionDispatch
         def resources(*resources, &block)
           options = resources.extract_options!
 
-          if verify_common_behavior_for(:resources, resources, options, &block)
+          if apply_common_behavior_for(:resources, resources, options, &block)
             return self
           end
 
@@ -591,7 +591,7 @@ module ActionDispatch
             path_names[name.to_sym] || name.to_s
           end
 
-          def verify_common_behavior_for(method, resources, options, &block)
+          def apply_common_behavior_for(method, resources, options, &block)
             if resources.length > 1
               resources.each { |r| send(method, r, options, &block) }
               return true
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index ee60112bbc..8778fd2932 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -11,8 +11,8 @@ module ActionDispatch
       PARAMETERS_KEY = 'action_dispatch.request.path_parameters'
 
       class Dispatcher
-        def initialize(options = {})
-          defaults = options[:defaults]
+        def initialize(options={})
+          @defaults = options[:defaults]
           @glob_param = options.delete(:glob)
         end
 
@@ -20,7 +20,8 @@ module ActionDispatch
           params = env[PARAMETERS_KEY]
           prepare_params!(params)
 
-          unless controller = controller(params)
+          # Just raise undefined constant errors if a controller was specified as default.
+          unless controller = controller(params, @defaults.key?(:controller))
             return [404, {'X-Cascade' => 'pass'}, []]
           end
 
@@ -39,14 +40,13 @@ module ActionDispatch
           end
         end
 
-        def controller(params)
+        def controller(params, raise_error=true)
           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 if raise_error
         end
 
         private
@@ -59,7 +59,6 @@ module ActionDispatch
           end
       end
 
-
       # A NamedRouteCollection instance is a collection of named routes, and also
       # maintains an anonymous module that can be used to install helpers for the
       # named routes.
@@ -433,7 +432,7 @@ module ActionDispatch
         req = Rack::Request.new(env)
         @set.recognize(req) do |route, matches, params|
           dispatcher = route.app
-          if dispatcher.is_a?(Dispatcher) && dispatcher.controller(params)
+          if dispatcher.is_a?(Dispatcher) && dispatcher.controller(params, false)
             dispatcher.prepare_params!(params)
             return params
           end