TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Remove double scoping blocks and just use one

Browse Source
This commit is contained in:
Joshua Peek 2009-12-08 16:13:00 -06:00
parent c4df6332a4
commit ce5f27b04b
1 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
actionpack/lib/action_dispatch/routing/mapper.rb
View File

@ -297,18 +297,16 @@ def resource(*resources, &block)
return self
end
controller(resource.controller) do
namespace(resource.name) do
with_scope_level(:resource, resource) do
yield if block_given?
scope(:path => resource.name, :controller => resource.controller) do
with_scope_level(:resource, resource) do
yield if block_given?
get "", :to => :show, :as => resource.member_name
post "", :to => :create
put "", :to => :update
delete "", :to => :destroy
get "new", :to => :new, :as => "new_#{resource.singular}"
get "edit", :to => :edit, :as => "edit_#{resource.singular}"
end
get "", :to => :show, :as => resource.member_name
post "", :to => :create
put "", :to => :update
delete "", :to => :destroy
get "new", :to => :new, :as => "new_#{resource.singular}"
get "edit", :to => :edit, :as => "edit_#{resource.singular}"
end
end
@ -333,24 +331,22 @@ def resources(*resources, &block)
return self
end
controller(resource.controller) do
namespace(resource.name) do
with_scope_level(:resources, resource) do
yield if block_given?
scope(:path => resource.name, :controller => resource.controller) do
with_scope_level(:resources, resource) do
yield if block_given?
with_scope_level(:collection) do
get "", :to => :index, :as => resource.collection_name
post "", :to => :create
get "new", :to => :new, :as => "new_#{resource.singular}"
end
with_scope_level(:collection) do
get "", :to => :index, :as => resource.collection_name
post "", :to => :create
get "new", :to => :new, :as => "new_#{resource.singular}"
end
with_scope_level(:member) do
scope(":id") do
get "", :to => :show, :as => resource.member_name
put "", :to => :update
delete "", :to => :destroy
get "edit", :to => :edit, :as => "edit_#{resource.singular}"
end
with_scope_level(:member) do
scope(":id") do
get "", :to => :show, :as => resource.member_name
put "", :to => :update
delete "", :to => :destroy
get "edit", :to => :edit, :as => "edit_#{resource.singular}"
end
end
end