Skip to content
Open
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
11 changes: 6 additions & 5 deletions lib/mustache.ex
Original file line number Diff line number Diff line change
Expand Up @@ -41,29 +41,30 @@ defmodule Mustache do
[full, predicate, var, body] ->
val = indifferent_access(data, var)
section_val = case predicate do
"#" -> process_if(body, val)
"^" -> process_unless(body, val)
"#" -> process_if(body, val, data)
"^" -> process_unless(body, val, data)
end
process_section(String.replace(template, full, section_val), data)
end
end

defp process_if(template, val) do
defp process_if(template, val, data) do
case val do
nil -> ""
false -> ""
[] -> ""
[_ | _] -> val
|> Stream.map(&(render(template, &1)))
|> Enum.join()
true -> render(template, data)
val -> render(template, val)
end
end

defp process_unless(template, val) do
defp process_unless(template, val, data) do
case val do
nil -> render(template, val)
false -> render(template, val)
false -> render(template, data)
[] -> render(template, val)
_val -> ""
end
Expand Down
7 changes: 7 additions & 0 deletions test/mustache_feature_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,13 @@ defmodule MustacheFeatureTest do
%{people: [%{name: "Joe"}, %{name: "Jill"}]}) == "\"Joe Jill \""
end

test "Section Interpolation - Flat Object" do
template = "\"{{#mph}}{{speed}} mph{{/mph}}{{^mph}}{{speed}} kph{{/mph}}\""

assert Mustache.render(template, %{mph: true, speed: 24}) == "\"24 mph\""
assert Mustache.render(template, %{mph: false, speed: 24}) == "\"24 kph\""
end

#Whitespace sensitivity

test "Interpolation - Surrounding Whitespace" do
Expand Down
2 changes: 1 addition & 1 deletion test/mustache_integration_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@ defmodule MustacheTest do
</html>
"""
actual = Mustache.render(template, data)
assert String.strip(actual) == String.strip(expected)
assert String.trim(actual) == String.trim(expected)
end
end