8e72c70 · typeable/servant

git.iko.soy/typeable/servant

moved S.Client.BaseUrl to S.Utils.BaseUrl

commit8e72c70767f041a7d306228da7cafaf4052cfe15 authorSönke Hahn <soenke.hahn@zalora.com> dateFri 7 Nov 2014, 11:58 (12 years ago) parent93195ab

12 files changed+19−19

compare with master

unifiedsplit

example/greet.hs+1−1 servant.cabal+7−7 src/Servant.hs+2−2 src/Servant/API/Delete.hs+1−1 src/Servant/API/Get.hs+1−1 src/Servant/API/Post.hs+1−1 src/Servant/API/Put.hs+1−1 src/Servant/Client.hs+1−1 src/Servant/Client/BaseUrl.hs → src/Servant/Utils/BaseUrl.hs+1−1 src/Servant/Utils/Client.hs+1−1 test/Servant/Client/BaseUrlSpec.hs+1−1 test/Servant/ClientSpec.hs+1−1

example/greet.hs+1−1

@@ -20,9 +20,9 @@ import Network.Wai.Handler.Warp

2020

2121import Servant.API

2222import Servant.Client

23−import Servant.Client.BaseUrl

2423import Servant.Docs

2524import Servant.Server

25+import Servant.Utils.BaseUrl

2626

2727-- * Example

2828

servant.cabal+7−7

@@ -14,23 +14,23 @@ cabal-version: >=1.10

1414library

1515 exposed-modules:

1616 Servant

17− Servant.Client

18− Servant.Client.BaseUrl

19− Servant.Docs

20− Servant.Server

2117 Servant.API

18+ Servant.API.Alternative

2219 Servant.API.Capture

2320 Servant.API.Delete

2421 Servant.API.Elem

2522 Servant.API.Get

2623 Servant.API.Post

2724 Servant.API.Put

28− Servant.API.QueryParam

29− Servant.API.ReqBody

3025 Servant.API.QQ

26+ Servant.API.QueryParam

3127 Servant.API.Raw

28+ Servant.API.ReqBody

3229 Servant.API.Sub

33− Servant.API.Alternative

30+ Servant.Client

31+ Servant.Docs

32+ Servant.Server

33+ Servant.Utils.BaseUrl

3434 Servant.Utils.Client

3535 Servant.Utils.Text

3636 build-depends:

src/Servant.hs+2−2

@@ -7,7 +7,7 @@ module Servant (

77 module Servant.Server,

88 -- | For accessing servant APIs as API clients.

99 module Servant.Client,

10− module Servant.Client.BaseUrl,

10+ module Servant.Utils.BaseUrl,

1111 -- | For generating documentation for servant APIs.

1212 module Servant.Docs,

1313 -- | Helper module

@@ -16,7 +16,7 @@ module Servant (

1616

1717import Servant.API

1818import Servant.Client

19−import Servant.Client.BaseUrl

2019import Servant.Docs

2120import Servant.Server

21+import Servant.Utils.BaseUrl

2222import Servant.Utils.Text

src/Servant/API/Delete.hs+1−1

@@ -11,9 +11,9 @@ import Data.Typeable

1111import Network.HTTP.Types

1212import Network.Wai

1313import Servant.Client

14−import Servant.Client.BaseUrl

1514import Servant.Docs

1615import Servant.Server

16+import Servant.Utils.BaseUrl

1717import Servant.Utils.Client

1818

1919-- | Endpoint for DELETE requests.

src/Servant/API/Get.hs+1−1

@@ -12,9 +12,9 @@ import Data.Typeable

1212import Network.HTTP.Types

1313import Network.Wai

1414import Servant.Client

15−import Servant.Client.BaseUrl

1615import Servant.Docs

1716import Servant.Server

17+import Servant.Utils.BaseUrl

1818import Servant.Utils.Client

1919

2020-- | Endpoint for simple GET requests. The server doesn't receive any arguments

src/Servant/API/Post.hs+1−1

@@ -12,9 +12,9 @@ import Data.Typeable

1212import Network.HTTP.Types

1313import Network.Wai

1414import Servant.Client

15−import Servant.Client.BaseUrl

1615import Servant.Docs

1716import Servant.Server

17+import Servant.Utils.BaseUrl

1818import Servant.Utils.Client

1919

2020-- | Endpoint for POST requests. The type variable represents the type of the

src/Servant/API/Put.hs+1−1

@@ -12,9 +12,9 @@ import Data.Typeable

1212import Network.HTTP.Types

1313import Network.Wai

1414import Servant.Client

15−import Servant.Client.BaseUrl

1615import Servant.Docs

1716import Servant.Server

17+import Servant.Utils.BaseUrl

1818import Servant.Utils.Client

1919

2020-- | Endpoint for PUT requests.

src/Servant/Client.hs+1−1

@@ -12,7 +12,7 @@ import Network.HTTP.Types

1212import Network.URI

1313import System.IO.Unsafe

1414

15−import Servant.Client.BaseUrl

15+import Servant.Utils.BaseUrl

1616

1717-- * Accessing APIs as a Client

1818

src/Servant/Client/BaseUrl.hs → src/Servant/Utils/BaseUrl.hsrenamed+1−1

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

11{-# LANGUAGE DeriveGeneric #-}

22{-# LANGUAGE ViewPatterns #-}

3−module Servant.Client.BaseUrl where

3+module Servant.Utils.BaseUrl where

55import Data.List

66import GHC.Generics

src/Servant/Utils/Client.hs+1−1

@@ -14,7 +14,7 @@ import Data.ByteString.Lazy

1414import Data.String.Conversions

1515import Network.HTTP.Types

1616import Servant.Client

17−import Servant.Client.BaseUrl

17+import Servant.Utils.BaseUrl

1818

1919import qualified Network.HTTP.Client as Client

2020

test/Servant/Client/BaseUrlSpec.hs+1−1

@@ -6,7 +6,7 @@ import Control.DeepSeq

66import Test.Hspec

77import Test.QuickCheck

9−import Servant.Client.BaseUrl

9+import Servant.Utils.BaseUrl

1010

1111spec :: Spec

1212spec = do

test/Servant/ClientSpec.hs+1−1

@@ -21,8 +21,8 @@ import Test.QuickCheck

2121

2222import Servant.API

2323import Servant.Client

24−import Servant.Client.BaseUrl

2524import Servant.Server

25+import Servant.Utils.BaseUrl

2626

2727import Servant.ServerSpec

2828