165022a · typeable/servant

git.iko.soy/typeable/servant

module refactoring: putting some things in Servant.Common

commit165022a5548b02f4de937cf5f6ae773ca1cf3127 authorSönke Hahn <soenke.hahn@zalora.com> dateFri 7 Nov 2014, 18:57 (12 years ago) parent1cd3503

17 files changed+30−30

compare with master

unifiedsplit

example/greet.hs+1−1 servant.cabal+3−3 src/Servant.hs+4−4 src/Servant/API/Capture.hs+2−2 src/Servant/API/Delete.hs+2−2 src/Servant/API/Get.hs+2−2 src/Servant/API/Post.hs+2−2 src/Servant/API/Put.hs+2−2 src/Servant/API/QueryParam.hs+2−2 src/Servant/API/ReqBody.hs+1−1 src/Servant/API/Sub.hs+1−1 src/Servant/Client.hs+1−1 src/Servant/Utils/BaseUrl.hs → src/Servant/Common/BaseUrl.hs+1−1 src/Servant/Utils/Req.hs → src/Servant/Common/Req.hs+2−2 src/Servant/Utils/Text.hs → src/Servant/Common/Text.hs+1−1 test/Servant/ClientSpec.hs+1−1 test/Servant/Client/BaseUrlSpec.hs → test/Servant/Common/BaseUrlSpec.hs+2−2

example/greet.hs+1−1

@@ -22,7 +22,7 @@ import Servant.API

2222import Servant.Client

2323import Servant.Docs

2424import Servant.Server

25−import Servant.Utils.BaseUrl

25+import Servant.Common.BaseUrl

2626

2727-- * Example

2828

servant.cabal+3−3

@@ -26,13 +26,13 @@ library

2626 Servant.API.ReqBody

2727 Servant.API.Sub

2828 Servant.Client

29+ Servant.Common.BaseUrl

30+ Servant.Common.Req

31+ Servant.Common.Text

2932 Servant.Docs

3033 Servant.Server

3134 Servant.Utils.ApiQuasiQuoting

32− Servant.Utils.BaseUrl

3335 Servant.Utils.Links

34− Servant.Utils.Req

35− Servant.Utils.Text

3636 build-depends:

3737 base >=4.7 && <5

3838 , either

src/Servant.hs+4−4

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

77 module Servant.Server,

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

99 module Servant.Client,

10− module Servant.Utils.BaseUrl,

10+ module Servant.Common.BaseUrl,

1111 -- | For generating documentation for servant APIs.

1212 module Servant.Docs,

1313 -- | Helper module

14− module Servant.Utils.Text,

14+ module Servant.Common.Text,

1515 ) where

1616

1717import Servant.API

1818import Servant.Client

19+import Servant.Common.BaseUrl

20+import Servant.Common.Text

1921import Servant.Docs

2022import Servant.Server

21−import Servant.Utils.BaseUrl

22−import Servant.Utils.Text

src/Servant/API/Capture.hs+2−2

@@ -12,10 +12,10 @@ import GHC.TypeLits

1212import Network.Wai

1313import Servant.API.Sub

1414import Servant.Client

15+import Servant.Common.Req

16+import Servant.Common.Text

1517import Servant.Docs

1618import Servant.Server

17−import Servant.Utils.Req

18−import Servant.Utils.Text

1919

2020-- * Captures

2121data Capture sym a

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

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

1111import Network.HTTP.Types

1212import Network.Wai

1313import Servant.Client

14+import Servant.Common.BaseUrl

15+import Servant.Common.Req

1416import Servant.Docs

1517import Servant.Server

16−import Servant.Utils.BaseUrl

17−import Servant.Utils.Req

1818

1919-- | Endpoint for DELETE requests.

2020data Delete

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

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

1212import Network.HTTP.Types

1313import Network.Wai

1414import Servant.Client

15+import Servant.Common.BaseUrl

16+import Servant.Common.Req

1517import Servant.Docs

1618import Servant.Server

17−import Servant.Utils.BaseUrl

18−import Servant.Utils.Req

1919

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

2121-- and serves the contained type as JSON.

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

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

1212import Network.HTTP.Types

1313import Network.Wai

1414import Servant.Client

15+import Servant.Common.BaseUrl

16+import Servant.Common.Req

