From df06c48f2d6e9f627f57656a60790d8297510b07 Mon Sep 17 00:00:00 2001 From: Stewart Stewart Date: Thu, 16 Mar 2017 16:11:43 -0400 Subject: add Day, Month, and Year extractors --- src/main/scala/xyz/driver/core/date.scala | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) (limited to 'src/main/scala/xyz/driver/core/date.scala') diff --git a/src/main/scala/xyz/driver/core/date.scala b/src/main/scala/xyz/driver/core/date.scala index b9bcacb..d3fd8a7 100644 --- a/src/main/scala/xyz/driver/core/date.scala +++ b/src/main/scala/xyz/driver/core/date.scala @@ -2,8 +2,20 @@ package xyz.driver.core import java.util.Calendar +import scala.util.Try + +import scalaz.std.anyVal._ +import scalaz.syntax.equal._ + object date { + object 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 + } + } + type Month = Int @@ Month.type object Month { @@ -23,6 +35,18 @@ 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)) + } + } + + object 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 + } } final case class Date(year: Int, month: Month, day: Int) { @@ -41,9 +65,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 } } } -- cgit v1.2.3 From 59815982ac0c0998573aae3a82f038b34f3dfa75 Mon Sep 17 00:00:00 2001 From: Stewart Stewart Date: Thu, 16 Mar 2017 16:22:06 -0400 Subject: add Year and Day type tags --- src/main/scala/xyz/driver/core/date.scala | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'src/main/scala/xyz/driver/core/date.scala') diff --git a/src/main/scala/xyz/driver/core/date.scala b/src/main/scala/xyz/driver/core/date.scala index d3fd8a7..e58be9a 100644 --- a/src/main/scala/xyz/driver/core/date.scala +++ b/src/main/scala/xyz/driver/core/date.scala @@ -9,10 +9,17 @@ import scalaz.syntax.equal._ object date { + type Day = Int @@ Day.type + object Day { + def apply(value: Int): Day = { + require(0 to 31 contains value, "Day must be in range 0 <= value <= 11") + 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 + Try(dayString.toInt).toOption.map(apply) } } @@ -42,10 +49,14 @@ object date { } } + 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 + Try(yearString.toInt).toOption.map(apply) } } -- cgit v1.2.3 From 2c81232e45d5eafbf38900014eec6fc4fb7257c2 Mon Sep 17 00:00:00 2001 From: Stewart Stewart Date: Fri, 17 Mar 2017 14:02:32 -0400 Subject: fix error message --- src/main/scala/xyz/driver/core/date.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/scala/xyz/driver/core/date.scala') diff --git a/src/main/scala/xyz/driver/core/date.scala b/src/main/scala/xyz/driver/core/date.scala index e58be9a..2e0f74e 100644 --- a/src/main/scala/xyz/driver/core/date.scala +++ b/src/main/scala/xyz/driver/core/date.scala @@ -13,7 +13,7 @@ object date { object Day { def apply(value: Int): Day = { - require(0 to 31 contains value, "Day must be in range 0 <= value <= 11") + require(1 to 31 contains value, "Day must be in range 1 <= value <= 31") value.asInstanceOf[Day] } -- cgit v1.2.3 From 8ac5bfc5d5f791f10755672f671a7ee07862cf02 Mon Sep 17 00:00:00 2001 From: Stewart Stewart Date: Fri, 17 Mar 2017 14:08:08 -0400 Subject: Add documentation with todo for decoupling ISO 8601 --- src/main/scala/xyz/driver/core/date.scala | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/main/scala/xyz/driver/core/date.scala') diff --git a/src/main/scala/xyz/driver/core/date.scala b/src/main/scala/xyz/driver/core/date.scala index 2e0f74e..d6f64e4 100644 --- a/src/main/scala/xyz/driver/core/date.scala +++ b/src/main/scala/xyz/driver/core/date.scala @@ -7,6 +7,11 @@ 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 -- cgit v1.2.3