Routing: fix that route shorthand shouldn't ignore other options. Raise if :as option is given to root method since its name is always 'root'

1 files changed, 4 insertions, 2 deletions

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 46163706c3..40e30bca6f 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -35,13 +35,15 @@ module ActionDispatch
         end
 
         def root(options = {})
+          raise "Can't rename root to #{options[:as].inspect}: root is always named 'root'" if options.include?(:as)
           match '/', options.merge(:as => :root)
         end
 
         def match(*args)
           if args.one? && args.first.is_a?(Hash)
-            path    = args.first.keys.first
-            options = { :to => args.first.values.first }
+            options = args.first
+            path    = options.keys.first
+            options[:to] = options.delete(path)
           else
             path    = args.first
             options = args.extract_options!