package com.clashcode.web.controllers

import clashcode.logic.GameWord
import actors.GameParameters
import play.api.libs.iteratee.Concurrent.Channel
import play.api.libs.json.JsValue
import play.api.libs.json.Json

trait WordPushing { this:GameParameters => 

  protected def channel:Channel[JsValue]
  
  def pushWords(gameWords: Seq[GameWord]) = channel.push(
    Json.obj(
      "words" -> Json.toJson(gameWords.map(gameWordToMap(_)))
    )
  )

  private def gameWordToMap(gameWord: GameWord): Map[String, String] = {
    val isSolvedWord = {
      gameWord.str.forall(_.isLetter) &&
      gameWord.solved && 
      gameWord.str.length() >= this.minGameWordLength
    }
    val cssClass =
      if (gameWord.playing)
        "playing"
      else if (isSolvedWord)
        "solved"
      else ""

    Map("html" -> gameWord.htmlStr,
      "cssClass" -> cssClass
    )
  }  
  
}
package com.clashcode.web.controllers

import clashcode.logic.GameWord
import actors.GameParameters
import play.api.libs.iteratee.Concurrent.Channel
import play.api.libs.json.JsValue
import play.api.libs.json.Json

trait WordPushing { this:GameParameters => 

  protected def channel:Channel[JsValue]
  
  def pushWords(gameWords: Seq[GameWord]) = channel.push(
    Json.obj(
      "words" -> Json.toJson(gameWords.map(gameWordToMap(_)))
    )
  )

  private def gameWordToMap(gameWord: GameWord): Map[String, String] = {
    val cssClass =
      if (gameWord.playing)
        "playing"
      else if (gameWord.solved && gameWord.str.length() >= this.minGameWordLength)
        "solved"
      else ""

    Map("html" -> gameWord.htmlStr,
      "cssClass" -> cssClass
    )
  }  
  
}
--- 
+++ 
@@ -17,10 +17,15 @@
   )
 
   private def gameWordToMap(gameWord: GameWord): Map[String, String] = {
+    val isSolvedWord = {
+      gameWord.str.forall(_.isLetter) &&
+      gameWord.solved && 
+      gameWord.str.length() >= this.minGameWordLength
+    }
     val cssClass =
       if (gameWord.playing)
         "playing"
-      else if (gameWord.solved && gameWord.str.length() >= this.minGameWordLength)
+      else if (isSolvedWord)
         "solved"
       else ""
 
FIX for solved word presentation