diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2007-07-24 16:48:57 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-07-24 16:48:57 +0000 |
commit | edd68a587f412ccdf15613c663acbab341d45017 (patch) | |
tree | 386437d0bb09c7944943b0590a5f80c60146e853 /actionpack/lib/action_controller/resources.rb | |
parent | 34b081112536e382845e8dee146d884b4af20c4a (diff) | |
download | rails-edd68a587f412ccdf15613c663acbab341d45017.tar.gz rails-edd68a587f412ccdf15613c663acbab341d45017.tar.bz2 rails-edd68a587f412ccdf15613c663acbab341d45017.zip |
Refactored in use of extract_options! (closes #9079) [josh]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7220 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/resources.rb')
-rw-r--r-- | actionpack/lib/action_controller/resources.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/resources.rb b/actionpack/lib/action_controller/resources.rb index 1cfb7c11d0..3cb9367fc2 100644 --- a/actionpack/lib/action_controller/resources.rb +++ b/actionpack/lib/action_controller/resources.rb @@ -295,7 +295,7 @@ module ActionController # HTTP POST on <tt>new_message_url</tt> will raise a RoutingError exception. The default route in # <tt>config/routes.rb</tt> overrides this and allows invalid HTTP methods for resource routes. def resources(*entities, &block) - options = entities.last.is_a?(Hash) ? entities.pop : { } + options = entities.extract_options! entities.each { |entity| map_resource(entity, options.dup, &block) } end @@ -369,7 +369,7 @@ module ActionController # edit_account edit_account_url, hash_for_edit_account_url, # edit_account_path, hash_for_edit_account_path def resource(*entities, &block) - options = entities.last.is_a?(Hash) ? entities.pop : { } + options = entities.extract_options! entities.each { |entity| map_singleton_resource(entity, options.dup, &block) } end |