git.iko.soy/typeable/aeson
on master help sign in
Add ToJSON and FromJSON instances for Day
6254173Bryan O'Sullivan
Data/Aeson/Types/Instances.hs+8−1
compare with master
unifiedsplit
@@ -77,7 +77,7 @@ import Data.Maybe (fromMaybe)
77import Data.Monoid (Dual(..), First(..), Last(..))
77import Data.Monoid (Dual(..), First(..), Last(..))
78import Data.Ratio (Ratio, (%), numerator, denominator)
78import Data.Ratio (Ratio, (%), numerator, denominator)
79import Data.Text (Text, pack, unpack)
79import Data.Text (Text, pack, unpack)
80−import Data.Time (UTCTime, ZonedTime)
80+import Data.Time (Day, UTCTime, ZonedTime)
81import Data.Time.Format (FormatTime, formatTime, parseTime)
81import Data.Time.Format (FormatTime, formatTime, parseTime)
82import Data.Traversable as Tr (sequence, traverse)
82import Data.Traversable as Tr (sequence, traverse)
83import Data.Vector (Vector)
83import Data.Vector (Vector)
@@ -711,6 +711,13 @@ instance FromJSON DotNetTime where
711 _ -> fail "could not parse .NET time"
711 _ -> fail "could not parse .NET time"
712 {-# INLINE parseJSON #-}
712 {-# INLINE parseJSON #-}
713
713
714+instance ToJSON Day where
715+ toJSON = stringEncoding
716+ toEncoding z = Encoding (E.day z)
717+
718+instance FromJSON Day where
719+ parseJSON = withText "Day" (Time.run Time.day)
720+
714instance ToJSON ZonedTime where
721instance ToJSON ZonedTime where
715 toJSON = stringEncoding
722 toJSON = stringEncoding
716
723
tests/Properties.hs+2−1
@@ -9,7 +9,7 @@ import Data.Aeson.Parser (value)
9import Data.Aeson.Types
9import Data.Aeson.Types
10import Data.ByteString.Builder (toLazyByteString)
10import Data.ByteString.Builder (toLazyByteString)
11import Data.Int (Int8)
11import Data.Int (Int8)
12−import Data.Time (UTCTime, ZonedTime)
12+import Data.Time (Day, UTCTime, ZonedTime)
13import Encoders
13import Encoders
14import Instances ()
14import Instances ()
15import Test.Framework (Test, testGroup)
15import Test.Framework (Test, testGroup)
@@ -119,6 +119,7 @@ tests = testGroup "properties" [
119 , testProperty "String" $ roundTripEq ("" :: String)
119 , testProperty "String" $ roundTripEq ("" :: String)
120 , testProperty "Text" $ roundTripEq T.empty
120 , testProperty "Text" $ roundTripEq T.empty
121 , testProperty "Foo" $ roundTripEq (undefined :: Foo)
121 , testProperty "Foo" $ roundTripEq (undefined :: Foo)
122+ , testProperty "Day" $ roundTripEq (undefined :: Day)
122 , testProperty "DotNetTime" $ roundTripEq (undefined :: DotNetTime)
123 , testProperty "DotNetTime" $ roundTripEq (undefined :: DotNetTime)
123 , testProperty "UTCTime" $ roundTripEq (undefined :: UTCTime)
124 , testProperty "UTCTime" $ roundTripEq (undefined :: UTCTime)
124 , testProperty "ZonedTime" $ roundTripEq (undefined :: ZonedTime)
125 , testProperty "ZonedTime" $ roundTripEq (undefined :: ZonedTime)