Use body content to parse mardown (and not use form-encoded)

vjousse · Apr 28, 2012 · d3de7e1 · d3de7e1
1 parent 205b9da
commit d3de7e1
Showing 1 changed file with 11 additions and 13 deletions.
diff --git a/app/controllers/Parsing.scala b/app/controllers/Parsing.scala
@@ -16,25 +16,23 @@ object Parsing extends PygalaController {
   def highlight(api: Boolean) = Action { implicit request ⇒
     env.codeForm.bindFromRequest.fold(
       formWithErrors ⇒ BadRequest({
-        for { error <- formWithErrors.errors } yield(error.message)
+        for { error ← formWithErrors.errors } yield (error.message)
       } mkString "\n"),
       value ⇒ env.codeParser.colorCode(value._1, value._2).fold(
         error ⇒ BadRequest(error),
         code ⇒ api match {
-          case true => Ok(code.unsafePerformIO).as(HTML)
-          case false => Ok(views.html.colored(code.unsafePerformIO))
-        }
-        ))
+          case true  ⇒ Ok(code.unsafePerformIO).as(HTML)
+          case false ⇒ Ok(views.html.colored(code.unsafePerformIO))
+        }))
   }
 
-  def markdown = Action { implicit request ⇒
-    env.markdownForm.bindFromRequest.fold(
-      formWithErrors ⇒ BadRequest({
-        for { error <- formWithErrors.errors } yield(error.message)
-      } mkString "\n"),
-      value ⇒ env.markdownParser.parse(value).fold(
-        error ⇒ BadRequest(error),
-        markdown ⇒ Ok(markdown.unsafePerformIO).as(HTML)))
+  def markdown = Action {
+    implicit request ⇒
+      {
+        env.markdownParser.parse(request.body.asText.getOrElse("")).fold(
+          error ⇒ BadRequest(error),
+          markdown ⇒ Ok(markdown.unsafePerformIO).as(HTML))
+      }
   }
 
   def lexers = Action {