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.

Sign up for GitHub

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

Add flush option for Sinatra::ContentFor flush content #1225

Merged
merged 2 commits into from
Dec 21, 2018
Merged

Add flush option for Sinatra::ContentFor flush content #1225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb45e46
Add flush option to content_for
iguchi1124 Dec 30, 2016
d75c242
Merge branch 'master' into flush-content-for
namusyaka Dec 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions sinatra-contrib/lib/sinatra/content_for.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,12 @@ module ContentFor
#
# Your blocks can also receive values, which are passed to them
# by <tt>yield_content</tt>
def content_for(key, value = nil, &block)
def content_for(key, value = nil, options = {}, &block)
key = key.to_sym

block ||= proc { |*| value }
content_blocks[key.to_sym] << capture_later(&block)
clear_content_for(key) if options[:flush]
Copy link
Member

Choose a reason for hiding this comment

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

@iguchi1124 this is the only line that needs added in this method. Can you rebase with master and limit changes to just this line and the added tests?

Copy link
Member

Choose a reason for hiding this comment

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

Just tried to resolve the conflicts by web GUI.

content_blocks[key] << capture_later(&block)
Copy link
Member

Choose a reason for hiding this comment

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

I would rather leave this as:

 content_blocks[key.to_sym] << capture_later(&block)

and delete the assignment key = key.to_sym above.

end

# Check if a block of content with the given key was defined. For
Expand Down Expand Up @@ -172,10 +175,11 @@ def clear_content_for(key)
# Would pass <tt>1</tt> and <tt>2</tt> to all the blocks registered
# for <tt>:head</tt>.
def yield_content(key, *args, &block)
key = key.to_sym
if block_given? && !content_for?(key)
haml? ? capture_haml(*args, &block) : yield(*args)
else
content = content_blocks[key.to_sym].map { |b| capture(*args, &b) }
content = content_blocks[key].map { |b| capture(*args, &b) }
Copy link
Member

Choose a reason for hiding this comment

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

This change doesn't seem necessary to me. What do you think?

content.join.tap do |c|
if block_given? && (erb? || erubi? || erubis?)
@_out_buf << c
Expand Down
16 changes: 16 additions & 0 deletions sinatra-contrib/spec/content_for_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,22 @@ def render(engine, template)
content_for(:foo, "foo")
expect(yield_content(:foo)).to eq("foo")
end

context 'when flush option was disabled' do
it 'append content' do
content_for(:foo, "foo")
content_for(:foo, "bar")
expect(yield_content(:foo)).to eq("foobar")
end
end

context 'when flush option was enabled' do
it 'flush first content' do
content_for(:foo, "foo")
content_for(:foo, "bar", flush: true)
expect(yield_content(:foo)).to eq("bar")
end
end
end

# TODO: liquid radius markaby builder nokogiri
Expand Down