Skip to content

Commit 2f3f987

Browse files
Roman KapitonovRoman Kapitonov
Roman Kapitonov
authored and
Roman Kapitonov
committed
[FIX] Fetch json key from item serializer if empty collection is passed to collection serializer and each_searializer is specified.
1 parent 532828b commit 2f3f987

File tree

3 files changed

+29
-4
lines changed

3 files changed

+29
-4
lines changed

lib/active_model/serializer/collection_serializer.rb

+17-4
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,14 @@ class CollectionSerializer
1010
def initialize(resources, options = {})
1111
@root = options[:root]
1212
@object = resources
13+
14+
serializer_context_class = options.fetch(:serializer_context_class, ActiveModel::Serializer)
15+
16+
if resources.blank? && options[:serializer]
17+
@each_serializer = options[:serializer]
18+
end
19+
1320
@serializers = resources.map do |resource|
14-
serializer_context_class = options.fetch(:serializer_context_class, ActiveModel::Serializer)
1521
serializer_class = options.fetch(:serializer) { serializer_context_class.serializer_for(resource) }
1622

1723
if serializer_class.nil?
@@ -23,7 +29,7 @@ def initialize(resources, options = {})
2329
end
2430

2531
def json_key
26-
root || derived_root
32+
root || derived_root || guess_root || default_root
2733
end
2834

2935
def paginated?
@@ -39,8 +45,15 @@ def paginated?
3945
private
4046

4147
def derived_root
42-
key = serializers.first.try(:json_key) || object.try(:name).try(:underscore)
43-
key.try(:pluralize)
48+
key = serializers.first.try(:json_key).try(:pluralize)
49+
end
50+
51+
def default_root
52+
object.try(:name).try(:underscore).try(:pluralize)
53+
end
54+
55+
def guess_root
56+
@each_serializer.try(:allocate).try(:json_key).try(:pluralize)
4457
end
4558
end
4659
end

test/collection_serializer_test.rb

+6
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,12 @@ def test_json_key_with_resource_without_name_and_no_serializers
8484
assert_nil serializer.json_key
8585
end
8686

87+
def test_json_key_with_empty_resources_with_serializer
88+
resource = []
89+
serializer = collection_serializer.new([], serializer: MessagesSerializer)
90+
assert_equal 'messages', serializer.json_key
91+
end
92+
8793
def test_json_key_with_root
8894
expected = 'custom_root'
8995
serializer = collection_serializer.new(@resource, root: expected)

test/fixtures/poro.rb

+6
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,12 @@ def json_key
164164
end
165165
end
166166

167+
MessagesSerializer = Class.new(ActiveModel::Serializer) do
168+
def json_key
169+
'messages'
170+
end
171+
end
172+
167173
AlternateBlogSerializer = Class.new(ActiveModel::Serializer) do
168174
attribute :id
169175
attribute :name, key: :title

0 commit comments

Comments
 (0)