Merge pull request #14 from celtric/stop_rendering_empty_attributes

celtric · web-flow · commit 70cd501bb534 · 2018-04-06T18:03:46.000+02:00
Stop rendering empty attributes
diff --git a/build.gradle b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
 }
 
 group "org.celtric.kotlin"
-version "0.1.3"
+version "0.1.4"
 
 apply plugin: "kotlin"
 apply plugin: "maven-publish"
diff --git a/src/main/kotlin/org/celtric/kotlin/html/_building_blocks.kt b/src/main/kotlin/org/celtric/kotlin/html/_building_blocks.kt
@@ -95,7 +95,7 @@ operator fun List<Node>.plus(text: String): List<Node> = plus(Text(text))
 typealias Attributes = Map<String, Any?>
 
 private fun Attributes.renderAttributes(prefix: String = "") =
-        filter { it.value != null && it.value != false }
+        filter { it.value != null && it.value != false && it.value != "" }
         .map { Pair(it.key, if (it.value is Boolean) "" else "=\"${it.value}\"") }
         .joinToString("") { " " + prefix + it.first + it.second }
 
diff --git a/src/test/kotlin/org/celtric/kotlin/html/AttributesTest.kt b/src/test/kotlin/org/celtric/kotlin/html/AttributesTest.kt
@@ -29,4 +29,9 @@ internal class AttributesTest {
         span(other = mapOf("foo" to true)) { "Content" }
             .assertRenders("<span foo>Content</span>")
     }
+
+    @Test fun empty_attributes() {
+        span(classes = "", other = mapOf(), data = mapOf()) {}
+            .assertRenders("<span></span>")
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -29,4 +29,9 @@ internal class AttributesTest {`
`29`	`29`	`span(other = mapOf("foo" to true)) { "Content" }`
`30`	`30`	`.assertRenders("<span foo>Content</span>")`
`31`	`31`	`}`
	`32`	`+`
	`33`	`+ @Test fun empty_attributes() {`
	`34`	`+ span(classes = "", other = mapOf(), data = mapOf()) {}`
	`35`	`+ .assertRenders("<span></span>")`
	`36`	`+ }`
`32`	`37`	`}`