-
Notifications
You must be signed in to change notification settings - Fork 1.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Empty collection root key from explicit serializer option #1618
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -182,7 +182,7 @@ def as_json(adapter_opts = nil) | |
|
||
# Used by adapter as resource root. | ||
def json_key | ||
root || object.class.model_name.to_s.underscore | ||
root || _type || object.class.model_name.to_s.underscore | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. not required in this PR, but makes sense |
||
end | ||
|
||
def read_attribute_for_serialization(attr) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,10 @@ | |
module ActiveModel | ||
class Serializer | ||
class CollectionSerializerTest < ActiveSupport::TestCase | ||
MessagesSerializer = Class.new(ActiveModel::Serializer) do | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We should align on |
||
type 'messages' | ||
end | ||
|
||
def setup | ||
@comment = Comment.new | ||
@post = Post.new | ||
|
@@ -84,6 +88,12 @@ def test_json_key_with_resource_without_name_and_no_serializers | |
assert_nil serializer.json_key | ||
end | ||
|
||
def test_json_key_with_empty_resources_with_serializer | ||
resource = [] | ||
serializer = collection_serializer.new(resource, serializer: MessagesSerializer) | ||
assert_equal 'messages', serializer.json_key | ||
end | ||
|
||
def test_json_key_with_root | ||
expected = 'custom_root' | ||
serializer = collection_serializer.new(@resource, root: expected) | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thinking about it now, shouldn't it be the responsibility of the adapter to determine the json key/root?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it does, but it uses information from the serializer....
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
From what I see, we can set the
root
as adapter option and callserializer._type
andserializer.object.class.model_name.to_s.underscore
from the adapter. Same goes for collection_serializer. What do you think?