Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-06 05:25:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improvements for validation.

Browse Source
This commit is contained in:
takezoe
2013-04-15 12:35:15 +09:00
parent 6fe7e19cb1
commit aa40822436
4 changed files with 92 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/main/scala/util/Validations.scala
View File

@@ -248,28 +248,28 @@ object Validations {
override def validate(name: String, value: String): Seq[(String, String)] = valueType.validate(name, value.trim)
}
/**
* ValueType wrapper to trim all parameters.
*
* {{{
* val form = trim(mapping(
* "name" -> text(required),
* "mail" -> text(required)
* ))
* }}}
*/
def trim[T](valueType: MappingValueType[T]): MappingValueType[T] = new MappingValueType[T](){
def validate(name: String, params: Map[String, String]): Seq[(String, String)] =
fields.map { case (name, valueType) => valueType.validate(name, trimMap(params)) }.flatten
def validateAsJSON(params: Map[String, String]): JObject = {
JObject(validate("form", trimMap(params)).map { case (key, value) =>
JField(key, JString(value))
}.toList)
}
private def trimMap(params: Map[String, String]): Map[String, String] = params.map{ x => x._1 -> x._2.trim }
}
// /**
// * ValueType wrapper to trim all parameters.
// *
// * {{{
// * val form = trim(mapping(
// * "name" -> text(required),
// * "mail" -> text(required)
// * ))
// * }}}
// */
// def trim[T](valueType: MappingValueType[T]): MappingValueType[T] = new MappingValueType[T](){
// override def validate(name: String, params: Map[String, String]): Seq[(String, String)] =
// fields.map { case (name, valueType) => valueType.validate(name, trimMap(params)) }.flatten
//
// override def validateAsJSON(params: Map[String, String]): JObject = {
// JObject(validate("form", trimMap(params)).map { case (key, value) =>
// JField(key, JString(value))
// }.toList)
// }
//
// private def trimMap(params: Map[String, String]): Map[String, String] = params.map{ x => x._1 -> x._2.trim }
// }
/**
* ValueType wrapper to specified a property name which is used in the error message.