ditkrg/active_model_serializers
5
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-25 07:16:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up HasOne array wrapping logic

Browse Source 
Introduce private _wrap_in_array option for now.
This commit is contained in:
Adrian Mugnolo and Santiago Pastorino
2013-12-17 15:39:15 -02:00
committed by Santiago Pastorino
parent 28fbb62ec4
commit f14f931957
3 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/active_model/serializer/associations.rb
View File

@@ -38,13 +38,6 @@ module ActiveModel
@serializer_class.new(object, options.merge(@options))
end
private
def use_array_serializer!
@options.merge!(each_serializer: @serializer_class)
@serializer_class = ArraySerializer
end
class HasOne < Association
def initialize(name, *args)
super
@@ -53,12 +46,8 @@ module ActiveModel
end
def build_serializer(object, options = {})
if object.respond_to?(:to_ary) && !(@serializer_class && @serializer_class <= ArraySerializer)
use_array_serializer!
else
@serializer_class ||= Serializer.serializer_for(object) || DefaultSerializer
end
@serializer_class ||= Serializer.serializer_for(object) || DefaultSerializer
options[:_wrap_in_array] = embed_in_root?
super
end
end
@@ -72,7 +61,8 @@ module ActiveModel
def build_serializer(object, options = {})
if @serializer_class && !(@serializer_class <= ArraySerializer)
use_array_serializer!
@options[:each_serializer] = @serializer_class
@serializer_class = ArraySerializer
else
@serializer_class ||= ArraySerializer
end