date range constraint: error when date is not correctly parsed

Also changed the date in example to make it more plausible.
hrj · Sep 8, 2016 · 40dacb3 · 40dacb3
1 parent 9b3ff51
commit 40dacb3
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/base/src/main/scala/co/uproot/abandon/Config.scala b/base/src/main/scala/co/uproot/abandon/Config.scala
@@ -82,7 +82,7 @@ object SettingsHelper {
         val accountConfigs = config.optConfigList("accounts").getOrElse(Nil)
         val accounts = accountConfigs.map(makeAccountSettings)
         val eodConstraints = config.optConfigList("eodConstraints").getOrElse(Nil).map(makeEodConstraints(_))
-        val dateConstraints = config.optConfigList("dateConstraints").getOrElse(Nil).map(makeDateConstraints(_))
+        val dateConstraints = config.optConfigList("dateConstraints").getOrElse(Nil).map(makeDateConstraint(_))
         Right(Settings(inputs, eodConstraints ++ dateConstraints, accounts, reports, ReportOptions(isRight), exports, Some(file)))
       } catch {
         case e: ConfigException => Left(e.getMessage)
@@ -101,11 +101,23 @@ object SettingsHelper {
     }
   }
 
-  def makeDateConstraints(config: Config): DateConstraint = {
-    val from = AbandonParser.dateExpr(ParserHelper.scanner(config.getString("from"))).map(Some(_)).getOrElse(None)
-    val to   = AbandonParser.dateExpr(ParserHelper.scanner(config.getString("to"))).map(Some(_)).getOrElse(None)
+  private def getDate(name: String, config: Config) : Option[Date] = {
+    import AbandonParser.{Success, NoSuccess}
 
-    DateConstraint(from, to)
+    config.optional(name) { _.getString(_) } match {
+      case Some(valueStr) =>
+        val parseResult = AbandonParser.dateExpr(ParserHelper.scanner(valueStr))
+        parseResult match {
+          case Success(date, _) => Option(date)
+          case NoSuccess(_, _) =>
+            throw new ConfigException.BadValue(config.origin, name, "expected date expression")
+        }
+      case None => None
+    }
+  }
+
+  private def makeDateConstraint(config: Config): DateConstraint = {
+    DateConstraint(getDate("from", config), getDate("to", config))
   }
 
   def makeReportSettings(config: Config) = {

diff --git a/examples/complete/accounts.conf b/examples/complete/accounts.conf
@@ -68,7 +68,9 @@ exports += {
 
 }
 
+// TODO: Change constraint "from" to "2012/april/1" when GH-93 is implemented
+
 dateConstraints += {
-  from = "2012-01-01"
-  to   = "2013-12-31"
-}
+  from = "2012/march/31"
+  to   = "2013/march/31"
+}
diff --git a/examples/complete/opening.ledger b/examples/complete/opening.ledger
@@ -1,6 +1,6 @@
 
 ; March 2012
-2012/3/1  OpeningBalance
+2012/3/31  OpeningBalance
   Capital:Share:Hary                              6,000
   Capital:Share:Amy                               4,000
   Capital:Reserves_And_Surplus                   -1,500