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

Author: z1lk

lib/phlex/sgml.rb

@@ -591,9 +591,13 @@ def json_escape(string)
 			when Hash
 				__nested_attributes__(v, "#{base_name}#{name}-", buffer)
 			when Array
-				buffer << " " << base_name << name << '="' << __nested_tokens__(v) << '"'
+				if (value = __nested_tokens__(v))
+					buffer << " " << base_name << name << '="' << value << '"'
+				end
 			when Set
-				buffer << " " << base_name << name << '="' << __nested_tokens__(v.to_a) << '"'
+				if (value = __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
@@ -636,11 +640,19 @@ def json_escape(string)
 					buffer << token.to_s
 				end
 			when Array
-				if token.length > 0
+				if (value = __nested_tokens__(token, sep))
+					if i > 0
+						buffer << sep << value
+					else
+						buffer << value
+					end
+				end
+			when Set
+				if (value = __nested_tokens__(token.to_a, sep))
 					if i > 0
-						buffer << sep << __nested_tokens__(token, sep)
+						buffer << sep << value
 					else
-						buffer << __nested_tokens__(token, sep)
+						buffer << value
 					end
 				end
 			when nil
@@ -652,6 +664,8 @@ def json_escape(string)
 			i += 1
 		end
 
+		return if buffer.empty?
+
 		buffer.gsub('"', "&quot;")
 	end
 

quickdraw/sgml/attributes.test.rb

@@ -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
@@ -386,15 +401,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)" 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(nil)" do
+test "_, Set" do
+	output = phlex { div(attribute: Set[]) }
+	assert_equal_html output, %(<div></div>)
+end
+
+test "_, Set" 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
@@ -540,15 +610,15 @@
 
 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: ["image.jpg 1x", "image@2x.jpg 2x"]) }
 	assert_equal_html output, %(<img srcset="image.jpg 1x, image@2x.jpg 2x">)
 end
 
 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">)
@@ -559,15 +629,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">)
@@ -581,7 +651,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">)