luna/kemal
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix content_for failing to capture the correct block input (#639)

Browse source
This commit is contained in:
Serdar Dogruyol - Sedo セド 2022-06-27 12:28:13 +03:00 committed by GitHub
parent d53d253620
commit 317d086b4c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
spec/asset/hello_with_content_for.ecr
View file

@ -1,5 +1,5 @@
Hello <%= name %> Hello <%= name %>
<% content_for "custom" do %> <% content_for "meta" do %>
<h1>Hello from otherside</h1> <title>Kemal Spec</title>
<% end %> <% end %>

4
spec/asset/layout_with_yield.ecr
View file

@ -1,6 +1,8 @@
<html> <html>
<head>
<%= yield_content "meta" %>
</head>
<body> <body>
<%= content %> <%= content %>
<%= yield_content "custom" %>
</body> </body>
</html> </html>

8
spec/asset/layout_with_yield_and_vars.ecr
View file

@ -1,8 +1,10 @@
<html> <html>
<head>
<%= yield_content "meta" %>
</head>
<body> <body>
<%= content %> <%= content %>
<%= yield_content "custom" %> <%= var1 %>
<%= var1 %> <%= var2 %>
<%= var2 %>
</body> </body>
</html> </html>

4
spec/view_spec.cr
View file

@ -56,8 +56,8 @@ describe "Views" do
end end
request = HTTP::Request.new("GET", "/view/world") request = HTTP::Request.new("GET", "/view/world")
client_response = call_request_on_app(request) client_response = call_request_on_app(request)
client_response.body.should contain("Hello world") client_response.body.scan("Hello world").size.should eq(1)
client_response.body.should contain("<h1>Hello from otherside</h1>") client_response.body.should contain("<title>Kemal Spec</title>")
end end
it "does not render content_for that was not yielded" do it "does not render content_for that was not yielded" do

9
src/kemal/helpers/macros.cr
View file

@ -43,7 +43,14 @@ macro yield_content(key)
if CONTENT_FOR_BLOCKS.has_key?({{key}}) if CONTENT_FOR_BLOCKS.has_key?({{key}})
__caller_filename__ = CONTENT_FOR_BLOCKS[{{key}}][0] __caller_filename__ = CONTENT_FOR_BLOCKS[{{key}}][0]
%proc = CONTENT_FOR_BLOCKS[{{key}}][1] %proc = CONTENT_FOR_BLOCKS[{{key}}][1]
%proc.call if __content_filename__ == __caller_filename__
if __content_filename__ == __caller_filename__
%old_content_io, content_io = content_io, IO::Memory.new
%proc.call
%result = content_io.to_s
content_io = %old_content_io
%result
end
end end
end end