Use the readers instead of accessing the ivar directly

This commit is contained in:
Santiago Pastorino 2013-05-15 12:57:30 -07:00
parent 251fdc7ba4
commit 2b22acff53

View File

@ -35,7 +35,8 @@ module ActiveModel
end end
def initialize(object, options={}) def initialize(object, options={})
@object, @options = object, options @object = object
@options = options
end end
def serialize_object def serialize_object
@ -43,16 +44,16 @@ module ActiveModel
end end
def serializable_array def serializable_array
@object.map do |item| object.map do |item|
if @options.has_key? :each_serializer if options.has_key? :each_serializer
serializer = @options[:each_serializer] serializer = options[:each_serializer]
elsif item.respond_to?(:active_model_serializer) elsif item.respond_to?(:active_model_serializer)
serializer = item.active_model_serializer serializer = item.active_model_serializer
else else
serializer = DefaultSerializer serializer = DefaultSerializer
end end
serializable = serializer.new(item, @options) serializable = serializer.new(item, options)
if serializable.respond_to?(:serializable_hash) if serializable.respond_to?(:serializable_hash)
serializable.serializable_hash serializable.serializable_hash