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

Merge pull request #1884 from bf4/simplify_relationship

Browse Source 
* Simplify Relationship
This commit is contained in:
Benjamin Fleischer
2016-08-17 16:18:14 -05:00
committed by GitHub
parent 26bcdbe44a abb15b9622
commit 455068d455
4 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/active_model_serializers/adapter/json_api.rb
View File

@@ -438,14 +438,7 @@ module ActiveModelSerializers
allow_wildcard: true
)
serializer.associations(include_directive).each_with_object({}) do |association, hash|
hash[association.key] = Relationship.new(
serializer,
association.serializer,
instance_options,
options: association.options,
links: association.links,
meta: association.meta
).as_json
hash[association.key] = Relationship.new(serializer, instance_options, association).as_json
end
end

13
lib/active_model_serializers/adapter/json_api/relationship.rb
View File

@@ -5,18 +5,21 @@ module ActiveModelSerializers
# {http://jsonapi.org/format/#document-resource-object-related-resource-links Document Resource Object Related Resource Links}
# {http://jsonapi.org/format/#document-links Document Links}
# {http://jsonapi.org/format/#document-resource-object-linkage Document Resource Relationship Linkage}
# {http://jsonapi.org/format/#document-meta Docment Meta}
def initialize(parent_serializer, serializer, serializable_resource_options, args = {})
# {http://jsonapi.org/format/#document-meta Document Meta}
def initialize(parent_serializer, serializable_resource_options, association)
serializer = association.serializer
options = association.options
links = association.links
meta = association.meta
@object = parent_serializer.object
@scope = parent_serializer.scope
@association_options = args.fetch(:options, {})
@association_options = options || {}
@serializable_resource_options = serializable_resource_options
@data = data_for(serializer)
@links = args.fetch(:links, {}).each_with_object({}) do |(key, value), hash|
@links = (links || {}).each_with_object({}) do |(key, value), hash|
result = Link.new(parent_serializer, value).as_json
hash[key] = result if result
end
meta = args.fetch(:meta, nil)
@meta = meta.respond_to?(:call) ? parent_serializer.instance_eval(&meta) : meta
end