ditkrg/active_model_serializers
4
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-24 06:46:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Generalize detection of serializable resource with errors

Browse Source
This commit is contained in:
Benjamin Fleischer 2015-12-02 11:50:08 -06:00
parent 0ba944dabf
commit dfe162638c
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/active_model/serializable_resource.rb
View File

@ -16,18 +16,13 @@ module ActiveModel
@resource = resource @resource = resource
@adapter_opts, @serializer_opts = @adapter_opts, @serializer_opts =
options.partition { |k, _| ADAPTER_OPTION_KEYS.include? k }.map { |h| Hash[h] } options.partition { |k, _| ADAPTER_OPTION_KEYS.include? k }.map { |h| Hash[h] }
end
# TECHDEBT: clean up single vs. collection of resources def errors?
if resource.respond_to?(:each) if resource.respond_to?(:each)
if resource.any? { |elem| elem.respond_to?(:errors) && !elem.errors.empty? } resource.any? { |elem| elem.respond_to?(:errors) && !elem.errors.empty? }
@serializer_opts[:serializer] = ActiveModel::Serializer::ErrorSerializer
@adapter_opts[:adapter] = :'json_api/error'
end
else else
if resource.respond_to?(:errors) && !resource.errors.empty? resource.respond_to?(:errors) && !resource.errors.empty?
@serializer_opts[:serializer] = ActiveModel::Serializer::ErrorSerializer
@adapter_opts[:adapter] = :'json_api/error'
end
end end
end end
@ -44,7 +39,11 @@ module ActiveModel
end end
def adapter def adapter
@adapter ||= ActiveModelSerializers::Adapter.create(serializer_instance, adapter_opts) @adapter ||=
begin
adapter_opts[:adapter] = :'json_api/error' if errors?
ActiveModelSerializers::Adapter.create(serializer_instance, adapter_opts)
end
end end
alias_method :adapter_instance, :adapter alias_method :adapter_instance, :adapter
@ -59,6 +58,7 @@ module ActiveModel
@serializer ||= @serializer ||=
begin begin
@serializer = serializer_opts.delete(:serializer) @serializer = serializer_opts.delete(:serializer)
@serializer = ActiveModel::Serializer::ErrorSerializer if errors?
@serializer ||= ActiveModel::Serializer.serializer_for(resource) @serializer ||= ActiveModel::Serializer.serializer_for(resource)
if serializer_opts.key?(:each_serializer) if serializer_opts.key?(:each_serializer)