Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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>
  • Loading branch information...
commit 1847d33b4bc776fbd4746c06db41965744377ed6 1 parent 3ac6646
@pixeltrix pixeltrix authored josevalim committed
View
11 actionpack/lib/action_dispatch/routing/mapper.rb
@@ -695,15 +695,14 @@ def match(*args)
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 @@ def name_for_action(action, as=nil)
end
name = case @scope[:scope_level]
+ when :nested
+ [member_name, prefix]
when :collection
[prefix, name_prefix, collection_name]
when :new
View
7 actionpack/test/dispatch/routing_test.rb
@@ -231,6 +231,7 @@ def self.matches?(request)
get "inactive", :on => :collection
post "deactivate", :on => :member
get "old", :on => :collection, :as => :stale
+ get "export"
end
namespace :api do
@@ -2091,6 +2092,12 @@ def test_custom_resource_actions_defined_using_string
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
Please sign in to comment.
Something went wrong with that request. Please try again.