Skip to content

Commit 83c2854

Browse files
committed
Rename add_linked to add_included
Better reflect generated output
1 parent da86747 commit 83c2854

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

lib/active_model/serializer/adapter/json_api.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def add_link(resource, name, serializer)
6565
end
6666
end
6767

68-
def add_linked(resource_name, serializers, parent = nil)
68+
def add_included(resource_name, serializers, parent = nil)
6969
serializers = Array(serializers) unless serializers.respond_to?(:each)
7070

7171
resource_path = [parent, resource_name].compact.join('.')
@@ -78,15 +78,15 @@ def add_linked(resource_name, serializers, parent = nil)
7878
serializers.each do |serializer|
7979
attrs = attributes_for_serializer(serializer, @options)
8080

81-
add_resource_links(attrs, serializer, add_linked: false)
81+
add_resource_links(attrs, serializer, add_included: false)
8282

8383
@top[:linked][plural_name].push(attrs) unless @top[:linked][plural_name].include?(attrs)
8484
end
8585
end
8686

8787
serializers.each do |serializer|
8888
serializer.each_association do |name, association, opts|
89-
add_linked(name, association, resource_path) if association
89+
add_included(name, association, resource_path) if association
9090
end if include_nested_assoc? resource_path
9191
end
9292
end
@@ -139,7 +139,7 @@ def serialized_object_type(serializer)
139139
end
140140

141141
def add_resource_links(attrs, serializer, options = {})
142-
options[:add_linked] = options.fetch(:add_linked, true)
142+
options[:add_included] = options.fetch(:add_included, true)
143143

144144
serializer.each_association do |name, association, opts|
145145
attrs[:links] ||= {}
@@ -150,9 +150,9 @@ def add_resource_links(attrs, serializer, options = {})
150150
add_link(attrs, name, association)
151151
end
152152

153-
if @options[:embed] != :ids && options[:add_linked]
153+
if @options[:embed] != :ids && options[:add_included]
154154
Array(association).each do |association|
155-
add_linked(name, association)
155+
add_included(name, association)
156156
end
157157
end
158158
end

0 commit comments

Comments
 (0)