85acead · typeable/servant · git.iko.soy

git.iko.soy/typeable/servant

on master help sign in

added instance Generic BaseUrl

85aceadSönke Hahn12 years ago

src/Servant/Client.hs+4−2

compare with master

@@ -1,5 +1,6 @@

1{-# LANGUAGE TypeFamilies #-}

1{-# LANGUAGE TypeFamilies #-}

2{-# LANGUAGE OverloadedStrings #-}

2{-# LANGUAGE OverloadedStrings #-}

3+{-# LANGUAGE DeriveGeneric #-}

3module Servant.Client where

4module Servant.Client where

4

5

5import Control.Concurrent

6import Control.Concurrent

@@ -7,6 +8,7 @@ import Control.Monad.Catch

7import Data.ByteString.Lazy

8import Data.ByteString.Lazy

8import Data.Proxy

9import Data.Proxy

9import Data.Text

10import Data.Text

11+import GHC.Generics

10import Network.HTTP.Client hiding (Proxy)

12import Network.HTTP.Client hiding (Proxy)

11import Network.HTTP.Types

13import Network.HTTP.Types

12import Network.URI

14import Network.URI

@@ -15,14 +17,14 @@ import System.IO.Unsafe

15-- * Accessing APIs as a Client

17-- * Accessing APIs as a Client

16

18

17data Scheme = Http | Https

19data Scheme = Http | Https

18− deriving (Show, Eq, Ord)

20+ deriving (Show, Eq, Ord, Generic)

19

21

20data BaseUrl = BaseUrl {

22data BaseUrl = BaseUrl {

21 baseUrlScheme :: Scheme,

23 baseUrlScheme :: Scheme,

22 baseUrlHost :: String,

24 baseUrlHost :: String,

23 baseUrlPort :: Int

25 baseUrlPort :: Int

24 }

26 }

25− deriving (Show, Eq, Ord)

27+ deriving (Show, Eq, Ord, Generic)

26

28

27httpBaseUrl :: String -> BaseUrl

29httpBaseUrl :: String -> BaseUrl

28httpBaseUrl host = BaseUrl Http host 80

30httpBaseUrl host = BaseUrl Http host 80