Merge pull request #13 from negator/master

Allow single digit day of month dates

Author: garyb

src/Data/Formatter/DateTime.purs

@@ -46,6 +46,7 @@ data FormatterF a
   | MonthFull a
   | MonthShort a
   | MonthTwoDigits a
+  | DayOfMonthTwoDigits a
   | DayOfMonth a
   | UnixTimestamp a
   | DayOfWeek a
@@ -65,6 +66,7 @@ instance formatterFFunctor ∷ Functor FormatterF where
   map f (MonthFull a) = MonthFull $ f a
   map f (MonthShort a) = MonthShort $ f a
   map f (MonthTwoDigits a) = MonthTwoDigits $ f a
+  map f (DayOfMonthTwoDigits a) = DayOfMonthTwoDigits $ f a
   map f (DayOfMonth a) = DayOfMonth $ f a
   map f (UnixTimestamp a) = UnixTimestamp $ f a
   map f (DayOfWeek a) = DayOfWeek $ f a
@@ -91,7 +93,8 @@ printFormatterF cb = case _ of
   MonthFull a → "MMMM" <> cb a
   MonthShort a → "MMM" <> cb a
   MonthTwoDigits a → "MM" <> cb a
-  DayOfMonth a → "DD" <> cb a
+  DayOfMonthTwoDigits a → "DD" <> cb a
+  DayOfMonth a → "D" <> cb a
   UnixTimestamp a → "X" <> cb a
   DayOfWeek a → "E" <> cb a
   Hours24 a → "HH" <> cb a
@@ -143,7 +146,8 @@ formatterFParser cb =
     , (PC.try $ PS.string "MMMM") *> map MonthFull cb
     , (PC.try $ PS.string "MMM") *> map MonthShort cb
     , (PC.try $ PS.string "MM") *> map MonthTwoDigits cb
-    , (PC.try $ PS.string "DD") *> map DayOfMonth cb
+    , (PC.try $ PS.string "DD") *> map DayOfMonthTwoDigits cb
+    , (PC.try $ PS.string "D") *> map DayOfMonth cb
     , (PC.try $ PS.string "E") *> map DayOfWeek cb
     , (PC.try $ PS.string "HH") *> map Hours24 cb
     , (PC.try $ PS.string "hh") *> map Hours12 cb
@@ -180,6 +184,8 @@ formatF cb dt@(DT.DateTime d t) = case _ of
   MonthTwoDigits a →
     let month = fromEnum $ D.month d
     in (padSingleDigit month) <> cb a
+  DayOfMonthTwoDigits a →
+    show (fromEnum $ D.day d) <> cb a
   DayOfMonth a →
     show (fromEnum $ D.day d) <> cb a
   UnixTimestamp a →
@@ -315,12 +321,18 @@ unformatFParser cb = case _ of
     when (Arr.length ds /= 2 || month > 12 || month < 1) $ P.fail "Incorrect 2-digit month"
     lift $ modify _{month = Just month}
     cb a
-  DayOfMonth a → do
+  DayOfMonthTwoDigits a → do
     ds ← some digit
     let dom = foldDigits ds
     when (Arr.length ds /= 2 || dom > 31 || dom < 1) $ P.fail "Incorrect day of month"
     lift $ modify _{day = Just dom}
     cb a
+  DayOfMonth a → do
+    ds ← some digit
+    let dom = foldDigits ds
+    when (Arr.length ds > 2 || dom > 31 || dom < 1) $ P.fail "Incorrect day of month"
+    lift $ modify _{day = Just dom}
+    cb a
   UnixTimestamp a → do
     s ← map foldDigits $ some digit
     case map toDateTime $ instant $ Dur.Milliseconds $ 1000.0 * Int.toNumber s of

test/src/Main.purs

@@ -119,18 +119,18 @@ numeralTests = do
 
 -- April 12th 2017 at 11:34:34:234
 -- 4/12/2017
-makeDateTime ∷ Int -> DTi.DateTime
-makeDateTime year =
+makeDateTime ∷ Int -> Int -> Int -> DTi.DateTime
+makeDateTime year month day =
   DTi.DateTime
-    (D.canonicalDate (fromMaybe bottom $ toEnum year) D.April (fromMaybe bottom $ toEnum 12))
+    (D.canonicalDate (fromMaybe bottom $ toEnum year) (fromMaybe bottom $ toEnum month) (fromMaybe bottom $ toEnum day))
     (T.Time
        (fromMaybe bottom $ toEnum 11)
        (fromMaybe bottom $ toEnum 34)
        (fromMaybe bottom $ toEnum 34)
        (fromMaybe bottom $ toEnum 234))
 
 testDateTime :: DTi.DateTime
-testDateTime = makeDateTime 2017
+testDateTime = makeDateTime 2017 4 12
 
 
 assert :: forall e. String -> String -> Boolean -> Tests e Unit
@@ -170,17 +170,18 @@ timeTest = do
   assertFormatting "April"           "MMMM" testDateTime
   assertFormatting "2017-12-04"      "YYYY-DD-MM" testDateTime
   assertFormatting "2017-Apr"        "YYYY-MMM" testDateTime
+  assertFormatting "Apr 1"           "MMM D" (makeDateTime 2017 4 1)
 
   -- This should probably be am (lowercase), if the desired
   -- functionality of the library is to mirror momentjs
   assertFormatting "11:34:34:234 AM" "hh:mm:ss:SSS a"  testDateTime
   assertFormatting "17"            "YY"  testDateTime
   log "  --- Format 20017 with YY"
-  assertFormatting "17"            "YY"  (makeDateTime 20017)
+  assertFormatting "17"            "YY"  (makeDateTime 20017 4 12)
   log "  --- Format 0 with YY"
-  assertFormatting "00"            "YY"  (makeDateTime 0)
+  assertFormatting "00"            "YY"  (makeDateTime 0 4 12)
   log "  --- Format -1 with YY"
-  assertFormatting "01"            "YY"  (makeDateTime (-1))
+  assertFormatting "01"            "YY"  (makeDateTime (-1) 4 12)
 
   log "- Data.Formatter.DateTime.unformatDateTime "