1517import Servant.Docs

1618import Servant.Server

17−import Servant.Utils.BaseUrl

18−import Servant.Utils.Req

1919

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

2121-- response body (not the request body, use 'Servant.API.RQBody.RQBody' for

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

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

1212import Network.HTTP.Types

1313import Network.Wai

1414import Servant.Client

15+import Servant.Common.BaseUrl

16+import Servant.Common.Req

1517import Servant.Docs

1618import Servant.Server

17−import Servant.Utils.BaseUrl

18−import Servant.Utils.Req

1919

2020-- | Endpoint for PUT requests.

2121data Put a

src/Servant/API/QueryParam.hs+2−2

@@ -16,10 +16,10 @@ import Network.HTTP.Types

1616import Network.Wai

1717import Servant.API.Sub

1818import Servant.Client

19+import Servant.Common.Req

20+import Servant.Common.Text

1921import Servant.Docs

2022import Servant.Server

21−import Servant.Utils.Req

22−import Servant.Utils.Text

2323

2424-- * Single query string parameter lookup

2525

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

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

1111import Network.Wai

1212import Servant.API.Sub

1313import Servant.Client

14+import Servant.Common.Req

1415import Servant.Docs

1516import Servant.Server

16−import Servant.Utils.Req

1717

1818-- * Request Body support

1919data ReqBody a

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

@@ -9,9 +9,9 @@ import Data.String.Conversions

99import GHC.TypeLits

1010import Network.Wai

1111import Servant.Client

12+import Servant.Common.Req

1213import Servant.Docs

1314import Servant.Server

14−import Servant.Utils.Req

1515

1616-- | The contained API (second argument) can be found under @("/" ++ path)@

1717-- (path being the first argument).

src/Servant/Client.hs+1−1

@@ -4,7 +4,7 @@ module Servant.Client where

55import Data.Proxy

7−import Servant.Utils.Req

7+import Servant.Common.Req

99-- * Accessing APIs as a Client

1010

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

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

11{-# LANGUAGE DeriveGeneric #-}

22{-# LANGUAGE ViewPatterns #-}

3−module Servant.Utils.BaseUrl where

3+module Servant.Common.BaseUrl where

55import Data.List

66import GHC.Generics

src/Servant/Utils/Req.hs → src/Servant/Common/Req.hsrenamed+2−2

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

11{-# LANGUAGE OverloadedStrings #-}

22{-# LANGUAGE ScopedTypeVariables #-}

3−module Servant.Utils.Req where

3+module Servant.Common.Req where

55import Control.Applicative

66import Control.Concurrent

@@ -19,7 +19,7 @@ import Data.Text

1919import Network.HTTP.Client

2020import Network.HTTP.Types

2121import Network.URI

22−import Servant.Utils.BaseUrl

22+import Servant.Common.BaseUrl

2323import System.IO.Unsafe

2424

2525import qualified Network.HTTP.Client as Client

src/Servant/Utils/Text.hs → src/Servant/Common/Text.hsrenamed+1−1

@@ -1,7 +1,7 @@

11{-# LANGUAGE FlexibleInstances #-}

22{-# LANGUAGE OverloadedStrings #-}

33{-# LANGUAGE TypeSynonymInstances #-}

4−module Servant.Utils.Text where

4+module Servant.Common.Text where

66import Data.String.Conversions

77import Data.Int

test/Servant/ClientSpec.hs+1−1

@@ -22,7 +22,7 @@ import Test.QuickCheck

2222import Servant.API

2323import Servant.Client

2424import Servant.Server

25−import Servant.Utils.BaseUrl

25+import Servant.Common.BaseUrl

2626

2727import Servant.ServerSpec

2828

test/Servant/Client/BaseUrlSpec.hs → test/Servant/Common/BaseUrlSpec.hsrenamed+2−2

@@ -1,12 +1,12 @@

11{-# OPTIONS_GHC -fno-warn-orphans #-}

2−module Servant.Client.BaseUrlSpec where

2+module Servant.Common.BaseUrlSpec where

44import Control.Applicative

55import Control.DeepSeq

66import Test.Hspec

77import Test.QuickCheck

9−import Servant.Utils.BaseUrl

9+import Servant.Common.BaseUrl

1010

1111spec :: Spec

1212spec = do