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.

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

Keep only around_render hook #107

Merged
merged 1 commit into from
Jan 24, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,10 @@ private class ExampleWithBlock
h1 { yield }
end

private def before_render(&)
span { "Before render" }
end

private def around_render(&)
span { "Around start" }
span { "Before" }
yield
span { "Around end" }
end

private def after_render(&)
span { "After render" }
span { "After" }
end
end

Expand All @@ -29,31 +21,21 @@ private class ExampleWithoutBlock
h1 { "Without block" }
end

private def before_render(&)
span { "Before render" }
end

private def around_render(&)
span { "Around start" }
span { "Before" }
yield
span { "Around end" }
end

private def after_render(&)
span { "After render" }
span { "After" }
end
end

describe "hooks" do
describe "around render" do
context "with block" do
it "allows defining hooks before_render, around_render, after_render" do
actual_html = ExampleWithBlock.new.to_s { "With block" }
expected_html = normalize_html <<-HTML
<span>Before render</span>
<span>Around start</span>
<span>Before</span>
<h1>With block</h1>
<span>Around end</span>
<span>After render</span>
<span>After</span>
HTML

actual_html.should eq expected_html
Expand All @@ -64,11 +46,9 @@ describe "hooks" do
it "allows defining hooks before_render, around_render, after_render" do
actual_html = ExampleWithoutBlock.new.to_s
expected_html = normalize_html <<-HTML
<span>Before render</span>
<span>Around start</span>
<span>Before</span>
<h1>Without block</h1>
<span>Around end</span>
<span>After render</span>
<span>After</span>
HTML

actual_html.should eq expected_html
Expand Down
34 changes: 7 additions & 27 deletions src/blueprint/html.cr
Original file line number Diff line number Diff line change
Expand Up @@ -36,47 +36,27 @@ module Blueprint::HTML

@buffer = buffer

{% if @type.has_method?(:before_render) %}
before_render { }
{% end %}

{% if @type.has_method?(:around_render) %}
around_render { blueprint }
{% else %}
blueprint
{% end %}

{% if @type.has_method?(:after_render) %}
after_render { }
{% end %}
around_render { blueprint }
end

def to_s(buffer : String::Builder, &) : Nil
return unless render?

@buffer = buffer

{% if @type.has_method?(:before_render) %}
before_render { yield }
{% end %}

{% if @type.has_method?(:around_render) %}
around_render do
blueprint { BufferRenderer.render(to: @buffer) { yield } }
end
{% else %}
around_render do
blueprint { BufferRenderer.render(to: @buffer) { yield } }
{% end %}

{% if @type.has_method?(:after_render) %}
after_render { yield }
{% end %}
end
end

def render? : Bool
true
end

def around_render(&)
yield
end

def element(tag_name : String | Symbol, **attributes, &) : Nil
@buffer << "<"
@buffer << tag_name
Expand Down
Loading