diff options
author | Stewart Stewart <stewinsalot@gmail.com> | 2017-03-17 11:11:32 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-17 11:11:32 -0700 |
commit | 5b96449bfcb9117c755e1b48a8462f79d6e1230c (patch) | |
tree | fa42b85089e9f133057fbf7ab7bade124a89a742 | |
parent | 22ecb961a02cafa594f4cf5133c9d3862c7cd750 (diff) | |
parent | 8ac5bfc5d5f791f10755672f671a7ee07862cf02 (diff) | |
download | driver-core-5b96449bfcb9117c755e1b48a8462f79d6e1230c.tar.gz driver-core-5b96449bfcb9117c755e1b48a8462f79d6e1230c.tar.bz2 driver-core-5b96449bfcb9117c755e1b48a8462f79d6e1230c.zip |
Merge pull request #26 from drivergroup/iso-date-extractorsv0.10.30
Add Day, Month, and Year extractors
-rw-r--r-- | src/main/scala/xyz/driver/core/date.scala | 46 |
1 files changed, 43 insertions, 3 deletions
diff --git a/src/main/scala/xyz/driver/core/date.scala b/src/main/scala/xyz/driver/core/date.scala index b9bcacb..d6f64e4 100644 --- a/src/main/scala/xyz/driver/core/date.scala +++ b/src/main/scala/xyz/driver/core/date.scala @@ -2,8 +2,32 @@ package xyz.driver.core import java.util.Calendar +import scala.util.Try + +import scalaz.std.anyVal._ +import scalaz.syntax.equal._ + +/** + * Driver Date type and related validators/extractors. + * Day, Month, and Year extractors are from ISO 8601 strings => driver...Date integers. + * TODO: Decouple extractors from ISO 8601, as we might want to parse other formats. + */ object date { + type Day = Int @@ Day.type + + object Day { + def apply(value: Int): Day = { + require(1 to 31 contains value, "Day must be in range 1 <= value <= 31") + value.asInstanceOf[Day] + } + + def unapply(dayString: String): Option[Int] = { + require(dayString.length === 2, s"ISO 8601 day string, DD, must have length 2: $dayString") + Try(dayString.toInt).toOption.map(apply) + } + } + type Month = Int @@ Month.type object Month { @@ -23,6 +47,22 @@ object date { val OCTOBER = Month(Calendar.OCTOBER) val NOVEMBER = Month(Calendar.NOVEMBER) val DECEMBER = Month(Calendar.DECEMBER) + + def unapply(monthString: String): Option[Month] = { + require(monthString.length === 2, s"ISO 8601 month string, MM, must have length 2: $monthString") + Try(monthString.toInt).toOption.map(isoM => apply(isoM - 1)) + } + } + + type Year = Int @@ Year.type + + object Year { + def apply(value: Int): Year = value.asInstanceOf[Year] + + def unapply(yearString: String): Option[Int] = { + require(yearString.length === 4, s"ISO 8601 year string, YYYY, must have length 4: $yearString") + Try(yearString.toInt).toOption.map(apply) + } } final case class Date(year: Int, month: Month, day: Int) { @@ -41,9 +81,9 @@ object date { } def fromString(dateString: String): Option[Date] = { - util.Try(dateString.split("-").map(_.toInt)).toOption collect { - case Array(year, month, day) if (1 to 12 contains month) && (1 to 31 contains day) => - Date(year, Month(month - 1), day) + dateString.split('-') match { + case Array(Year(year), Month(month), Day(day)) => Some(Date(year, month, day)) + case _ => None } } } |