From 107c6381a0a3403461f1dc00e140565028af73e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 17 May 2010 17:36:34 +0200
Subject: Allow root to be given in the resources scope without need to specify
 :on => collection.

---
 actionpack/lib/action_dispatch/routing/mapper.rb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'actionpack/lib/action_dispatch/routing/mapper.rb')

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 4b02c2deb3..8a8d21c434 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -693,6 +693,11 @@ module ActionDispatch
           super
         end
 
+        def root(options={})
+          options[:on] ||= :collection if @scope[:scope_level] == :resources
+          super(options)
+        end
+
         protected
           def parent_resource #:nodoc:
             @scope[:scope_level_resource]
-- 
cgit v1.2.3