Ensure that purged and replaced areas are not evaluated #23
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
…ea_contents Skip purged and replaced area contents
rwz
force-pushed
the
master
branch
3 times, most recently
from
7a4d140
to
afbb627
Compare
| @@ -189,7 +189,7 @@ def prepend(name, content=nil, &block) | |||
| # @param [String] content | |||
| # Optionally provide a String of content, instead of a block. A block will take precedence. | |||
| def replace(name, content=nil, &block) | |||
| content = capture(&block) if block_given? | |||
| content = capture(&block) if block_given? && capture_content?(name) | |||
There was a problem hiding this comment.
Correct me if I'm wrong here, but this solution seems like it would only work if the replace methods content were a block. If the content were a string, the first half of the conditional would evaluate false, so this line would not execute, so the call to add_instruction_to_area would proceed.
It seems to me that what we would actually want is a guard-clause:
def replace(name, content=nil, &block)
return unless capture_content?(name)
content = capture(&block) if block_given?
add_instruction_to_area name, :replace, [content]
end
|
This needs to be rebased and squashed, and I think the implementation should be evolved a bit (see comment above), but other than that, this seems like a healthy PR, right @rwz? |
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.
This fixes #20. Purged and replaced areas from parent layouts should not be evaluated.