serializable_hash and as_json should take options = nil #965
Conversation
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
per ActiveModel::Serialization#serializable_hash https://github.com/rails/rails/blob/96bb004fc6e67cdf1b873f11ad5f8efd06949797/activemodel/lib/active_model/serialization.rb def serializable_hash(options = nil) options ||= {} Otherwise, passing in nil to `as_json` or `serializable_hash` makes things blow up when passing nil into attributes
| @@ -27,7 +28,7 @@ def serializable_hash(options = {}) | |||
| end | |||
| end | |||
| else | |||
| @hash[:data] = attributes_for_serializer(serializer, @options) | |||
| @hash[:data] = attributes_for_serializer(serializer, options) | |||
| add_resource_relationships(@hash[:data], serializer) | |||
There was a problem hiding this comment.
Note there is some confusion in the method here between the options to the serializable_hash and the @options to the adapter, which I have resolved.
bf4
added a commit
to bf4/active_model_serializers
that referenced
this pull request
Jun 24, 2015
|
Failure seems transient, related to global state issues present in master https://travis-ci.org/rails-api/active_model_serializers/jobs/68187470 Possibly related to #961 |
joaomdmoura
added a commit
that referenced
this pull request
Jun 25, 2015
options fedault valueserializable_hash and as_json
|
LGTM I'm merging it. |
| @@ -15,10 +15,11 @@ def initialize(serializer, options = {}) | |||
| end | |||
| end | |||
|
|
|||
| def serializable_hash(options = {}) | |||
| def serializable_hash(options = nil) | |||
| options = {} | |||
bf4
added a commit
to bf4/active_model_serializers
that referenced
this pull request
Aug 11, 2015
Introduced in rails-api#965, surfaced in rails-api#1041
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
per ActiveModel::Serialization#serializable_hash
https://github.com/rails/rails/blob/96bb004fc6e67cdf1b873f11ad5f8efd06949797/activemodel/lib/active_model/serialization.rb
Otherwise, passing in nil to
as_jsonorserializable_hashmakes thingsblow up when passing nil into attributes
Extracted from #954