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

Follows https://github.com/rails-api/active_model_serializers/pull/2100

Browse Source
This commit is contained in:
Benjamin Fleischer
2017-11-19 23:55:46 -06:00
committed by Wasif Hossain
parent 7896ad656a
commit 06fcd34807
3 changed files with 91 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/active_model/serializer.rb
View File

@@ -365,6 +365,9 @@ module ActiveModel
def serializable_hash(adapter_options = nil, options = {}, adapter_instance = self.class.serialization_adapter_instance)
adapter_options ||= {}
options[:include_directive] ||= ActiveModel::Serializer.include_directive_from_options(adapter_options)
if (fieldset = adapter_options[:fieldset])
options[:fields] = fieldset.fields_for(json_key)
end
resource = attributes_hash(adapter_options, options, adapter_instance)
relationships = associations_hash(adapter_options, options, adapter_instance)
resource.merge(relationships)
@@ -379,7 +382,12 @@ module ActiveModel
# Used by adapter as resource root.
def json_key
root || _type || object.class.model_name.to_s.underscore
root || _type ||
begin
object.class.model_name.to_s.underscore
rescue ArgumentError
'anonymous_object'
end
end
def read_attribute_for_serialization(attr)