add TwitterObjectHandler back to scala-extensions-2.10

Matt Landis · Matt Landis · commit 4cf263a1b6c8 · 2015-07-25T16:54:27.000-07:00
diff --git a/scala-extensions/scala-extensions-2.10/build.sbt b/scala-extensions/scala-extensions-2.10/build.sbt
@@ -6,6 +6,6 @@ lazy val `scala-extensions-2-10` = project
     libraryDependencies ++= Seq(
       "com.github.spullara.mustache.java" % "compiler" % "0.8.17-SNAPSHOT",
       "junit" % "junit" % "4.8.2" % "test",
-      "com.twitter" % "util-core" % "6.12.1"
+      "com.twitter" % "util-core" % "6.25.0"
     )
   )
diff --git a/scala-extensions/scala-extensions-2.10/pom.xml b/scala-extensions/scala-extensions-2.10/pom.xml
@@ -62,8 +62,8 @@
     </dependency>
     <dependency>
       <groupId>com.twitter</groupId>
-      <artifactId>util-core</artifactId>
-      <version>6.12.1</version>
+      <artifactId>util-core_2.10</artifactId>
+      <version>6.25.0</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/scala-extensions/scala-extensions-2.10/src/main/scala/com/twitter/mustache/TwitterObjectHandler.scala b/scala-extensions/scala-extensions-2.10/src/main/scala/com/twitter/mustache/TwitterObjectHandler.scala
@@ -0,0 +1,21 @@
+package com.twitter.mustache
+
+import com.twitter.util.Future
+import java.util.concurrent.Callable
+
+class TwitterObjectHandler extends ScalaObjectHandler {
+
+  override def coerce(value: Object) = {
+    value match {
+      case f: Future[_] => {
+        new Callable[Any]() {
+          def call() = {
+            val value = f.get().asInstanceOf[Object]
+            coerce(value)
+          }
+        }
+      }
+      case _ => super.coerce(value)
+    }
+  }
+}
diff --git a/scala-extensions/scala-extensions-2.10/src/test/scala/com/twitter/mustache/ObjectHandlerTest.scala b/scala-extensions/scala-extensions-2.10/src/test/scala/com/twitter/mustache/ObjectHandlerTest.scala
@@ -21,6 +21,43 @@ class ObjectHandlerTest {
     Assert.assertEquals("fred", sw.toString())
   }
 
+  @Test
+  def testTwitterHandler() {
+    val pool = Executors.newCachedThreadPool()
+    val futurePool = FuturePool(pool)
+    val mf = new DefaultMustacheFactory()
+    mf.setObjectHandler(new TwitterObjectHandler)
+    mf.setExecutorService(pool)
+    val m = mf.compile(
+      new StringReader("{{#list}}{{optionalHello}}, {{futureWorld}}!" +
+              "{{#test}}?{{/test}}{{^test}}!{{/test}}{{#num}}?{{/num}}{{^num}}!{{/num}}" +
+              "{{#map}}{{value}}{{/map}}\n{{/list}}"),
+      "helloworld"
+    )
+    val sw = new StringWriter
+    val writer = m.execute(sw, new {
+      val list = Seq(new {
+        lazy val optionalHello = Some("Hello")
+        val futureWorld = futurePool {
+          "world"
+        }
+        val test = true
+        val num = 0
+      }, new {
+        val optionalHello = Some("Goodbye")
+        val futureWorld = futurePool {
+          "thanks for all the fish"
+        }
+        lazy val test = Future { false }
+        val map = Map(("value", "test"))
+        val num = 1
+      })
+    })
+    // You must use close if you use concurrent latched writers
+    writer.close()
+    Assert.assertEquals("Hello, world!?!\nGoodbye, thanks for all the fish!!?test\n", sw.toString)
+  }
+
   @Test
   def testScalaHandler() {
     val pool = Executors.newCachedThreadPool()

Original file line number	Diff line number	Diff line change
@@ -6,6 +6,6 @@ lazy val `scala-extensions-2-10` = project
`6`	`6`	`libraryDependencies ++= Seq(`
`7`	`7`	`"com.github.spullara.mustache.java" % "compiler" % "0.8.17-SNAPSHOT",`
`8`	`8`	`"junit" % "junit" % "4.8.2" % "test",`
`9`		`- "com.twitter" % "util-core" % "6.12.1"`
	`9`	`+ "com.twitter" % "util-core" % "6.25.0"`
`10`	`10`	`)`
`11`	`11`	`)`