Merge branch 'master' of https://github.com/shafirov/kara

samples/KaraDemo/src/kara/demo/routes/Home.kt

@@ -15,7 +15,7 @@ object Home {
 
     @Get("/async")
     class Async() : Request({
-        async {
+        async() {
             TextResult("This've been rendered async.")
         }
     })
@@ -43,7 +43,7 @@ object Home {
 
     @Get("/json")
     class JsonPage : Request({
-        json {
+        jsonResult {
             jsonObject {
                 jsonValue("version", 5)
                 jsonObject("people")

src/KaraLib/src/kara/ActionContext.kt

@@ -11,6 +11,8 @@ import javax.servlet.http.HttpServletRequest
 import javax.servlet.http.HttpServletResponse
 import javax.servlet.http.HttpSession
 import kotlin.html.Link
+import kotlin.properties.ReadOnlyProperty
+import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
 
 
@@ -30,6 +32,8 @@ class ActionContext(val appContext: ApplicationContext,
     public val session = if (allowHttpSession) HttpActionSession({request.getSession(true)!!}) else NullSession
 
     public val data: HashMap<Any, Any?> = HashMap()
+    private val sessionCache = HashMap<String, Any?>()
+
     public val startedAt : Long = System.currentTimeMillis()
 
     fun redirect(link: Link): ActionResult {
@@ -52,15 +56,24 @@ class ActionContext(val appContext: ApplicationContext,
 
     fun toSession(key: String, value: Any?) {
         if (value !is Serializable?) error("Non serializable value to session: key=$key, value=$value")
-        session.setAttribute(key, (value as? Serializable)?.toBytes())
+        sessionCache[key] = value
     }
 
     fun fromSession(key: String): Any? {
-        val raw = session.getAttribute(key)
-        return when (raw) {
-            is ByteArray -> raw.readObject()
-            else -> raw
+        return sessionCache.getOrPut(key) {
+            val raw = session.getAttribute(key)
+            when (raw) {
+                is ByteArray -> raw.readObject()
+                else -> raw
+            }
+        }
+    }
+
+    fun flushSessionCache() {
+        sessionCache.forEach { key, value ->
+            session.setAttribute(key, (value as? Serializable)?.toBytes())
         }
+        sessionCache.clear()
     }
 
     fun sessionToken(): String {
@@ -101,22 +114,44 @@ class ActionContext(val appContext: ApplicationContext,
     }
 }
 
-public class RequestScope<T>() {
+public class RequestScope<T:Any>(): ReadWriteProperty<Nothing?, T?> {
     @Suppress("UNCHECKED_CAST")
-    operator fun getValue(o : Any?, desc: KProperty<*>): T {
+    override fun getValue(thisRef: Nothing?, property: KProperty<*>): T? {
         val data = ActionContext.current().data
-        return data.get(desc) as T
+        return data.get(property) as T?
     }
 
-    operator fun setValue(o : Any?, desc: KProperty<*>, value: T) {
-        ActionContext.current().data.put(desc, value)
+    override fun setValue(thisRef: Nothing?, property: KProperty<*>, value: T?) {
+        ActionContext.current().data.put(property, value)
     }
 }
 
+public class LazyRequestScope<T:Any>(val initial: () -> T): ReadOnlyProperty<Nothing?, T> {
+    @Suppress("UNCHECKED_CAST")
+    override fun getValue(thisRef: Nothing?, property: KProperty<*>): T = ActionContext.current().data.getOrPut(property, { initial() }) as T
+}
 
-public class LazyRequestScope<T:Any>(val initial: () -> T) {
+public class SessionScope<T:Any>(): ReadWriteProperty<Nothing?, T?> {
     @Suppress("UNCHECKED_CAST")
-    operator fun getValue(o: Any?, desc: KProperty<*>): T = ActionContext.current().data.getOrPut(desc, { initial() }) as T
+    override fun getValue(thisRef: Nothing?, property: KProperty<*>): T? {
+        return ActionContext.current().fromSession(property.name) as T?
+    }
+
+    override fun setValue(thisRef: Nothing?, property: KProperty<*>, value: T?) {
+        ActionContext.current().toSession(property.name, value)
+    }
+}
+
+public class LazySessionScope<T:Any>(val initial: () -> T): ReadOnlyProperty<Nothing?, T> {
+    private val store = SessionScope<T>()
+
+    override fun getValue(thisRef: Nothing?, property: KProperty<*>): T {
+        return store.getValue(thisRef, property) ?: run {
+            val i = initial()
+            store.setValue(thisRef, property, i)
+            i
+        }
+    }
 }
 
 public class ContextException(msg : String) : Exception(msg) {}
@@ -128,6 +163,7 @@ public fun <T> ActionContext.withContext(body: () -> T): T {
     }
     finally {
         ActionContext.contexts.set(null)
+        flushSessionCache()
     }
 }
 

src/KaraLib/src/kara/ApplicationConfig.kt

@@ -1,7 +1,6 @@
 package kara
 
 import kara.config.Config
-import kara.internal.logger
 import java.io.File
 import java.net.URL
 import java.util.*
@@ -79,7 +78,7 @@ public open class ApplicationConfig(val appClassloader: ClassLoader) : Config()
                             }
 
                             it.endsWith("/*") -> {
-                                File(it.removeSuffix("/*")).listFiles { it.isFile && it.name.endsWith(".jar") }?.toList() ?: listOf()
+                                File(it.removeSuffix("/*")).listFiles{ file -> file.isFile && file.name.endsWith(".jar") }?.toList() ?: listOf()
                             }
 
                             else -> {

src/KaraLib/src/kara/Json.kt

@@ -166,20 +166,19 @@ inline fun JsonRoot.jsonObject(body: JsonObject.() -> Unit){
     set(obj)
 }
 
-inline fun jsonArray(body: JsonArray.() -> Unit) : JsonElement {
-    val array = JsonArray()
-    array.body()
-    return array
+inline fun jsonResult(body: JsonRoot.() -> Unit): JsonResult {
+    return JsonResult(jsonNode(body))
 }
 
-inline fun jsonObject(body: JsonObject.() -> Unit) : JsonElement {
-    val obj = JsonObject()
-    obj.body()
-    return obj
+inline fun jsonString(body: JsonRoot.() -> Unit): String {
+    return StringBuilder().apply { jsonNode(body).build(this) }.toString()
 }
 
-inline fun json(body: JsonRoot.() -> Unit) : JsonResult {
-    val json = JsonRoot()
-    json.body()
-    return JsonResult(json)
+inline fun jsonNode(body: JsonRoot.() -> Unit): JsonElement {
+    return JsonRoot().apply {
+        body()
+    }
 }
+
+@Deprecated(replaceWith = ReplaceWith("jsonResult(body)"), message = "use jsonResult instead", level = DeprecationLevel.WARNING)
+inline fun json(body: JsonRoot.() -> Unit) = jsonResult(body)

src/KaraTests/src/kara.tests/reflection/ReflectionUtilsTest.kt

@@ -23,11 +23,13 @@ object Foo2 {
 
 class ObjectInstances() {
 
+    @Suppress("DEPRECATION")
     @Test fun testDeprecatedObjectInstanceViaReflection() {
         assertNotNull(Foo2::class.java.objectInstance0())
         assertNotNull(Foo2.Test::class.java.objectInstance0())
     }
 
+    @Suppress("DEPRECATION")
     @Test fun testObjectInstance() {
         assertNotNull(Foo2::class.objectInstance)
         assertNotNull(Foo2.Test::class.objectInstance)

src/Kootstrap/src/kotlin/html/bootstrap/Modal.kt

@@ -1,17 +1,19 @@
 package kotlin.html.bootstrap
 
-import kara.*
-import javax.servlet.http.*
+import kara.ActionContext
+import kara.ActionResult
+import kara.link
+import javax.servlet.http.HttpServletResponse
 import kotlin.html.*
 
 class ModalBuilder() {
     var button: (A.() -> Unit)? = null
     var h: highlight = highlight.default
     var c: caliber = caliber.default
 
-    var form : (FORM.() -> Unit)? = null
-    fun form(content: FORM.() -> Unit) {
-        form = content
+    var formContent: (FORM.() -> Unit)? = null
+    fun formContent(content: FORM.() -> Unit) {
+        formContent = content
     }
 
     fun button(h: highlight = highlight.default, size: caliber = caliber.default, b: A.() -> Unit) {
@@ -90,7 +92,7 @@ fun HtmlBodyTag.modalDialogForm(id: String, action: Link, formMethod: FormMethod
     modalDialog(id, content) {
         form{
             addClass(form_horizontal)
-            it.form ?. let {it()}
+            it.formContent?.let {it()}
             this.action = action
             this.method = formMethod
             modalBody(it)
@@ -129,7 +131,7 @@ fun HtmlBodyTag.modalForm(action: Link, formMethod: FormMethod = FormMethod.post
     modalFrame(content) {
         form {
             addClass(form_horizontal)
-            it.form ?. let {it()}
+            it.formContent?. let {it()}
             this.action = action
             this.method = formMethod
             modalBody(it)
@@ -225,7 +227,7 @@ fun dialogForm(action: Link, formMethod: FormMethod = FormMethod.post, enctype:
                 addClass("modal-content")
                 form {
                     addClass(form_horizontal)
-                    builder.form ?. let {it()}
+                    builder.formContent?. let {it()}
 
                     this.action = action
                     this.method = formMethod

src/Kootstrap/src/kotlin/html/bootstrap/Pages.kt

@@ -45,7 +45,7 @@ public fun HtmlBodyTag.tabs(activeName: String, body: PagesBuilder.() -> Unit) {
     content {
         for (item in builder.items) {
             pane(item.id, activeName == item.id) {
-                item.content()
+                item.content(this)
             }
         }
     }