From 05279cb254942f3e8286dc1fc2b46140f6c66cdb Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Fri, 4 Aug 2017 16:58:17 -0400 Subject: [PATCH] Change dumpGeneratedScript to File --- src/main/kotlin/net/shadowfacts/ekt/EKT.kt | 12 +++++------- src/test/kotlin/net/shadowfacts/ekt/Test.kt | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/kotlin/net/shadowfacts/ekt/EKT.kt b/src/main/kotlin/net/shadowfacts/ekt/EKT.kt index 44680d9..ab75f2f 100644 --- a/src/main/kotlin/net/shadowfacts/ekt/EKT.kt +++ b/src/main/kotlin/net/shadowfacts/ekt/EKT.kt @@ -35,7 +35,7 @@ _result.toString() ScriptEngineManager() } - fun render(template: String, data: Map, dumpGeneratedScript: Boolean = false): String { + fun render(template: String, data: Map, dumpGeneratedScript: File? = null): String { @Suppress("NAME_SHADOWING") var template = template template = template.replace("\"", "\\\"").replace("$", "\${'$'}") @@ -59,17 +59,15 @@ _result.toString() val script = scriptPrefix + template + scriptSuffix - if (dumpGeneratedScript) { - File("script.kts").apply { - if (!exists()) createNewFile() - writeText(script) - } + dumpGeneratedScript?.apply { + if (!exists()) createNewFile() + writeText(script) } return eval(script, data) as String } - fun render(template: File, data: Map, dumpGeneratedScript: Boolean = false): String { + fun render(template: File, data: Map, dumpGeneratedScript: File? = null): String { return render(template.readText(), data, dumpGeneratedScript) } diff --git a/src/test/kotlin/net/shadowfacts/ekt/Test.kt b/src/test/kotlin/net/shadowfacts/ekt/Test.kt index e98944e..96fbb11 100644 --- a/src/test/kotlin/net/shadowfacts/ekt/Test.kt +++ b/src/test/kotlin/net/shadowfacts/ekt/Test.kt @@ -8,7 +8,7 @@ import java.io.File fun main(args: Array) { val res = EKT.render(File("template.ekt"), mapOf( "value" to 11 - ), dumpGeneratedScript = true) + ), dumpGeneratedScript = File("script.kts")) File("result.txt").apply { if (!exists()) createNewFile()