git.iko.soy/typeable/aeson
on master help sign in
Merge
commit44212b436423825b0c5088c9e074ff43dda7dfd0 authorBryan O'Sullivan <bos@serpentine.com> dateFri 14 Aug 2015, 09:14 (11 years ago) parentd0414befaadca7
3 files changed+24−3
compare with master
unifiedsplit
Data/Aeson/Types/Instances.hs+16−1 tests/Instances.hs+6−1 tests/Properties.hs+2−1
Data/Aeson/Types/Instances.hs+16−1
@@ -72,7 +72,7 @@ import Data.Monoid (Dual(..), First(..), Last(..))
7272import Data.Ratio (Ratio, (%), numerator, denominator)
7373import Data.Scientific (Scientific)
7474import Data.Text (Text, pack, unpack)
75−import Data.Time (Day, LocalTime, UTCTime, ZonedTime)
75+import Data.Time (Day, LocalTime, NominalDiffTime, UTCTime, ZonedTime)
7676import Data.Time.Format (FormatTime, formatTime, parseTime)
7777import Data.Traversable as Tr (sequence, traverse)
7878import Data.Vector (Vector)
@@ -749,6 +749,21 @@ stringEncoding = String . T.decodeLatin1 . L.toStrict . encode
749749instance FromJSON UTCTime where
750750 parseJSON = withText "UTCTime" (Time.run Time.utcTime)
751751
752+instance ToJSON NominalDiffTime where
753+ toJSON = Number . realToFrac
754+ {-# INLINE toJSON #-}
755+
756+ toEncoding = Encoding . E.number . realToFrac
757+ {-# INLINE toEncoding #-}
758+
759+-- | /WARNING:/ Only parse lengths of time from trusted input
760+-- since an attacker could easily fill up the memory of the target
761+-- system by specifying a scientific number with a big exponent like
762+-- @1e1000000000@.
763+instance FromJSON NominalDiffTime where
764+ parseJSON = withScientific "NominalDiffTime" $ pure . realToFrac
765+ {-# INLINE parseJSON #-}
766+
752767parseJSONElemAtIndex :: FromJSON a => Int -> Vector Value -> Parser a
753768parseJSONElemAtIndex idx ary = parseJSON (V.unsafeIndex ary idx) <?> Index idx
754769
tests/Instances.hs+6−1
@@ -8,8 +8,10 @@ import Data.Function (on)
88import Control.Monad
99import Test.QuickCheck (Arbitrary(..), Gen, choose, oneof, elements)
1010import Data.Time.Clock (DiffTime, UTCTime(..), picosecondsToDiffTime)
11+import Data.Fixed (Pico)
1112import Data.Time (ZonedTime(..), LocalTime(..), TimeZone(..),
12− hoursToTimeZone, Day(..), TimeOfDay(..))
13+ hoursToTimeZone, Day(..), TimeOfDay(..),
14+ NominalDiffTime)
1315import qualified Data.Text as T
1416import qualified Data.Map as Map
1517import Data.Text (Text)
@@ -49,6 +51,9 @@ instance Arbitrary DotNetTime where
4951instance Arbitrary ZonedTime where
5052 arbitrary = liftM2 ZonedTime arbitrary arbitrary
5153
54+instance Arbitrary NominalDiffTime where
55+ arbitrary = realToFrac <$> (arbitrary :: Gen Pico)
56+
5257deriving instance Eq ZonedTime
5358
5459-- Compare equality to within a millisecond, allowing for rounding
tests/Properties.hs+2−1
@@ -9,7 +9,7 @@ import Data.Aeson.Parser (value)
99import Data.Aeson.Types
1010import Data.ByteString.Builder (toLazyByteString)
1111import Data.Int (Int8)
12−import Data.Time (Day, LocalTime, UTCTime, ZonedTime)
12+import Data.Time (Day, LocalTime, NominalDiffTime, UTCTime, ZonedTime)
1313import Encoders
1414import Instances ()
1515import Test.Framework (Test, testGroup)
@@ -124,6 +124,7 @@ tests = testGroup "properties" [
124124 , testProperty "LocalTime" $ roundTripEq (undefined :: LocalTime)
125125 , testProperty "UTCTime" $ roundTripEq (undefined :: UTCTime)
126126 , testProperty "ZonedTime" $ roundTripEq (undefined :: ZonedTime)
127+ , testProperty "NominalDiffTime" $ roundTripEq (undefined :: NominalDiffTime)
127128 , testGroup "ghcGenerics" [
128129 testProperty "OneConstructor" $ roundTripEq OneConstructor
129130 , testProperty "Product2" $ roundTripEq (undefined :: Product2 Int Bool)