From d3de7e16c27fb65a648562dccb7792f14b8cf8c4 Mon Sep 17 00:00:00 2001 From: Vincent Jousse Date: Sat, 28 Apr 2012 14:36:35 +0200 Subject: [PATCH] Use body content to parse mardown (and not use form-encoded) --- app/controllers/Parsing.scala | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/app/controllers/Parsing.scala b/app/controllers/Parsing.scala index f5e0ceb..33ff680 100644 --- 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 {