Skip to content
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 2 commits into from
Mar 27, 2016

Conversation

bf4
Copy link
Member

@bf4 bf4 commented Mar 25, 2016

Fixes #1617

Closes #1537

  • when empty collection, get key from explicit serializer
  • serializer instance json_key uses _type when root not given
    before falling back on object class
  • remove crazy metaprogramming in collection test that monkey patches
    Array instances.

@@ -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
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not required in this PR, but makes sense

@@ -182,7 +182,7 @@ def as_json(adapter_opts = nil)

# Used by adapter as resource root.
def json_key
Copy link
Member

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?

Copy link
Member Author

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....

Copy link
Member

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 call serializer._type and serializer.object.class.model_name.to_s.underscore from the adapter. Same goes for collection_serializer. What do you think?

@groyoh
Copy link
Member

groyoh commented Mar 25, 2016

Great job! The PR looks good. I'll be ok to merge it once the rubocop is fixed.

…ed to collection serializer and each_searializer is specified.
@bf4 bf4 force-pushed the RomanKapitonov-master branch from e5c4ac1 to a74d174 Compare March 27, 2016 15:55
@bf4
Copy link
Member Author

bf4 commented Mar 27, 2016

Running

@@ -3,6 +3,10 @@
module ActiveModel
class Serializer
class CollectionSerializerTest < ActiveSupport::TestCase
MessagesSerializer = Class.new(ActiveModel::Serializer) do
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should align on Class.new(ActiveModel::Serializer) vs class Name; end.

@groyoh
Copy link
Member

groyoh commented Mar 27, 2016

Merging when the build is done 😉

@groyoh groyoh merged commit 5af7d96 into rails-api:master Mar 27, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants