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

Don't treat has_one associations embed objects as an array

Browse Source 
Closes #442

Thanks @arrtchiu for reporing and giving a test case
This commit is contained in:
Santiago Pastorino
2013-11-04 10:09:27 -02:00
parent f2bfddd805
commit 60b5901af8
3 changed files with 40 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,23 +19,16 @@ module ActiveModel
@key = options[:key]
@embedded_key = options[:root] || name
self.serializer_class = @options[:serializer]
serializer = @options[:serializer]
@serializer_class = serializer.is_a?(String) ? serializer.constantize : serializer
end
attr_reader :name, :embed_ids, :embed_objects, :serializer_class
attr_accessor :embed_in_root, :embed_key, :key, :embedded_key, :root_key, :options
attr_reader :name, :embed_ids, :embed_objects
attr_accessor :embed_in_root, :embed_key, :key, :embedded_key, :root_key, :serializer_class, :options
alias embed_ids? embed_ids
alias embed_objects? embed_objects
alias embed_in_root? embed_in_root
def serializer_class=(serializer)
@serializer_class = serializer.is_a?(String) ? serializer.constantize : serializer
if @serializer_class && !(@serializer_class <= ArraySerializer)
@options.merge!(each_serializer: @serializer_class)
@serializer_class = ArraySerializer
end
end
def embed=(embed)
@embed_ids = embed == :id || embed == :ids
@embed_objects = embed == :object || embed == :objects
@@ -49,6 +42,10 @@ module ActiveModel
end
def build_serializer(object)
if object.respond_to?(:to_ary)
@options.merge!(each_serializer: @serializer_class)
@serializer_class = ArraySerializer
end
@serializer_class ||= Serializer.serializer_for(object) || DefaultSerializer
@serializer_class.new(object, @options)
end
@@ -62,6 +59,10 @@ module ActiveModel
end
def build_serializer(object)
if @serializer_class && !(@serializer_class <= ArraySerializer)
@options.merge!(each_serializer: @serializer_class)
@serializer_class = ArraySerializer
end
@serializer_class ||= ArraySerializer
@serializer_class.new(object, @options)
end