aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/resources.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_controller/resources.rb')
-rw-r--r--actionpack/lib/action_controller/resources.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/resources.rb b/actionpack/lib/action_controller/resources.rb
index 2b4c9217d5..638052a2aa 100644
--- a/actionpack/lib/action_controller/resources.rb
+++ b/actionpack/lib/action_controller/resources.rb
@@ -69,15 +69,15 @@ module ActionController
end
end
- def resources(*entities)
+ def resources(*entities, &block)
options = entities.last.is_a?(Hash) ? entities.pop : { }
- entities.each { |entity| map_resource(entity, options.dup) { yield if block_given? } }
+ entities.each { |entity| map_resource entity, options.dup, &block }
end
private
def map_resource(entities, options = {}, &block)
resource = Resource.new(entities, options)
-
+
with_options :controller => resource.controller do |map|
map_collection_actions(map, resource)
map_new_actions(map, resource)
@@ -154,4 +154,4 @@ module ActionController
end
end
-ActionController::Routing::RouteSet::Mapper.send :include, ActionController::Resources \ No newline at end of file
+ActionController::Routing::RouteSet::Mapper.send :include, ActionController::Resources