Merge pull request #282 from morgoth/unify-calling-include_attribute

Unify way of calling include_attribute? in attibutes and association methods
This commit is contained in:
Steve Klabnik 2013-04-22 01:31:59 -07:00
commit 2f21e77e90

View File

@ -103,10 +103,10 @@ module ActiveModel
define_include_method attr
# protect inheritance chains and open classes
# if a serializer inherits from another OR
# if a serializer inherits from another OR
# attributes are added later in a classes lifecycle
# poison the cache
define_method :_fast_attributes do
define_method :_fast_attributes do
raise NameError
end
@ -302,7 +302,7 @@ module ActiveModel
def root_name
return false if self._root == false
class_name = self.class.name.demodulize.underscore.sub(/_serializer$/, '').to_sym unless self.class.name.blank?
self._root || class_name
end
@ -451,7 +451,7 @@ module ActiveModel
method << " h = {}\n"
_attributes.each do |name,key|
method << " h[:\"#{key}\"] = read_attribute_for_serialization(:\"#{name}\") if send #{INCLUDE_METHODS[name].inspect}\n"
method << " h[:\"#{key}\"] = read_attribute_for_serialization(:\"#{name}\") if include?(:\"#{name}\")\n"
end
method << " h\nend"