git.iko.soy/servant
on master help sign in
moved S.Client.BaseUrl to S.Utils.BaseUrl
8e72c70Sönke Hahn
example/greet.hs+1−1
compare with master
unifiedsplit
@@ -20,9 +20,9 @@ import Network.Wai.Handler.Warp
20
20
21import Servant.API
21import Servant.API
22import Servant.Client
22import Servant.Client
23−import Servant.Client.BaseUrl
24import Servant.Docs
23import Servant.Docs
25import Servant.Server
24import Servant.Server
25+import Servant.Utils.BaseUrl
26
26
27-- * Example
27-- * Example
28
28
servant.cabal+7−7
@@ -14,23 +14,23 @@ cabal-version: >=1.10
14library
14library
15 exposed-modules:
15 exposed-modules:
16 Servant
16 Servant
17− Servant.Client
18− Servant.Client.BaseUrl
19− Servant.Docs
20− Servant.Server
21 Servant.API
17 Servant.API
18+ Servant.API.Alternative
22 Servant.API.Capture
19 Servant.API.Capture
23 Servant.API.Delete
20 Servant.API.Delete
24 Servant.API.Elem
21 Servant.API.Elem
25 Servant.API.Get
22 Servant.API.Get
26 Servant.API.Post
23 Servant.API.Post
27 Servant.API.Put
24 Servant.API.Put
28− Servant.API.QueryParam
29− Servant.API.ReqBody
30 Servant.API.QQ
25 Servant.API.QQ
26+ Servant.API.QueryParam
31 Servant.API.Raw
27 Servant.API.Raw
28+ Servant.API.ReqBody
32 Servant.API.Sub
29 Servant.API.Sub
33− Servant.API.Alternative
30+ Servant.Client
31+ Servant.Docs
32+ Servant.Server
33+ Servant.Utils.BaseUrl
34 Servant.Utils.Client
34 Servant.Utils.Client
35 Servant.Utils.Text
35 Servant.Utils.Text
36 build-depends:
36 build-depends:
src/Servant.hs+2−2
@@ -7,7 +7,7 @@ module Servant (
7 module Servant.Server,
7 module Servant.Server,
8 -- | For accessing servant APIs as API clients.
8 -- | For accessing servant APIs as API clients.
9 module Servant.Client,
9 module Servant.Client,
10− module Servant.Client.BaseUrl,
10+ module Servant.Utils.BaseUrl,
11 -- | For generating documentation for servant APIs.
11 -- | For generating documentation for servant APIs.
12 module Servant.Docs,
12 module Servant.Docs,
13 -- | Helper module
13 -- | Helper module
@@ -16,7 +16,7 @@ module Servant (
16
16
17import Servant.API
17import Servant.API
18import Servant.Client
18import Servant.Client
19−import Servant.Client.BaseUrl
20import Servant.Docs
19import Servant.Docs
21import Servant.Server
20import Servant.Server
21+import Servant.Utils.BaseUrl
22import Servant.Utils.Text
22import Servant.Utils.Text
src/Servant/API/Delete.hs+1−1
@@ -11,9 +11,9 @@ import Data.Typeable
11import Network.HTTP.Types
11import Network.HTTP.Types
12import Network.Wai
12import Network.Wai
13import Servant.Client
13import Servant.Client
14−import Servant.Client.BaseUrl
15import Servant.Docs
14import Servant.Docs
16import Servant.Server
15import Servant.Server
16+import Servant.Utils.BaseUrl
17import Servant.Utils.Client
17import Servant.Utils.Client
18
18
19-- | Endpoint for DELETE requests.
19-- | Endpoint for DELETE requests.
src/Servant/API/Get.hs+1−1
@@ -12,9 +12,9 @@ import Data.Typeable
12import Network.HTTP.Types
12import Network.HTTP.Types
13import Network.Wai
13import Network.Wai
14import Servant.Client
14import Servant.Client
15−import Servant.Client.BaseUrl
16import Servant.Docs
15import Servant.Docs
17import Servant.Server
16import Servant.Server
17+import Servant.Utils.BaseUrl
18import Servant.Utils.Client
18import Servant.Utils.Client
19
19
20-- | Endpoint for simple GET requests. The server doesn't receive any arguments
20-- | 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
12import Network.HTTP.Types
12import Network.HTTP.Types
13import Network.Wai
13import Network.Wai
14import Servant.Client
14import Servant.Client
15−import Servant.Client.BaseUrl
16import Servant.Docs
15import Servant.Docs
17import Servant.Server
16import Servant.Server
17+import Servant.Utils.BaseUrl
18import Servant.Utils.Client
18import Servant.Utils.Client
19
19
20-- | Endpoint for POST requests. The type variable represents the type of the
20-- | 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
12import Network.HTTP.Types
12import Network.HTTP.Types
13import Network.Wai
13import Network.Wai
14import Servant.Client
14import Servant.Client
15−import Servant.Client.BaseUrl
16import Servant.Docs
15import Servant.Docs
17import Servant.Server
16import Servant.Server
17+import Servant.Utils.BaseUrl
18import Servant.Utils.Client
18import Servant.Utils.Client
19
19
20-- | Endpoint for PUT requests.
20-- | Endpoint for PUT requests.
src/Servant/Client.hs+1−1
@@ -12,7 +12,7 @@ import Network.HTTP.Types
12import Network.URI
12import Network.URI
13import System.IO.Unsafe
13import System.IO.Unsafe
14
14
15−import Servant.Client.BaseUrl
15+import Servant.Utils.BaseUrl
16
16
17-- * Accessing APIs as a Client
17-- * Accessing APIs as a Client
18
18
src/Servant/Client/BaseUrl.hs → src/Servant/Utils/BaseUrl.hsrenamed+1−1
@@ -1,6 +1,6 @@
1{-# LANGUAGE DeriveGeneric #-}
1{-# LANGUAGE DeriveGeneric #-}
2{-# LANGUAGE ViewPatterns #-}
2{-# LANGUAGE ViewPatterns #-}
3−module Servant.Client.BaseUrl where
3+module Servant.Utils.BaseUrl where
4
4
5import Data.List
5import Data.List
6import GHC.Generics
6import GHC.Generics
src/Servant/Utils/Client.hs+1−1
@@ -14,7 +14,7 @@ import Data.ByteString.Lazy
14import Data.String.Conversions
14import Data.String.Conversions
15import Network.HTTP.Types
15import Network.HTTP.Types
16import Servant.Client
16import Servant.Client
17−import Servant.Client.BaseUrl
17+import Servant.Utils.BaseUrl
18
18
19import qualified Network.HTTP.Client as Client
19import qualified Network.HTTP.Client as Client
20
20
test/Servant/Client/BaseUrlSpec.hs+1−1
@@ -6,7 +6,7 @@ import Control.DeepSeq
6import Test.Hspec
6import Test.Hspec
7import Test.QuickCheck
7import Test.QuickCheck
8
8
9−import Servant.Client.BaseUrl
9+import Servant.Utils.BaseUrl
10
10
11spec :: Spec
11spec :: Spec
12spec = do
12spec = do
test/Servant/ClientSpec.hs+1−1
@@ -21,8 +21,8 @@ import Test.QuickCheck
21
21
22import Servant.API
22import Servant.API
23import Servant.Client
23import Servant.Client
24−import Servant.Client.BaseUrl
25import Servant.Server
24import Servant.Server
25+import Servant.Utils.BaseUrl
26
26
27import Servant.ServerSpec
27import Servant.ServerSpec
28
28