git.iko.soy/gogol
on develop help sign in
Splitting Time components into separate module
commit5a810b91675d7ad964b9d71178e3fa3b0a69e3ea authorBrendan Hay <brendan.g.hay@gmail.com> dateMon 5 Oct 2015, 13:32 (11 years ago) parentd2cc33b
3 files changed+35−13
compare with develop
unifiedsplit
core/gogol-core.cabal+1 core/src/Network/Google/Data/Time.hs+33 core/src/Network/Google/Prelude.hs+1−13
core/gogol-core.cabal+1
@@ -41,6 +41,7 @@ library
4141 other-modules:
4242 Network.Google.Data.JSON
4343 , Network.Google.Data.Numeric
44+ , Network.Google.Data.Time
4445
4546 build-depends:
4647 aeson >= 0.8
core/src/Network/Google/Data/Time.hsnew file+33
@@ -0,0 +1,33 @@
1+{-# LANGUAGE DeriveDataTypeable #-}
2+{-# LANGUAGE DeriveGeneric #-}
3+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
4+
5+-- |
6+-- Module : Network.Google.Data.Time
7+-- Copyright : (c) 2015 Brendan Hay <brendan.g.hay@gmail.com>
8+-- License : Mozilla Public License, v. 2.0.
9+-- Maintainer : Brendan Hay <brendan.g.hay@gmail.com>
10+-- Stability : provisional
11+-- Portability : non-portable (GHC extensions)
12+--
13+module Network.Google.Data.Time where
14+
15+import Data.Aeson
16+import Data.Data (Data, Typeable)
17+import Data.Text (Text)
18+import Data.Time
19+import GHC.Generics
20+import Servant.API (FromText, ToText)
21+
22+_Time = undefined
23+_Date = undefined
24+_DateTime = undefined
25+
26+newtype Time' = Time' Text -- TimeOfDay
27+ deriving (Eq, Ord, Show, Read, Generic, Data, Typeable, FromText, ToText, FromJSON, ToJSON)
28+
29+newtype Date' = Date' Text -- LocalTime
30+ deriving (Eq, Ord, Show, Read, Generic, Data, Typeable, FromText, ToText, FromJSON, ToJSON)
31+
32+newtype DateTime' = DateTime' Text -- UTCTime
33+ deriving (Eq, Ord, Show, Read, Generic, Data, Typeable, FromText, ToText, FromJSON, ToJSON)
core/src/Network/Google/Prelude.hs+1−13
@@ -43,6 +43,7 @@ import GHC.Generics as Export (Generic)
4343import GHC.TypeLits
4444import Network.Google.Data.JSON as Export
4545import Network.Google.Data.Numeric as Export
46+import Network.Google.Data.Time as Export
4647-- import Network.HTTP.Media
4748import Numeric.Natural as Export (Natural)
4849import Prelude as Export hiding (product)
@@ -63,19 +64,6 @@ _Default = iso f Just
6364 f (Just x) = x
6465 f Nothing = mempty
6566
66−_Time = undefined
67−_Date = undefined
68−_DateTime = undefined
69−
70−newtype Time' = Time' Text -- TimeOfDay
71− deriving (Eq, Ord, Show, Read, Generic, Data, Typeable, FromText, ToText, FromJSON, ToJSON)
72−
73−newtype Date' = Date' Text -- LocalTime
74− deriving (Eq, Ord, Show, Read, Generic, Data, Typeable, FromText, ToText, FromJSON, ToJSON)
75−
76−newtype DateTime' = DateTime' Text -- UTCTime
77− deriving (Eq, Ord, Show, Read, Generic, Data, Typeable, FromText, ToText, FromJSON, ToJSON)
78−
7967data AltJSON = AltJSON
8068 deriving (Eq, Ord, Show, Read, Generic, Data, Typeable)
8169