Skip to content

Commit

Permalink
attr_accessor_with_default is deprecated, so lets not use it in Activ…
Browse files Browse the repository at this point in the history
…eResource
  • Loading branch information
joshk committed May 21, 2011
1 parent 95bd199 commit 1bfe9ec
Showing 1 changed file with 16 additions and 4 deletions.
20 changes: 16 additions & 4 deletions activeresource/lib/active_resource/base.rb
Expand Up @@ -3,7 +3,6 @@
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'
Expand Down Expand Up @@ -565,10 +564,23 @@ def headers
@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.
Expand Down

0 comments on commit 1bfe9ec

Please sign in to comment.