git.iko.soy/typeable/servant
on master help sign in
Adopt http-types-0.10
6ff70e2Oleg Grenrus
servant-server/servant-server.cabal+1−2
compare with master
unifiedsplit
@@ -1,6 +1,5 @@
1name: servant-server
1name: servant-server
2−version: 0.11
2+version: 0.11.0.1
3−x-revision: 2
4synopsis: A family of combinators for defining webservices APIs and serving them
3synopsis: A family of combinators for defining webservices APIs and serving them
5description:
4description:
6 A family of combinators for defining webservices APIs and serving them
5 A family of combinators for defining webservices APIs and serving them
servant-server/test/Servant/ServerSpec.hs+11−2
@@ -28,7 +28,11 @@ import Network.HTTP.Types (Status (..), hAccept, hContentType,
28 methodDelete, methodGet,
28 methodDelete, methodGet,
29 methodHead, methodPatch,
29 methodHead, methodPatch,
30 methodPost, methodPut, ok200,
30 methodPost, methodPut, ok200,
31+#if MIN_VERSION_http_types(0,10,0)
32+ imATeapot418,
33+#else
31 imATeaPot418,
34 imATeaPot418,
35+#endif
32 parseQuery)
36 parseQuery)
33import Network.Wai (Application, Request, requestHeaders, pathInfo,
37import Network.Wai (Application, Request, requestHeaders, pathInfo,
34 queryString, rawQueryString,
38 queryString, rawQueryString,
@@ -65,6 +69,11 @@ import Servant.Server.Experimental.Auth
65import Servant.Server.Internal.Context
69import Servant.Server.Internal.Context
66 (NamedContext(..))
70 (NamedContext(..))
67
71
72+#if !MIN_VERSION_http_types(0,10,0)
73+imATeapot418 :: Status
74+imATeapot418 = imATeaPot418
75+#endif
76+
68-- * comprehensive api test
77-- * comprehensive api test
69
78
70-- This declaration simply checks that all instances are in place.
79-- This declaration simply checks that all instances are in place.
@@ -657,7 +666,7 @@ basicAuthApi = Proxy
657basicAuthServer :: Server BasicAuthAPI
666basicAuthServer :: Server BasicAuthAPI
658basicAuthServer =
667basicAuthServer =
659 const (return jerry) :<|>
668 const (return jerry) :<|>
660− (Tagged $ \ _ respond -> respond $ responseLBS imATeaPot418 [] "")
669+ (Tagged $ \ _ respond -> respond $ responseLBS imATeapot418 [] "")
661
670
662basicAuthContext :: Context '[ BasicAuthCheck () ]
671basicAuthContext :: Context '[ BasicAuthCheck () ]
663basicAuthContext =
672basicAuthContext =
@@ -702,7 +711,7 @@ genAuthApi = Proxy
702
711
703genAuthServer :: Server GenAuthAPI
712genAuthServer :: Server GenAuthAPI
704genAuthServer = const (return tweety)
713genAuthServer = const (return tweety)
705− :<|> (Tagged $ \ _ respond -> respond $ responseLBS imATeaPot418 [] "")
714+ :<|> (Tagged $ \ _ respond -> respond $ responseLBS imATeapot418 [] "")
706
715
707type instance AuthServerData (AuthProtect "auth") = ()
716type instance AuthServerData (AuthProtect "auth") = ()
708
717