Refactored, added Finalizable and response events.

core/src/main/scala/context.scala

@@ -41,24 +41,8 @@ accessed via the `Context.get` method.
 */
 class Context
     extends HashMap[String, Any]
-    with KeyValueCoercion {
-
-  def finalizers = getAs[Seq[() => Unit]](
-    "finalizers").getOrElse(Nil)
-
-  def enqueueFinalizer(key: String, fn: () => Unit) {
-    if (!contains("finalizers." + key)) {
-      update("finalizers." + key, true)
-      update("finalizers", finalizers ++ Seq(fn))
-    }
-  }
-
-  def pushFinalizer(key: String, fn: () => Unit) {
-    if (!contains("finalizers." + key)) {
-      update("finalizers." + key, true)
-      update("finalizers", Seq(fn) ++ finalizers)
-    }
-  }
+    with KeyValueCoercion
+    with Finalizable {
 
   def executeWith[R](params: (String, Any)*)
                     (actions: => R): R = {
@@ -106,7 +90,7 @@ object Context {
 
   def destroy() {
     if (isLive) {
-      get().finalizers.foreach(_.apply())
+      get().doFinalize()
       threadLocal.set(null)
     }
   }

core/src/main/scala/finalizable.scala

@@ -0,0 +1,34 @@
+package pro.savant.circumflex
+package core
+
+/*! `Finalizable` trait adds abstract finalization functionality
+based on collecting functions `() => Unit` in current context.
+
+The implementation then decides when to perform such finalization
+(i.e. execute all the functions).
+*/
+trait Finalizable {
+
+  protected def baseName = "finalizers"
+
+  def finalizers = ctx.getAs[Seq[() => Unit]](baseName).getOrElse(Nil)
+
+  def enqueueFinalizer(key: String, fn: () => Unit) {
+    if (!ctx.contains(baseName + "." + key)) {
+      ctx.update(baseName + "." + key, true)
+      ctx.update(baseName, finalizers ++ Seq(fn))
+    }
+  }
+
+  def pushFinalizer(key: String, fn: () => Unit) {
+    if (!ctx.contains(baseName + "." + key)) {
+      ctx.update(baseName + "." + key, true)
+      ctx.update(baseName, Seq(fn) ++ finalizers)
+    }
+  }
+
+  def doFinalize() {
+    finalizers.foreach(_.apply())
+  }
+
+}

web/src/main/scala/response.scala

@@ -1,6 +1,7 @@
 package pro.savant.circumflex
 package web
 
+import core._
 import javax.servlet.http.HttpServletResponse
 import collection.mutable.{ListBuffer, HashMap}
 import java.lang.String
@@ -17,7 +18,8 @@ actual `HttpServletResponse` using the `flush` method.
 Since Circumflex is UTF-friendly it will implicitly set character encoding of
 response body to `UTF-8`. Feel free to change it if your application requires so.
 */
-class HttpResponse(val raw: HttpServletResponse) {
+class HttpResponse(val raw: HttpServletResponse)
+    extends Finalizable {
 
   def flush(): Nothing = {
     if (!raw.isCommitted) {
@@ -33,6 +35,8 @@ class HttpResponse(val raw: HttpServletResponse) {
       }
       // apply cookies
       cookies.foreach(c => raw.addCookie(c.convert()))
+      // perform finalization before writing body response
+      doFinalize()
       // write response body
       body(raw)
       // flush