Allow numbers to be passed as element content

celtric · celtric · commit b00f5434af65 · 2018-03-22T17:58:43.000+01:00
diff --git a/src/main/kotlin/org/celtric/kotlin/html/_building_blocks.kt b/src/main/kotlin/org/celtric/kotlin/html/_building_blocks.kt
@@ -42,9 +42,10 @@ sealed class Element(val name: String, val _isBlock: Boolean, val content: Any,
         val renderableContent: Node = when {
             content == Unit -> Text("")
             content is String -> Text(content)
+            content is Number -> Text(content.toString())
             content is Node -> content
             (content is List<*> && content.first() is Node) -> @Suppress("UNCHECKED_CAST") NodeList(content as List<Node>)
-            else -> throw HTMLException("Content must be String, Node or List<Node>, ${contentType(content)} given.")
+            else -> throw HTMLException("Content must be String, Number, Node or List<Node>, ${contentType(content)} given.")
         }
 
         val renderedContent =
diff --git a/src/test/kotlin/org/celtric/kotlin/html/ElementContentTest.kt b/src/test/kotlin/org/celtric/kotlin/html/ElementContentTest.kt
@@ -0,0 +1,13 @@
+package org.celtric.kotlin.html
+
+import org.junit.jupiter.api.Test
+
+internal class ElementContentTest {
+
+    @Test fun `numbers are automatically cast to text`() {
+        span { 1 }.assertRenders("<span>1</span>")
+        span { 1L }.assertRenders("<span>1</span>")
+        span { 1.0 }.assertRenders("<span>1.0</span>")
+        span { 1.0f }.assertRenders("<span>1.0</span>")
+    }
+}
diff --git a/src/test/kotlin/org/celtric/kotlin/html/ErrorsTest.kt b/src/test/kotlin/org/celtric/kotlin/html/ErrorsTest.kt
@@ -9,6 +9,6 @@ internal class ErrorsTest {
         val elementWithInvalidContent = span { listOf(listOf("Foo")) }
 
         assertThrows(HTMLException::class.java, { elementWithInvalidContent.render() })
-            .let { assertEquals("Content must be String, Node or List<Node>, SingletonList<SingletonList<String>> given.", it.message) }
+            .let { assertEquals("Content must be String, Number, Node or List<Node>, SingletonList<SingletonList<String>> given.", it.message) }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,6 @@ internal class ErrorsTest {`
`9`	`9`	`val elementWithInvalidContent = span { listOf(listOf("Foo")) }`
`10`	`10`
`11`	`11`	`assertThrows(HTMLException::class.java, { elementWithInvalidContent.render() })`
`12`		`- .let { assertEquals("Content must be String, Node or List<Node>, SingletonList<SingletonList<String>> given.", it.message) }`
	`12`	`+ .let { assertEquals("Content must be String, Number, Node or List<Node>, SingletonList<SingletonList<String>> given.", it.message) }`
`13`	`13`	`}`
`14`	`14`	`}`