Update yield_content to append default to ERB template buffer #1500
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
|
@programmarchy, @krelly any chance you could vet this PR and make sure it fixes the issues you found? |
|
Thanks @krelly 👍🏻 |
|
Will review soon |
namusyaka
requested changes
Dec 8, 2018
| @@ -96,8 +96,7 @@ def capture(*args, &block) | |||
| result = block[*args] | |||
| elsif current_engine == :erb || current_engine == :slim | |||
| @_out_buf, _buf_was = '', @_out_buf | |||
| block[*args] | |||
| result = eval('@_out_buf', block.binding) | |||
| result = block.call(*args) | |||
There was a problem hiding this comment.
You should try to get result from @_out_buf unless returned value is empty.
raw = block.call(*args)
captured = block.binding.eval('@_out_buf')
result = captured.empty? ? raw : captured
namusyaka
reviewed
Dec 9, 2018
| content_blocks[key.to_sym].map { |b| capture(*args, &b) }.join | ||
| def yield_content(key, *args, &block) | ||
| if block_given? && !content_for?(key) | ||
| capture(*args, &block) |
There was a problem hiding this comment.
Why do you use capture even if unnecessary? This makes yield_content performance be slowed a bit.
There was a problem hiding this comment.
That's a good point. I was trying to eliminate the need to check for haml here, but will revert back to previous version.
|
@namusyaka thanks for helping me work through this one! |
netbsd-srcmastr
pushed a commit
to NetBSD/pkgsrc
that referenced
this pull request
Feb 6, 2019
### sinatra-contrib * Add `flush` option to `content_for` [#1225](sinatra/sinatra#1225) by Shota Iguchi * Drop activesupport dependency from sinatra-contrib [#1448](sinatra/sinatra#1448) * Update `yield_content` to append default to ERB template buffer [#1500](sinatra/sinatra#1500) by Jordan Owens
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.
Resolves #1480. For ERB, using a block with an expression printing tag is invalid syntax. This PR allows
yield_contentto append directly to the template buffer using a non-printing tag.