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

Rename add_linked to add_included

Browse Source 
Better reflect generated output
This commit is contained in:
Mateo Murphy 2015-03-20 10:49:33 -04:00
parent da86747a3e
commit 83c2854094
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/active_model/serializer/adapter/json_api.rb
View File

@ -65,7 +65,7 @@ module ActiveModel
end end
end end
def add_linked(resource_name, serializers, parent = nil) def add_included(resource_name, serializers, parent = nil)
serializers = Array(serializers) unless serializers.respond_to?(:each) serializers = Array(serializers) unless serializers.respond_to?(:each)
resource_path = [parent, resource_name].compact.join('.') resource_path = [parent, resource_name].compact.join('.')
@ -78,7 +78,7 @@ module ActiveModel
serializers.each do |serializer| serializers.each do |serializer|
attrs = attributes_for_serializer(serializer, @options) attrs = attributes_for_serializer(serializer, @options)
add_resource_links(attrs, serializer, add_linked: false) add_resource_links(attrs, serializer, add_included: false)
@top[:linked][plural_name].push(attrs) unless @top[:linked][plural_name].include?(attrs) @top[:linked][plural_name].push(attrs) unless @top[:linked][plural_name].include?(attrs)
end end
@ -86,7 +86,7 @@ module ActiveModel
serializers.each do |serializer| serializers.each do |serializer|
serializer.each_association do |name, association, opts| serializer.each_association do |name, association, opts|
add_linked(name, association, resource_path) if association add_included(name, association, resource_path) if association
end if include_nested_assoc? resource_path end if include_nested_assoc? resource_path
end end
end end
@ -139,7 +139,7 @@ module ActiveModel
end end
def add_resource_links(attrs, serializer, options = {}) def add_resource_links(attrs, serializer, options = {})
options[:add_linked] = options.fetch(:add_linked, true) options[:add_included] = options.fetch(:add_included, true)
serializer.each_association do |name, association, opts| serializer.each_association do |name, association, opts|
attrs[:links] ||= {} attrs[:links] ||= {}
@ -150,9 +150,9 @@ module ActiveModel
add_link(attrs, name, association) add_link(attrs, name, association)
end end
if @options[:embed] != :ids && options[:add_linked] if @options[:embed] != :ids && options[:add_included]
Array(association).each do |association| Array(association).each do |association|
add_linked(name, association) add_included(name, association)
end end
end end
end end