165022a · servant · git.iko.soy

example/greet.hs+1−1

compare with master

unifiedsplit

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

22import Servant.Client

23import Servant.Docs

24import Servant.Server

25−import Servant.Utils.BaseUrl

25+import Servant.Common.BaseUrl

26

27-- * Example

28

servant.cabal+3−3

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

26 Servant.API.ReqBody

27 Servant.API.Sub

28 Servant.Client

29+ Servant.Common.BaseUrl

30+ Servant.Common.Req

31+ Servant.Common.Text

29 Servant.Docs

32 Servant.Docs

30 Servant.Server

33 Servant.Server

31 Servant.Utils.ApiQuasiQuoting

34 Servant.Utils.ApiQuasiQuoting

32− Servant.Utils.BaseUrl

33 Servant.Utils.Links

35 Servant.Utils.Links

34− Servant.Utils.Req

35− Servant.Utils.Text

36 build-depends:

37 base >=4.7 && <5

38 , either

src/Servant.hs+4−4

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

7 module Servant.Server,

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

9 module Servant.Client,

10− module Servant.Utils.BaseUrl,

10+ module Servant.Common.BaseUrl,

11 -- | For generating documentation for servant APIs.

12 module Servant.Docs,

13 -- | Helper module

14− module Servant.Utils.Text,

14+ module Servant.Common.Text,

15 ) where

16

17import Servant.API

18import Servant.Client

19+import Servant.Common.BaseUrl

20+import Servant.Common.Text

19import Servant.Docs

21import Servant.Docs

20import Servant.Server

22import 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

12import Network.Wai

13import Servant.API.Sub

14import Servant.Client

15+import Servant.Common.Req

16+import Servant.Common.Text

15import Servant.Docs

17import Servant.Docs

16import Servant.Server

18import Servant.Server

17−import Servant.Utils.Req

18−import Servant.Utils.Text

19

20-- * Captures

21data Capture sym a

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

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

11import Network.HTTP.Types

12import Network.Wai

13import Servant.Client

14+import Servant.Common.BaseUrl

15+import Servant.Common.Req

14import Servant.Docs

16import Servant.Docs

15import Servant.Server

17import Servant.Server

16−import Servant.Utils.BaseUrl

17−import Servant.Utils.Req

18

19-- | Endpoint for DELETE requests.

20data Delete

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

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

12import Network.HTTP.Types

13import Network.Wai

14import Servant.Client

15+import Servant.Common.BaseUrl

16+import Servant.Common.Req

15import Servant.Docs

17import Servant.Docs

16import Servant.Server

18import Servant.Server

17−import Servant.Utils.BaseUrl

18−import Servant.Utils.Req

19

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

21-- and serves the contained type as JSON.

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

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

12import Network.HTTP.Types

13import Network.Wai

14import Servant.Client

15+import Servant.Common.BaseUrl

16+import Servant.Common.Req

15import Servant.Docs

17import Servant.Docs

16import Servant.Server

18import Servant.Server

17−import Servant.Utils.BaseUrl

18−import Servant.Utils.Req

19

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

21-- 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

12import Network.HTTP.Types

13import Network.Wai

14import Servant.Client

15+import Servant.Common.BaseUrl

16+import Servant.Common.Req

15import Servant.Docs

17import Servant.Docs

16import Servant.Server

18import Servant.Server

17−import Servant.Utils.BaseUrl

18−import Servant.Utils.Req

19

20-- | Endpoint for PUT requests.

21data Put a

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

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

16import Network.Wai

17import Servant.API.Sub

18import Servant.Client

19+import Servant.Common.Req

20+import Servant.Common.Text

19import Servant.Docs

21import Servant.Docs

20import Servant.Server

22import Servant.Server

21−import Servant.Utils.Req

22−import Servant.Utils.Text

23

24-- * Single query string parameter lookup

25

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

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

11import Network.Wai

12import Servant.API.Sub

13import Servant.Client

14+import Servant.Common.Req

14import Servant.Docs

15import Servant.Docs

15import Servant.Server

16import Servant.Server

16−import Servant.Utils.Req

17

18-- * Request Body support

19data ReqBody a

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

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

9import GHC.TypeLits

10import Network.Wai

11import Servant.Client

12+import Servant.Common.Req

12import Servant.Docs

13import Servant.Docs

13import Servant.Server

14import Servant.Server

14−import Servant.Utils.Req

15

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

17-- (path being the first argument).

src/Servant/Client.hs+1−1

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

4

5import Data.Proxy

6

7−import Servant.Utils.Req

7+import Servant.Common.Req

8

9-- * Accessing APIs as a Client

10

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

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

1{-# LANGUAGE DeriveGeneric #-}

2{-# LANGUAGE ViewPatterns #-}

3−module Servant.Utils.BaseUrl where

3+module Servant.Common.BaseUrl where

4

5import Data.List

6import GHC.Generics

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

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

1{-# LANGUAGE OverloadedStrings #-}

2{-# LANGUAGE ScopedTypeVariables #-}

3−module Servant.Utils.Req where

3+module Servant.Common.Req where

4

5import Control.Applicative

6import Control.Concurrent

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

19import Network.HTTP.Client

20import Network.HTTP.Types

21import Network.URI

22−import Servant.Utils.BaseUrl

22+import Servant.Common.BaseUrl

23import System.IO.Unsafe

24

25import qualified Network.HTTP.Client as Client

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

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

1{-# LANGUAGE FlexibleInstances #-}

2{-# LANGUAGE OverloadedStrings #-}

3{-# LANGUAGE TypeSynonymInstances #-}

4−module Servant.Utils.Text where

4+module Servant.Common.Text where

5

6import Data.String.Conversions

7import Data.Int

test/Servant/ClientSpec.hs+1−1

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

22import Servant.API

23import Servant.Client

24import Servant.Server

25−import Servant.Utils.BaseUrl

25+import Servant.Common.BaseUrl

26

27import Servant.ServerSpec

28

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

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

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

2−module Servant.Client.BaseUrlSpec where

2+module Servant.Common.BaseUrlSpec where

3

4import Control.Applicative

5import Control.DeepSeq

6import Test.Hspec

7import Test.QuickCheck

8

9−import Servant.Utils.BaseUrl

9+import Servant.Common.BaseUrl

10

11spec :: Spec

12spec = do