Skip to content

Omit attributes when the value is an empty list or contains only nils #910

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

Merged
joeldrapper merged 1 commit into from
Jul 21, 2025
Merged

Omit attributes when the value is an empty list or contains only nils #910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 19 additions & 5 deletions lib/phlex/sgml/attributes.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,13 @@ def generate_nested_attributes(attributes, base_name, buffer = +"")
when Hash
generate_nested_attributes(v, "#{base_name}#{name}-", buffer)
when Array
buffer << " " << base_name << name << '="' << generate_nested_tokens(v) << '"'
if (value = generate_nested_tokens(v))
buffer << " " << base_name << name << '="' << value << '"'
end
when Set
buffer << " " << base_name << name << '="' << generate_nested_tokens(v.to_a) << '"'
if (value = generate_nested_tokens(v.to_a))
buffer << " " << base_name << name << '="' << value << '"'
end
when Phlex::SGML::SafeObject
buffer << " " << base_name << name << '="' << v.to_s.gsub('"', "&quot;") << '"'
else
Expand Down Expand Up @@ -181,11 +185,19 @@ def generate_nested_tokens(tokens, sep = " ", gsub_from = nil, gsub_to = "")
buffer << token.to_s
end
when Array
if token.length > 0
if token.length > 0 && (value = generate_nested_tokens(token, sep, gsub_from, gsub_to))
if i > 0
buffer << sep << value
else
buffer << value
end
end
when Set
if token.length > 0 && (value = generate_nested_tokens(token.to_a, sep, gsub_from, gsub_to))
if i > 0
buffer << sep << generate_nested_tokens(token, sep, gsub_from, gsub_to)
buffer << sep << value
else
buffer << generate_nested_tokens(token, sep, gsub_from, gsub_to)
buffer << value
end
end
when nil
Expand All @@ -197,6 +209,8 @@ def generate_nested_tokens(tokens, sep = " ", gsub_from = nil, gsub_to = "")
i += 1
end

return if buffer.empty?

buffer.gsub('"', "&quot;")
end

Expand Down
91 changes: 83 additions & 8 deletions quickdraw/sgml/attributes.test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,12 +194,27 @@

test "_, Array" do
output = phlex { div(attribute: []) }
assert_equal_html output, %(<div attribute=""></div>)
assert_equal_html output, %(<div></div>)
end

test "_, Array(Array)" do
output = phlex { div(attribute: [[], [], []]) }
assert_equal_html output, %(<div></div>)
end

test "_, Array(nil)" do
output = phlex { div(attribute: [nil, nil, nil]) }
assert_equal_html output, %(<div attribute=""></div>)
assert_equal_html output, %(<div></div>)
end

test "_, Array(Array(nil))" do
output = phlex { div(attribute: [[nil, nil], [nil, nil]]) }
assert_equal_html output, %(<div></div>)
end

test "_, Array(Array(nil), nil)" do
output = phlex { div(attribute: [[nil, nil], nil]) }
assert_equal_html output, %(<div></div>)
end

test "_, Array(String)" do
Expand Down Expand Up @@ -371,6 +386,11 @@
assert_equal_html output, %(<div data-controller-hello="world"></div>)
end

test "_, Hash(_, Hash(_, nil)" do
output = phlex { div(data: { controller: { hello: nil } }) }
assert_equal_html output, %(<div></div>)
end

test "_, Hash(_, Phlex::SGML::SafeObject)" do
output = phlex { div(data: { controller: Phlex::SGML::SafeValue.new("Hello") }) }
assert_equal_html output, %(<div data-controller="Hello"></div>)
Expand All @@ -386,15 +406,70 @@
assert_equal_html output, %(<div></div>)
end

test "_, Hash(_, Array)" do
output = phlex { div(data: { action: [] }) }
assert_equal_html output, %(<div></div>)
end

test "_, Hash(_, Array(nil))" do
output = phlex { div(data: { action: [nil] }) }
assert_equal_html output, %(<div></div>)
end

