mirror of
https://github.com/ditkrg/active_model_serializers.git
synced 2026-01-25 15:23:06 +00:00
Extend serializer lookup to the parent serializer.
This commit is contained in:
@@ -11,9 +11,8 @@ module ActiveModel
|
||||
@root = options[:root]
|
||||
@object = resources
|
||||
@serializers = resources.map do |resource|
|
||||
serializer_class = options.fetch(:serializer) do
|
||||
ActiveModel::Serializer.serializer_for(resource)
|
||||
end
|
||||
serializer_context_class = options.fetch(:serializer_context_class, ActiveModel::Serializer)
|
||||
serializer_class = options.fetch(:serializer) { serializer_context_class.serializer_for(resource) }
|
||||
|
||||
if serializer_class.nil?
|
||||
fail NoSerializerError, "No serializer found for resource: #{resource.inspect}"
|
||||
|
||||
@@ -42,13 +42,13 @@ module ActiveModel
|
||||
def build_association(subject, parent_serializer_options)
|
||||
association_value = subject.send(name)
|
||||
reflection_options = options.dup
|
||||
serializer_class = ActiveModel::Serializer.serializer_for(association_value, reflection_options)
|
||||
serializer_class = subject.class.serializer_for(association_value, reflection_options)
|
||||
|
||||
if serializer_class
|
||||
begin
|
||||
serializer = serializer_class.new(
|
||||
association_value,
|
||||
serializer_options(parent_serializer_options, reflection_options)
|
||||
serializer_options(subject, parent_serializer_options, reflection_options)
|
||||
)
|
||||
rescue ActiveModel::Serializer::ArraySerializer::NoSerializerError
|
||||
reflection_options[:virtual_value] = association_value.try(:as_json) || association_value
|
||||
@@ -62,11 +62,12 @@ module ActiveModel
|
||||
|
||||
private
|
||||
|
||||
def serializer_options(parent_serializer_options, reflection_options)
|
||||
def serializer_options(subject, parent_serializer_options, reflection_options)
|
||||
serializer = reflection_options.fetch(:serializer, nil)
|
||||
|
||||
serializer_options = parent_serializer_options.except(:serializer)
|
||||
serializer_options[:serializer] = serializer if serializer
|
||||
serializer_options[:serializer_context_class] = subject.class
|
||||
serializer_options
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user