1 files changed, 17 insertions, 15 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 668abb5fdf..ddee742021 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -45,20 +45,23 @@ module ActionDispatch
           def extract_path_and_options(args)
             options = args.extract_options!
 
-            case
-            when using_to_shorthand?(args, options)
+            if using_to_shorthand?(args, options)
               path, to = options.find { |name, value| name.is_a?(String) }
               options.merge!(:to => to).delete(path) if path
-            when using_match_shorthand?(args, options)
-              path = args.first
-              options = { :to     => path.gsub("/", "#"),
-                          :as     => path.gsub("/", "_")
-                        }.merge(options || {})
             else
               path = args.first
             end
 
-            [ normalize_path(path), options ]
+            path = normalize_path(path)
+
+            if using_match_shorthand?(path, options)
+              options = {
+                :to => path[1..-1].sub(%r{/([^/]*)$}, '#\1'),
+                :as => path[1..-1].gsub("/", "_")
+              }.merge!(options)
+            end
+
+            [ path, options ]
           end
 
           # match "account" => "account#index"
@@ -67,14 +70,13 @@ module ActionDispatch
           end
 
           # match "account/overview"
-          def using_match_shorthand?(args, options)
-            args.present? && options.except(:via, :anchor).empty? && !args.first.include?(':')
+          def using_match_shorthand?(path, options)
+            path && options.except(:via, :anchor).empty? && !path.include?(':')
           end
 
           def normalize_path(path)
-            path = "#{@scope[:path]}/#{path}"
-            raise ArgumentError, "path is required" if path.empty?
-            Mapper.normalize_path(path)
+            raise ArgumentError, "path is required" if @scope[:path].blank? && path.blank?
+            Mapper.normalize_path("#{@scope[:path]}/#{path}")
           end
 
           def app
@@ -146,8 +148,8 @@ module ActionDispatch
 
           def segment_keys
             @segment_keys ||= Rack::Mount::RegexpWithNamedGroups.new(
-                Rack::Mount::Strexp.compile(@path, requirements, SEPARATORS)
-              ).names
+              Rack::Mount::Strexp.compile(@path, requirements, SEPARATORS)
+            ).names
           end
 
           def to