test "_, Hash(_, Set)" do
output = phlex { div(data: { action: Set[] }) }
assert_equal_html output, %(<div></div>)
end

test "_, Hash(_, Set(Set))" do
output = phlex { div(data: { action: Set[Set[]] }) }
assert_equal_html output, %(<div></div>)
end

test "_, Hash(_, Set(nil))" do
output = phlex { div(data: { action: Set[nil] }) }
assert_equal_html output, %(<div></div>)
end

test "_, Hash(_, Set(Set(nil)))" do
output = phlex { div(data: { action: Set[Set[nil]] }) }
assert_equal_html output, %(<div></div>)
end

test "_, Hash(_, *invalid*)" do
assert_raises(Phlex::ArgumentError) do
phlex { div(data: { controller: Object.new }) }
end
end

test "_, Set" do
output = phlex { div(attribute: Set[]) }
assert_equal_html output, %(<div></div>)
end

test "_, Set(nil)" do
output = phlex { div(attribute: Set[nil, nil, nil]) }
assert_equal_html output, %(<div attribute=""></div>)
assert_equal_html output, %(<div></div>)
end

test "_, Set(Set)" do
output = phlex { div(attribute: Set[Set[]]) }
assert_equal_html output, %(<div></div>)
end

test "_, Set(Set(nil))" do
output = phlex { div(attribute: Set[Set[nil, nil, nil]]) }
assert_equal_html output, %(<div></div>)
end

test "_, Set(Set, nil)" do
output = phlex { div(attribute: Set[Set[], nil]) }
assert_equal_html output, %(<div></div>)
end

test "_, Set(Set(nil), nil)" do
output = phlex { div(attribute: Set[Set[nil], nil]) }
assert_equal_html output, %(<div></div>)
end

test "_, Set(String)" do
Expand Down Expand Up @@ -540,7 +615,7 @@

test ":srcset on img with an Array" do
output = phlex { img(srcset: []) }
assert_equal_html output, %(<img srcset="">)
assert_equal_html output, %(<img>)

output = phlex { img(srcset: ["/width=400/image.jpg 1x", "/width=400,dpr=2/image.jpg 2x"]) }
assert_equal_html output, %(<img srcset="/width=400/image.jpg 1x, /width=400%2Cdpr=2/image.jpg 2x">)
Expand All @@ -551,7 +626,7 @@

test ":media on link with an Array" do
output = phlex { link(media: []) }
assert_equal_html output, %(<link media="">)
assert_equal_html output, %(<link>)

output = phlex { link(media: ["screen", "print"]) }
assert_equal_html output, %(<link media="screen, print">)
Expand All @@ -562,15 +637,15 @@

test ":sizes on link with an Array" do
output = phlex { link(sizes: []) }
assert_equal_html output, %(<link sizes="">)
assert_equal_html output, %(<link>)

output = phlex { link(sizes: ["16x16", "32x32", "64x64"]) }
assert_equal_html output, %(<link sizes="16x16, 32x32, 64x64">)
end

test ":imagesrcset on link with an Array when rel is preload and as is image" do
output = phlex { link(imagesrcset: [], rel: "preload", as: "image") }
assert_equal_html output, %(<link imagesrcset="" rel="preload" as="image">)
assert_equal_html output, %(<link rel="preload" as="image">)

output = phlex { link(imagesrcset: ["image.jpg 1x", "image@2x.jpg 2x"], rel: "preload", as: "image") }
assert_equal_html output, %(<link imagesrcset="image.jpg 1x, image@2x.jpg 2x" rel="preload" as="image">)
Expand All @@ -584,7 +659,7 @@

test ":accept on input with array when type is file" do
output = phlex { input(accept: [], type: "file") }
assert_equal_html output, %(<input accept="" type="file">)
assert_equal_html output, %(<input type="file">)

output = phlex { input(accept: ["image/jpeg", "image/png"], type: "file") }
assert_equal_html output, %(<input accept="image/jpeg, image/png" type="file">)
Expand Down
Loading