Update to js-scala-0.3-SNAPSHOT and Play-2.1-RC2

Author: julienrf

chat/.gitignore

@@ -6,4 +6,6 @@ tmp
 .history
 dist
 /app/assets/javascripts/views.js
-/app/Chat-generated.scala
+/app/Chat-generated.scala
+.idea/
+.idea_modules/

chat/app/actors/ChatRooms.scala

@@ -17,14 +17,14 @@ class ChatRooms extends Actor {
   var channels = List.empty[PushEnumerator[Message]] // readers connections
   var members = List.empty[String] // users chatting
   var chatRoom = ChatRoom(Nil)
-  val chatRoomUi = new NodeRef(views.chatRoom(chatRoom)("root"))
+  val chatRoomUi = new NodeRef(views.chatRoom(chatRoom))
 
   override def receive = {
     case GetAllMessages => {
       sender ! chatRoomUi.cell
     }
     case OpenChannel => {
-      lazy val stream: PushEnumerator[Message] = Enumerator.imperative(onComplete = { self ! CloseChannel(stream) })
+      lazy val stream: PushEnumerator[Message] = Enumerator.imperative(onComplete = { () => self ! CloseChannel(stream) })
       channels = stream :: channels
       sender ! stream
     }

chat/app/assets/javascripts/chat.js

@@ -2,7 +2,7 @@
   // --- Message stream
   var events = new EventSource(Routes.controllers.Chat.messages().url);
   events.onmessage = function (e) {
-    Chat.updates.updateChatRoom({ '_1': $('.chatroom'), '_2': JSON.parse(e.data) });
+    Chat.updates.updateChatRoom($('.chatroom'), JSON.parse(e.data));
     var ms = $('.messages')[0];
     ms.scrollTop = ms.scrollHeight - ms.offsetHeight;
   };
@@ -23,7 +23,7 @@
     // TODO Client side validation
     Routes.controllers.Chat.login(username).ajax({
       success: function () {
-        $('.login').replaceWith(Chat.views.connectedUser(username).root);
+        $('.login').replaceWith(Chat.views.connectedUser(username));
       },
       error: function () {
         alert('Unable to log in!'); // TODO distinguish between 4xx and 5xx errors
@@ -47,7 +47,7 @@
   $(document).on('click', '.form button', function () {
     Routes.controllers.Chat.logout().ajax({
       success: function () {
-        $('.form').replaceWith(Chat.views.login().root);
+        $('.form').replaceWith(Chat.views.login());
       }
     });
   });

chat/app/controllers/Chat.scala

@@ -6,23 +6,25 @@ import play.api.libs.EventSource
 import play.api.libs.json.JsValue
 import play.api.libs.iteratee._
 import play.api.libs.concurrent._
+import play.api.libs.concurrent.Execution.Implicits._
 import play.api.data._
 import play.api.data.Forms._
 
 import akka.util.Timeout
-import akka.util.duration._
 import akka.pattern.ask
 
 import actors.ChatRooms
 import models._
+import models.Protocols._
+import java.util.concurrent.TimeUnit
 
 object Chat extends Controller {
   import ChatRooms.Events._
-  implicit val timeout = Timeout(5.seconds)
+  implicit val timeout = Timeout(5, TimeUnit.SECONDS)
 
   def index = Action { implicit request =>
-    AsyncResult {
-      ((ChatRooms.ref ? GetAllMessages).mapTo[scala.xml.NodeSeq]).asPromise.map { allMessages =>
+    Async {
+      ((ChatRooms.ref ? GetAllMessages).mapTo[scala.xml.NodeSeq]).map { allMessages =>
         Ok(views.html.index(allMessages, authenticatedUser))
       }
     }
@@ -46,8 +48,8 @@ object Chat extends Controller {
   }
 
   def messages = Action { implicit request =>
-    AsyncResult {
-      ((ChatRooms.ref ? OpenChannel).mapTo[Enumerator[Message]]).asPromise.map { message =>
+    Async {
+      ((ChatRooms.ref ? OpenChannel).mapTo[Enumerator[Message]]).map { message =>
         Ok.feed(message &> ToJson[Message] ><> EventSource()).as(EVENT_STREAM)
       }
     }

chat/app/models/Protocols.scala

@@ -0,0 +1,13 @@
+package models
+
+object Protocols {
+
+  import play.api.libs.json._
+  implicit object toJson extends Writes[Message] {
+    def writes(message: Message): JsValue =
+      JsObject(Seq(
+        "author" -> JsString(message.author),
+        "content" -> JsString(message.content)
+      ))
+  }
+}

chat/app/models/ToJson.scala

@@ -4,6 +4,8 @@ import play.api.libs.json._
 import play.api.libs.iteratee._
 
 object ToJson {
+  import language.reflectiveCalls
+
 	def apply[A : Writes]: Enumeratee[A, JsValue] =
 	  Enumeratee.map(a => Json.toJson(a))
 }

chat/app/views/index.scala.html

@@ -4,8 +4,8 @@
   <div class="container">
     @messages
     @maybeUsername match {
-  	  case Some(username) => { @views.connectedUser(username)("root") }
-      case None => { @views.login()("root") }
+  	  case Some(username) => { @views.connectedUser(username) }
+      case None => { @views.login() }
     }
   </div>
   @helper.javascriptRouter("Routes")(

chat/aspects/build.sbt

@@ -1,14 +1,21 @@
 name := "chat-aspects"
 
+scalaVersion := "2.10.0"
+
+scalaOrganization := "org.scala-lang.virtualized"
+
 libraryDependencies ++= Seq(
   "js-scala" %% "forest" % "0.3-SNAPSHOT"
 )
 
 sourceGenerators in Compile <+= (sourceDirectory in Compile, sourceManaged in Compile) map { (sourceDir, targetDir) =>
-  forest.compiler.Compiler.compile(scalax.file.Path(sourceDir / "forest" / "Chat"), scalax.file.Path(targetDir), Seq("models._"), Seq("MessageOps", "ChatRoomOps"))
+  forest.compiler.Compiler.compile(
+    scalax.file.Path(sourceDir / "forest" / "Chat"),
+    scalax.file.Path(targetDir),
+    Seq("aspects._", "scala.virtualization.lms.common.{LiftAll, Structs, StringOps}"),
+    Seq("Models", "LiftAll", "Structs", "StringOps")
+  )
   (targetDir / "Chat.scala").get.map(_.getAbsoluteFile)
 }
 
-resolvers += Resolver.url("ivy-local", url("file://" + Path.userHome + "/.ivy2/local"))(Resolver.ivyStylePatterns)
-
-scalacOptions ++= Seq("-deprecation", "-unchecked", "-Xexperimental", "-Yvirtualize")
+scalacOptions ++= Seq("-deprecation", "-unchecked", "-feature", "-Xexperimental", "-Yvirtualize")

chat/aspects/project/build.sbt

@@ -0,0 +1 @@
+libraryDependencies += "js-scala" %% "forest-compiler" % "0.3-SNAPSHOT"