Nested property is supported in the mapping definition.

This commit is contained in:
takezoe
2013-04-14 18:28:01 +09:00
parent af257c1941
commit 3c41101e4d
2 changed files with 73 additions and 52 deletions

View File

@@ -65,7 +65,7 @@ class CreateRepositoryServlet extends ServletBase {
form.validateAsJSON(params) form.validateAsJSON(params)
} }
val form = Form( val form = mapping(
"name" -> trim(label("Repository name", text(required, maxlength(40), repository))), "name" -> trim(label("Repository name", text(required, maxlength(40), repository))),
"description" -> trim(label("Description" , text())) "description" -> trim(label("Description" , text()))
)(RepositoryCreationForm.apply) )(RepositoryCreationForm.apply)

View File

@@ -5,50 +5,88 @@ import org.json4s.jackson._
object Validations { object Validations {
def withValidation[T](form: Form[T], params: Map[String, String])(action: T => Any): Any = { /**
form.validate(params).isEmpty match { * Runs form validation before action.
case true => action(form.create(params)) * If there are validation error, action is not invoked and this method throws RuntimeException.
*
* @param mapping the mapping definition
* @param params the request parameters
* @param action the action
* @return the result of action
*/
def withValidation[T](mapping: MappingValueType[T], params: Map[String, String])(action: T => Any): Any = {
mapping.validate("form", params).isEmpty match {
case true => action(mapping.convert("form", params))
case false => throw new RuntimeException("Invalid Request") // TODO show error page? case false => throw new RuntimeException("Invalid Request") // TODO show error page?
} }
} }
def Form[T, P1](f1: (String, ValueType[P1]))(factory: (P1) => T): Form[T] = new Form[T]{ /////////////////////////////////////////////////////////////////////////////////////////////
def fields = Seq(f1) // ValueTypes
def create(params: Map[String, String]) = factory(f1._2.convert(params(f1._1)))
trait ValueType[T] {
def convert(name: String, params: Map[String, String]): T
def validate(name: String, params: Map[String, String]): Seq[(String, String)]
} }
def Form[T, P1, P2](f1: (String, ValueType[P1]), f2: (String, ValueType[P2]))(factory: (P1, P2) => T): Form[T] = new Form[T]{ /**
def fields = Seq(f1, f2) * The base class for the single field ValueTypes.
def create(params: Map[String, String]) = factory(f1._2.convert(params(f1._1)), f2._2.convert(params(f2._1))) */
abstract class SingleValueType[T](constraints: Constraint*) extends ValueType[T]{
def convert(name: String, params: Map[String, String]): T = convert(params(name))
def convert(value: String): T
def validate(name: String, params: Map[String, String]): Seq[(String, String)] = validate(name, params(name))
def validate(name: String, value: String): Seq[(String, String)] = validaterec(name, value, Seq(constraints: _*))
@scala.annotation.tailrec
private def validaterec(name: String, value: String, constraints: Seq[Constraint]): Seq[(String, String)] = {
constraints match {
case (x :: rest) => x.validate(name, value) match {
case Some(message) => Seq(name -> message)
case None => validaterec(name, value, rest)
}
case Nil => Nil
case x => println(x); Nil
}
} }
def Form[T, P1, P2, P3](f1: (String, ValueType[P1]), f2: (String, ValueType[P2]), f3: (String, ValueType[P3]))(factory: (P1, P2, P3) => T): Form[T] = new Form[T]{
def fields = Seq(f1, f2)
def create(params: Map[String, String]) = factory(f1._2.convert(params(f1._1)), f2._2.convert(params(f2._1)), f3._2.convert(params(f3._1)))
} }
abstract class Form[T] { /**
* The base class for the object field ValueTypes.
*/
abstract class MappingValueType[T] extends ValueType[T]{
def fields: Seq[(String, ValueType[_])] def fields: Seq[(String, ValueType[_])]
def create(params: Map[String, String]): T def validate(name: String, params: Map[String, String]): Seq[(String, String)] =
fields.map { case (name, valueType) => valueType.validate(name, params) }.flatten
def validate(params: Map[String, String]): Map[String, String] = {
fields.map { case (name, valueType) =>
valueType.validate(name, params(name)) match {
case Some(message) => Some(name, message)
case None => None
}
}.flatten.toMap
}
def validateAsJSON(params: Map[String, String]): JObject = { def validateAsJSON(params: Map[String, String]): JObject = {
JObject(validate(params).map { case (key, value) => JObject(validate("form", params).map { case (key, value) =>
JField(key, JString(value)) JField(key, JString(value))
}.toList) }.toList)
} }
} }
def text(constraints: Constraint*): SingleValueType[String] = new SingleValueType[String](constraints: _*){
def convert(value: String): String = value
}
def mapping[T, P1](f1: (String, ValueType[P1]))(factory: (P1) => T): MappingValueType[T] = new MappingValueType[T]{
def fields = Seq(f1)
def convert(name: String, params: Map[String, String]) = factory(f1._2.convert(f1._1, params))
}
def mapping[T, P1, P2](f1: (String, ValueType[P1]), f2: (String, ValueType[P2]))(factory: (P1, P2) => T): MappingValueType[T] = new MappingValueType[T]{
def fields = Seq(f1, f2)
def convert(name: String, params: Map[String, String]) = factory(f1._2.convert(f1._1, params), f2._2.convert(f2._1, params))
}
///////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////
// Constraints // Constraints
@@ -57,9 +95,10 @@ object Validations {
} }
def required: Constraint = new Constraint(){ def required: Constraint = new Constraint(){
def validate(name: String, value: String): Option[String] = def validate(name: String, value: String): Option[String] = {
if(value.isEmpty) Some("%s is required.".format(name)) else None if(value.isEmpty) Some("%s is required.".format(name)) else None
} }
}
def required(message: String): Constraint = new Constraint(){ def required(message: String): Constraint = new Constraint(){
def validate(name: String, value: String): Option[String] = def validate(name: String, value: String): Option[String] =
@@ -83,36 +122,18 @@ object Validations {
} else None } else None
} }
/////////////////////////////////////////////////////////////////////////////////////////////
// ValueTypes
abstract class ValueType[T](constraints: Constraint*) {
def convert(value: String): T
def validate(name: String, value: String): Option[String] = {
constraints.map(_.validate(name, value)).flatten.headOption
}
}
def text(constraints: Constraint*): ValueType[String] = new ValueType[String](constraints: _*){
def convert(value: String): String = value
}
///////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////
// ValueType wrappers to provide additional features. // ValueType wrappers to provide additional features.
def trim[T](valueType: ValueType[T]): ValueType[T] = new ValueType[T](){ def trim[T](valueType: SingleValueType[T]): SingleValueType[T] = new SingleValueType[T](){
def convert(value: String): T = valueType.convert(value.trim) def convert(value: String): T = valueType.convert(value.trim)
override def validate(name: String, value: String): Option[String] = valueType.validate(name, value.trim) override def validate(name: String, value: String): Seq[(String, String)] = valueType.validate(name, value.trim)
} }
/** def label[T](label: String, valueType: SingleValueType[T]): SingleValueType[T] = new SingleValueType[T](){
* def convert(value: String): T = valueType.convert(value)
*/ override def validate(name: String, value: String): Seq[(String, String)] =
def label[T](label: String, valueType: ValueType[T]): ValueType[T] = new ValueType[T](){ valueType.validate(label, value).map { case (label, message) => name -> message }
def convert(value: String): T = valueType.convert(value.trim)
override def validate(name: String, value: String): Option[String] = valueType.validate(label, value.trim)
} }
} }