Merge branch 'master' of github.com:rails/rails

1 files changed, 7 insertions, 15 deletions

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index ac03ecb2c8..5040aa82b2 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -244,12 +244,10 @@ module ActionDispatch
           def app(blocks)
             if to.respond_to?(:call)
               Constraints.new(to, blocks, false)
+            elsif blocks.any?
+              Constraints.new(dispatcher(defaults), blocks, true)
             else
-              if blocks.any?
-                Constraints.new(dispatcher(defaults), blocks, true)
-              else
-                dispatcher(defaults)
-              end
+              dispatcher(defaults)
             end
           end
 
@@ -391,7 +389,7 @@ module ActionDispatch
 
         # Matches a url pattern to one or more routes.
         #
-        # You should not use the `match` method in your router
+        # You should not use the +match+ method in your router
         # without specifying an HTTP method.
         #
         # If you want to expose your action to both GET and POST, use:
@@ -402,7 +400,7 @@ module ActionDispatch
         # Note that +:controller+, +:action+ and +:id+ are interpreted as url
         # query parameters and thus available through +params+ in an action.
         #
-        # If you want to expose your action to GET, use `get` in the router:
+        # If you want to expose your action to GET, use +get+ in the router:
         #
         # Instead of:
         #
@@ -457,7 +455,7 @@ module ActionDispatch
         #   The route's action.
         #
         # [:param]
-        #   Overrides the default resource identifier `:id` (name of the
+        #   Overrides the default resource identifier +:id+ (name of the
         #   dynamic segment used to generate the routes).
         #   You can access that segment from your controller using
         #   <tt>params[<:param>]</tt>.
@@ -582,13 +580,7 @@ module ActionDispatch
           raise "A rack application must be specified" unless path
 
           rails_app = rails_app? app
-
-          if rails_app
-            options[:as]  ||= app.railtie_name
-          else
-            # non rails apps can't have an :as
-            options[:as]  = nil
-          end
+          options[:as] ||= app.railtie_name if rails_app
 
           target_as       = name_for_action(options[:as], path)
           options[:via] ||= :all