Use nested scope for routes defined at the :resources scope level (as in Rails 2.3)

Signed-off-by: José Valim <jose.valim@gmail.com>

2 files changed, 13 insertions, 5 deletions

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 9aa34e7ba5..9a92ed0b62 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -695,15 +695,14 @@ module ActionDispatch
             raise ArgumentError, "Unknown scope #{on.inspect} given to :on"
           end
 
-          if @scope[:scope_level] == :resource
+          if @scope[:scope_level] == :resources
+            args.push(options)
+            return nested { match(*args) }
+          elsif @scope[:scope_level] == :resource
             args.push(options)
             return member { match(*args) }
           end
 
-          if resource_scope?
-            raise ArgumentError, "can't define route directly in resource(s) scope"
-          end
-
           action = args.first
           path = path_for_action(action, options.delete(:path))
 
@@ -900,6 +899,8 @@ module ActionDispatch
             end
 
             name = case @scope[:scope_level]
+            when :nested
+              [member_name, prefix]
             when :collection
               [prefix, name_prefix, collection_name]
             when :new
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 5b2547e700..a4b8fafa78 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -231,6 +231,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
         get "inactive", :on => :collection
         post "deactivate", :on => :member
         get "old", :on => :collection, :as => :stale
+        get "export"
       end
 
       namespace :api do
@@ -2091,6 +2092,12 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     assert_equal '/customers/1/invoices/aged/3', aged_customer_invoices_path(:customer_id => '1', :months => '3')
   end
 
+  def test_route_defined_in_resources_scope_level
+    get '/customers/1/export'
+    assert_equal 'customers#export', @response.body
+    assert_equal '/customers/1/export', customer_export_path(:customer_id => '1')
+  end
+
 private
   def with_test_routes
     yield