upgrade mustache version and do some basic unit test

Author: Julien Bille

project-code/app/org/jba/Mustache.scala

@@ -1,7 +1,7 @@
 package org.jba
 
-import com.github.mustachejava._
-import com.twitter.mustache._
+import com.github.mustachejava.DefaultMustacheFactory
+import com.twitter.mustache.ScalaObjectHandler
 import java.io.{StringWriter, InputStreamReader}
 
 import org.apache.commons.lang.StringEscapeUtils
@@ -16,14 +16,11 @@ class MustachePlugin(app: Application) extends Plugin {
 
   lazy val instance = {
     val i = new JavaMustache
-    i.checkFiles
-    //i.loadAllTemplate
     i
   }
 
   override def onStart(){
     Logger("mustache").info("start on mode: " + app.mode)
-    instance.checkFiles
     instance 
   }
 
@@ -53,25 +50,20 @@ class JavaMustache extends MustacheAPI{
         Logger("mustache").debug("read in factory: " + rootPath + resourceName + ".html")
         val input = Play.current.resourceAsStream(rootPath + resourceName  + ".html").getOrElse(throw new Exception("mustache: could not find template: " + resourceName))
         new InputStreamReader(input)
-      }   
+      }
     }
-    factory.setObjectHandler(new TwitterObjectHandler)
+    factory.setObjectHandler(new ScalaObjectHandler)
     factory
   }
 
-  private[jba] def checkFiles {
-    if(!Play.getFile("app" + fs + "assets").exists())
-      Logger.warn("app" + fs + "assets" + fs + "mustache directory is needed for mustache plugin")	
-  }
-
   private def readTemplate(template: String) = {
     Logger("mustache").debug("load template: " + rootPath + template)
 
     val factory = if(Play.isProd) mf else createMustacheFactory 
 
     val input = Play.current.resourceAsStream(rootPath + template + ".html").getOrElse(throw new Exception("mustache: could not find template: " + template))
     val mustache = factory.compile(new InputStreamReader(input), template)
-    factory.putTemplate(template, mustache)
+    //factory.putTemplate(template, mustache)
 
     mustache    
   }
@@ -80,9 +72,8 @@ class JavaMustache extends MustacheAPI{
     Logger("mustache").debug("Mustache render template " + template)
 
     var mustache = {
-      
       if(Play.isProd) {
-        val maybeTemplate = mf.getTemplate(template)
+        val maybeTemplate = mf.compile(template)
         if(maybeTemplate == null) {
           readTemplate(template)
         } else maybeTemplate
@@ -101,21 +92,18 @@ class JavaMustache extends MustacheAPI{
   private[jba] def loadAllTemplate: Unit = {
     Logger("mustache").info("Load all mustache template")
 
-    val tmplListURL: Option[java.net.URL] = Play.current.resource("mustache/mustache.tmpl")
-    
-    tmplListURL.map { url =>
+    Play.current.resource("mustache/mustache.tmpl").map { url =>
       for(fileName <- Source.fromFile(url.getFile()).getLines)
         readTemplate(fileName)    
     }.getOrElse {
       Logger("mustache").error("Impossible to read file mustache/mustache.tmpl")
     }
   }  
-  
 }
 
 object Mustache {
 
-  private def plugin = play.api.Play.maybeApplication.map{app =>
+  private def plugin = play.api.Play.maybeApplication.map { app =>
     app.plugin[MustachePlugin].getOrElse(throw new RuntimeException("you should enable MustachePlugin in play.plugins"))
   }.getOrElse(throw new RuntimeException("you should have a running app in scope a this point"))
 

project-code/project/Build.scala

@@ -5,11 +5,11 @@ import play.Project._
 object ApplicationBuild extends Build {
 
   val appName         = "play2-mustache"
-  val appVersion      = "1.1.1"
+  val appVersion      = "1.1.2"
 
   val appDependencies = Seq(
-    "com.github.spullara.mustache.java" % "compiler" % "0.8.2",
-    "com.twitter" %% "util-core" % "6.2.0", // For Twitter handler
+    "com.github.spullara.mustache.java" % "compiler" % "0.8.11",
+    //"com.twitter" %% "util-core" % "6.2.0", // For Twitter handler
     "commons-lang" % "commons-lang" % "2.6"
   )
 

sample/app/assets/mustache/title.html

@@ -0,0 +1 @@
+<h3>{{title}}</h3>

sample/app/controllers/Application.scala

@@ -26,7 +26,7 @@ object Application extends Controller{
 
   def show = Action {
 	val content = Content(1, "first", users)
-    Ok(views.html.show(contents))
+    Ok(views.html.show(contents)) 
   }
 
   def json = Action {

sample/app/models/Model.scala

@@ -1,7 +1,7 @@
 package models
 
 /**
- * Thanx to 
+ * Thanks to 
  * http://mandubian.com/
  */
 

sample/project/Build.scala

@@ -6,13 +6,13 @@ import org.jba.sbt.plugin.MustachePlugin._
 
 object ApplicationBuild extends Build {
 
-    val appName         = "play2-mustachedemo"
+    val appName         = "play2-mustache-demo"
     val appVersion      = "1.0-SNAPSHOT"
 
     val appDependencies = Seq(
       // Add your project dependencies here,
-      "org.jba" %% "play2-mustache" % "1.1.1",
-      "com.twitter" %% "util-core" % "6.2.0" // For Twitter handler
+      "org.jba" %% "play2-mustache" % "1.1.2"
+      //"com.twitter" %% "util-core" % "6.2.0" // For Twitter handler
     )
 
     val main = play.Project(appName, appVersion, appDependencies).settings(

sample/test/BasicTest.scala

@@ -0,0 +1,46 @@
+package test
+
+import org.specs2.mutable._
+
+import play.api.test._
+import play.api.test.Helpers._
+
+import org.jba.Mustache
+
+import models._
+
+class BasicTestSpec extends Specification {
+  
+  case class Header(title: String)
+  
+  "Simple template" should {
+    
+    "compile" in new WithApplication {
+      val htmlRes = Mustache.render("title", Header("Title"))
+      htmlRes.toString.equals("<h3>Title</h3>")
+    }
+    
+    "compile with map parameters" in new WithApplication {
+      val params = Map('title -> "Title")
+      val htmlRes = Mustache.render("title", params)
+      htmlRes.toString.equals("<h3>Title</h3>")
+    }    
+    
+    "wrong template" in new WithApplication {
+      Mustache.render("title-wrong", Header("Title")) must throwA[Exception]
+    }
+  }
+  
+  "Partial Template" should {
+    "compile" in new WithApplication {
+      
+      val user = User("alice@mail.com", "alice")
+      val user2 = User("bob@mail.com", "bob")
+      val users = List(user, user2)
+      val content = Content(1, "first", users)
+      
+      Mustache.render("content_partial_item", content).toString must contain("alice")
+    }
+  } 
+  
+}

src/main/scala/org/jba/SbtMustachePlugin.scala

@@ -26,7 +26,6 @@ object MustachePlugin extends sbt.Plugin {
       import scala.util.control.Exception._
 
       val jsSource = org.jba.sbt.plugin.MustacheCompiler.compile(mustacheFile, options)
-
       // Any error here would be because of Mustache, not the developer;
       // so we don't want compilation to fail.
 //      val minified = catching(classOf[CompilationException])