There's no need for target_serializer method

This commit is contained in:
Santiago Pastorino
2013-05-15 16:33:12 -07:00
parent feaefeeef3
commit 1c3f14407c

View File

@@ -10,6 +10,9 @@ module ActiveModel
@embed_key = options[:embed_key] || :id @embed_key = options[:embed_key] || :id
@embed_in_root = options[:include] @embed_in_root = options[:include]
serializer = options[:serializer]
@serializer = serializer.is_a?(String) ? serializer.constantize : serializer
@options = options @options = options
@serializer_options = serializer_options @serializer_options = serializer_options
end end
@@ -42,16 +45,11 @@ module ActiveModel
private private
attr_reader :object, :embed, :embed_key attr_reader :object, :embed, :embed_key, :serializer
def target_serializer
serializer = options[:serializer]
serializer.is_a?(String) ? serializer.constantize : serializer
end
def find_serializable(object) def find_serializable(object)
if target_serializer if serializer
target_serializer.new(object, serializer_options) serializer.new(object, serializer_options)
elsif object.respond_to?(:active_model_serializer) && (ams = object.active_model_serializer) elsif object.respond_to?(:active_model_serializer) && (ams = object.active_model_serializer)
ams.new(object, serializer_options) ams.new(object, serializer_options)
else else