introduced new API functions

Author: Simon Wirtz

build.gradle.kts

@@ -8,11 +8,11 @@ import org.gradle.api.publish.maven.MavenPom
 val kotlinVersion = plugins.getPlugin(KotlinPluginWrapper::class.java).kotlinPluginVersion
 
 project.group = "de.swirtz"
-project.version = "0.0.2"
+project.version = "0.0.3"
 val artifactID = "ktsRunner"
 
 plugins {
-    kotlin("jvm") version "1.2.41"
+    kotlin("jvm") version "1.2.61"
     `maven-publish`
     id("com.jfrog.bintray") version "1.8.0"
     id("com.github.johnrengelman.shadow") version "2.0.2"

src/main/kotlin/de/swirtz/ktsobjectloader/KtsObjectLoader.kt

@@ -1,5 +1,6 @@
 package de.swirtz.ktsobjectloader
 
+import java.io.InputStream
 import java.io.Reader
 import javax.script.ScriptEngineManager
 
@@ -9,23 +10,15 @@ class KtsObjectLoader {
         val engine = ScriptEngineManager().getEngineByExtension("kts")
     }
 
-    inline fun <reified T> load(script: String): T {
-        val loaded: Any = engine.eval(script)
-        return if (loaded is T) {
-            loaded
-        } else {
-            throw IllegalStateException("Could not load script from .kts")
-        }
-    }
+    inline fun <reified T> load(script: String): T = engine.eval(script).takeIf { it is T } as T
+    ?: throw IllegalStateException("Could not load script from .kts")
 
-    inline fun <reified T> load(reader: Reader): T {
-        val loaded: Any = engine.eval(reader)
-        return if (loaded is T) {
-            loaded
-        } else {
-            throw IllegalStateException("Could not load script from .kts")
-        }
-    }
+    inline fun <reified T> load(reader: Reader): T = engine.eval(reader).takeIf { it is T } as T
+        ?: throw IllegalStateException("Could not load script from .kts")
+
+    inline fun <reified T> load(inputStream: InputStream): T = engine.eval(inputStream.reader()).takeIf { it is T } as T
+        ?: throw IllegalStateException("Could not load script from .kts")
 
+    inline fun <reified T> loadAll(vararg inputStream: InputStream): List<T> = inputStream.map(::load)
 }
 

src/test/kotlin/de/swirtz/ktsobjectloader/KtsObjectLoaderTest.kt

@@ -10,7 +10,6 @@ import kotlin.test.assertEquals
 import kotlin.test.assertNull
 import kotlin.test.fail
 
-
 class KtsObjectLoaderTest {
 
     @Test
@@ -34,7 +33,7 @@ class KtsObjectLoaderTest {
 
     @Test
     fun `simple evaluations should work`() {
-        with(KtsObjectLoader.engine  as KotlinJsr223JvmLocalScriptEngine) {
+        with(KtsObjectLoader.engine as KotlinJsr223JvmLocalScriptEngine) {
             val res1 = eval("val x = 3")
             assertNull(res1, "No returned value expected")
             val res2 = eval("x + 2")
@@ -52,7 +51,6 @@ class KtsObjectLoaderTest {
         assertEquals(15, KtsObjectLoader().load(scriptContent))
     }
 
-
     @Test
     fun `class loaded from script`() {
         val scriptContent = Files.readAllBytes(Paths.get("src/test/resources/testscript.kts"))?.let {
@@ -69,4 +67,18 @@ class KtsObjectLoaderTest {
         assertEquals(ClassFromScript::class, KtsObjectLoader().load<ClassFromScript>(scriptContent)::class)
     }
 
+    @Test
+    fun `class loaded from script via InputStream`() {
+        val scriptContent = Files.newInputStream(Paths.get("src/test/resources/testscript.kts"))
+        assertEquals(ClassFromScript::class, KtsObjectLoader().load<ClassFromScript>(scriptContent)::class)
+    }
+
+    @Test
+    fun `multiple classes loaded from script via InputStream`() {
+        val scriptContent = Files.newInputStream(Paths.get("src/test/resources/testscript.kts"))
+        val scriptContent2 = Files.newInputStream(Paths.get("src/test/resources/testscript2.kts"))
+        KtsObjectLoader().loadAll<ClassFromScript>(scriptContent, scriptContent2).forEach {
+            assertEquals(ClassFromScript::class, it::class)
+        }
+    }
 }

src/test/resources/testscript2.kts

@@ -0,0 +1,3 @@
+import de.swirtz.ktsobjectloader.ClassFromScript
+
+ClassFromScript("2) I was created in kts; äö")