diff options
author | José Valim <jose.valim@gmail.com> | 2011-05-20 22:21:21 -0700 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-05-20 22:21:21 -0700 |
commit | fa3f273173b83b604cc37016d1f2b3b17ce26b22 (patch) | |
tree | 8afcbbf9c830c9f50afb72336eef918b6edac684 | |
parent | 5eadb4d73dc5384509efeea3b9584ded19956c7b (diff) | |
parent | 1bfe9ec5de03003d02dd8528bae427271f459ad6 (diff) | |
download | rails-fa3f273173b83b604cc37016d1f2b3b17ce26b22.tar.gz rails-fa3f273173b83b604cc37016d1f2b3b17ce26b22.tar.bz2 rails-fa3f273173b83b604cc37016d1f2b3b17ce26b22.zip |
Merge pull request #1175 from joshk/active_resource_correction
attr_accessor_with_default removed from ActiveResource
-rw-r--r-- | activeresource/lib/active_resource/base.rb | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/activeresource/lib/active_resource/base.rb b/activeresource/lib/active_resource/base.rb index 65d285249b..0c272fa093 100644 --- a/activeresource/lib/active_resource/base.rb +++ b/activeresource/lib/active_resource/base.rb @@ -3,7 +3,6 @@ require 'active_support/core_ext/class/attribute_accessors' require 'active_support/core_ext/class/attribute' require 'active_support/core_ext/hash/indifferent_access' require 'active_support/core_ext/kernel/reporting' -require 'active_support/core_ext/module/attr_accessor_with_default' require 'active_support/core_ext/module/delegation' require 'active_support/core_ext/module/aliasing' require 'active_support/core_ext/object/blank' @@ -565,10 +564,23 @@ module ActiveResource @headers ||= {} end - attr_accessor_with_default(:element_name) { model_name.element } #:nodoc: - attr_accessor_with_default(:collection_name) { ActiveSupport::Inflector.pluralize(element_name) } #:nodoc: + attr_writer :element_name - attr_accessor_with_default(:primary_key, 'id') #:nodoc: + def element_name + @element_name ||= model_name.element + end + + attr_writer :collection_name + + def collection_name + @collection_name ||= ActiveSupport::Inflector.pluralize(element_name) + end + + attr_writer :primary_key + + def primary_key + @primary_key ||= 'id' + end # Gets the \prefix for a resource's nested URL (e.g., <tt>prefix/collectionname/1.json</tt>) # This method is regenerated at runtime based on what the \prefix is set to. |