gogol-core 0.1.1 → 0.2.0

raw patch · 4 files changed

+52/−57 lines, 4 filesdep −memorydep ~basePVP ok

version bump matches the API change (PVP)

Dependencies removed: memory

Dependency ranges changed: base

API changes (from Hackage documentation)

Files

• gogol-core.cabal +2/−3
• src/Network/Google/Data/Base64.hs +0/−53
• src/Network/Google/Data/Bytes.hs +49/−0
• src/Network/Google/Prelude.hs +1/−1

@@ -1,5 +1,5 @@ name:                  gogol-core-version:               0.1.1+version:               0.2.0 synopsis:              Core data types and functionality for Gogol libraries. homepage:              https://github.com/brendanhay/gogol bug-reports:           https://github.com/brendanhay/gogol/issues@@ -36,7 +36,7 @@     ghc-options:       -Wall      exposed-modules:-          Network.Google.Data.Base64+          Network.Google.Data.Bytes         , Network.Google.Data.JSON         , Network.Google.Data.Numeric         , Network.Google.Data.Time@@ -59,7 +59,6 @@         , http-media           >= 0.6         , http-types           >= 0.8.6         , lens                 >= 4.4-        , memory               >= 0.8         , resourcet            >= 1.1         , scientific           >= 0.3         , servant              >= 0.4.4

@@ -1,53 +0,0 @@-{-# LANGUAGE DeriveDataTypeable         #-}-{-# LANGUAGE DeriveGeneric              #-}-{-# LANGUAGE GeneralizedNewtypeDeriving #-}---- |--- Module      : Network.Google.Data.Base64--- Copyright   : (c) 2013-2016 Brendan Hay--- License     : Mozilla Public License, v. 2.0.--- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>--- Stability   : provisional--- Portability : non-portable (GHC extensions)----module Network.Google.Data.Base64-    ( Base64 (..)-    , _Base64-    ) where--import           Control.Lens             (Iso', iso)-import           Data.Aeson               (FromJSON (..), ToJSON (..))-import qualified Data.ByteArray.Encoding  as BA-import           Data.ByteString          (ByteString)-import qualified Data.ByteString.Char8    as BS8-import           Data.Data                (Data, Typeable)-import           Data.Hashable-import qualified Data.Text.Encoding       as Text-import           GHC.Generics             (Generic)-import           Network.Google.Data.JSON (parseJSONText, toJSONText)-import           Web.HttpApiData          (FromHttpApiData (..),-                                           ToHttpApiData (..))---- | Base64 encoded binary data.------ Encoding\/decoding is automatically deferred to serialisation and deserialisation--- respectively.-newtype Base64 = Base64 { unBase64 :: ByteString }-    deriving (Eq, Read, Ord, Data, Typeable, Generic)--instance Hashable Base64--_Base64 :: Iso' Base64 ByteString-_Base64 = iso unBase64 Base64--instance ToHttpApiData Base64 where-    toQueryParam = Text.decodeUtf8 . toHeader-    toHeader     = BA.convertToBase BA.Base64 . unBase64--instance FromHttpApiData Base64 where-    parseQueryParam = parseHeader . Text.encodeUtf8-    parseHeader     = either fail (pure . Base64) . BA.convertFromBase BA.Base64--instance Show     Base64 where show      = show . BS8.unpack . unBase64-instance FromJSON Base64 where parseJSON = parseJSONText "Base64"-instance ToJSON   Base64 where toJSON    = toJSONText

@@ -0,0 +1,49 @@+{-# LANGUAGE DeriveDataTypeable         #-}+{-# LANGUAGE DeriveGeneric              #-}+{-# LANGUAGE GeneralizedNewtypeDeriving #-}++-- |+-- Module      : Network.Google.Data.Bytes+-- Copyright   : (c) 2013-2016 Brendan Hay+-- License     : Mozilla Public License, v. 2.0.+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>+-- Stability   : provisional+-- Portability : non-portable (GHC extensions)+--+module Network.Google.Data.Bytes+    ( Bytes (..)+    , _Bytes+    ) where++import           Control.Lens             (Iso', iso)+import           Data.Aeson               (FromJSON (..), ToJSON (..))+import           Data.ByteString          (ByteString)+import           Data.Data                (Data, Typeable)+import           Data.Hashable+import qualified Data.Text.Encoding       as Text+import           GHC.Generics             (Generic)+import           Network.Google.Data.JSON (parseJSONText, toJSONText)+import           Web.HttpApiData          (FromHttpApiData (..),+                                           ToHttpApiData (..))+-- | Binary data.+--+-- This data is passed to/from the serialisation routines as-is, and any+-- particular encoding or decoding (say, base64) is left up to the caller.+newtype Bytes = Bytes { unBytes :: ByteString }+    deriving (Eq, Show, Read, Ord, Data, Typeable, Generic)++instance Hashable Bytes++_Bytes :: Iso' Bytes ByteString+_Bytes = iso unBytes Bytes++instance ToHttpApiData Bytes where+    toQueryParam = Text.decodeUtf8 . unBytes+    toHeader     = unBytes++instance FromHttpApiData Bytes where+    parseQueryParam = pure . Bytes . Text.encodeUtf8+    parseHeader     = pure . Bytes++instance FromJSON Bytes where parseJSON = parseJSONText "Bytes"+instance ToJSON   Bytes where toJSON    = toJSONText

@@ -31,7 +31,7 @@ import Servant.Utils.Links as Export hiding (Link) import Web.HttpApiData     as Export (FromHttpApiData (..), ToHttpApiData (..)) -import Network.Google.Data.Base64  as Export+import Network.Google.Data.Bytes   as Export import Network.Google.Data.JSON    as Export import Network.Google.Data.Numeric as Export import Network.Google.Data.Time    as Export