Support conditions in link statements #2279
Merged
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
mkon
force-pushed
the
link-conditions
branch
2 times, most recently
from
aa1be1f to
aef6acb
Compare
ghost
reviewed
Sep 5, 2018
lib/active_model/serializer.rb
Outdated
| _links[name] = block || value | ||
| def self.link(name, *args, &block) | ||
| options = args.extract_options! | ||
| # For compatibility with the use cae of passing link directly as string argument |
bf4
reviewed
Oct 24, 2018
| options = args.extract_options! | ||
| # For compatibility with the use case of passing link directly as string argument | ||
| # without block, we are creating a wrapping block | ||
| _links[name] = Link.new(name, options, block || ->(_serializer) { args.first }) |
bf4
reviewed
Oct 24, 2018
| # end | ||
| # end | ||
| # | ||
| class Link < Field |
bf4
reviewed
Oct 24, 2018
| @@ -480,6 +480,10 @@ def relationships_for(serializer, requested_associations, include_slice) | |||
| # }.reject! {|_,v| v.nil? } | |||
| def links_for(serializer) | |||
| serializer._links.each_with_object({}) do |(name, value), hash| | |||
| if value.is_a?(ActiveModel::Serializer::Link) | |||
There was a problem hiding this comment.
Isn't it always a ActiveModel::Serializer::Link now?
bf4
reviewed
Oct 24, 2018
| if value.is_a?(ActiveModel::Serializer::Link) | ||
| next if value.excluded?(serializer) | ||
| value = value.block | ||
| end | ||
| result = Link.new(serializer, value).as_json |
|
Rebased. Looks like the tests are stable now in upstream 👍 |
|
Looks good. |
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.
Hello,
First time contributor here, however have been using AMS happily for quite some time.
Purpose
Currently hiding certain links is a bit cumbersome, since the serializer's instance options are not available when the link block is evaluated by the (JSON-API) adapter.
With this change the
link()statement in serializers supports the same condition options asattribute()and is possible to hide certain links from being rendered.Eg I can now write a serializer like this:
Changes
ActiveModel::Serializer::Linkas a subclass ofFieldto store options and handle conditionlinks_fordetectsActiveModel::Serializer::Link, excludes them if necessary and converts them to the adapter'sLinkinstances.