aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/xyz/driver/core/json.scala
diff options
context:
space:
mode:
authorVlad Uspensky <v.uspenskiy@icloud.com>2017-03-16 11:36:26 -0700
committerGitHub <noreply@github.com>2017-03-16 11:36:26 -0700
commit22ecb961a02cafa594f4cf5133c9d3862c7cd750 (patch)
tree803d183de18d2b67672b03227d7d0df1bdd197f9 /src/main/scala/xyz/driver/core/json.scala
parent6ae573387e623912a164d3e35e2c79065434d978 (diff)
parentbe262d8b985470e24adc924ca1f4d2b83fca744c (diff)
downloaddriver-core-22ecb961a02cafa594f4cf5133c9d3862c7cd750.tar.gz
driver-core-22ecb961a02cafa594f4cf5133c9d3862c7cd750.tar.bz2
driver-core-22ecb961a02cafa594f4cf5133c9d3862c7cd750.zip
Merge pull request #25 from drivergroup/month-formatv0.10.29
Add month format and expose month constructor
Diffstat (limited to 'src/main/scala/xyz/driver/core/json.scala')
-rw-r--r--src/main/scala/xyz/driver/core/json.scala10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/main/scala/xyz/driver/core/json.scala b/src/main/scala/xyz/driver/core/json.scala
index 01efd57..457a087 100644
--- a/src/main/scala/xyz/driver/core/json.scala
+++ b/src/main/scala/xyz/driver/core/json.scala
@@ -7,7 +7,7 @@ import akka.http.scaladsl.unmarshalling.Unmarshaller
import spray.json.{DeserializationException, JsNumber, _}
import xyz.driver.core.auth.AuthCredentials
import xyz.driver.core.time.Time
-import xyz.driver.core.date.Date
+import xyz.driver.core.date.{Date, Month}
import xyz.driver.core.domain.{Email, PhoneNumber}
import scala.reflect.runtime.universe._
@@ -81,6 +81,14 @@ object json {
}
}
+ implicit val monthFormat = new RootJsonFormat[Month] {
+ def write(month: Month) = JsNumber(month)
+ def read(value: JsValue): Month = value match {
+ case JsNumber(month) if 0 <= month && month <= 11 => Month(month.toInt)
+ case _ => throw DeserializationException("Expected a number from 0 to 11")
+ }
+ }
+
def RevisionInPath[T]: PathMatcher1[Revision[T]] =
PathMatcher("""[\da-fA-F]{8}-[\da-fA-F]{4}-[\da-fA-F]{4}-[\da-fA-F]{4}-[\da-fA-F]{12}""".r) flatMap { string =>
Some(Revision[T](string))