master...05d975c · typeable/servant

git.iko.soy/typeable/servant

9 files changed+39−19

since splitsnapshots

unifiedsplit

.travis.yml+1 servant-client-core/servant-client-core.cabal+3−2 servant-client-ghcjs/servant-client-ghcjs.cabal+1−1 servant-client/servant-client.cabal+3−2 servant-docs/servant-docs.cabal+2−2 servant-http-streams/servant-http-streams.cabal+3−2 servant-server/servant-server.cabal+3−2 servant/servant.cabal+5−3 servant/test/Servant/API/ContentTypesSpec.hs+18−5

.travis.yml+1

@@ -15,6 +15,7 @@ git:

1515branches:

1616 only:

1717 - master

18+ - release-0.16

1819

1920cache:

2021 directories:

servant-client-core/servant-client-core.cabal+3−2

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

11cabal-version: >=1.10

22name: servant-client-core

33version: 0.16

4+x-revision: 1

56synopsis: Core functionality and class for client function generation for servant APIs

67category: Servant, Web

@@ -77,7 +78,7 @@ library

7778 , base64-bytestring >= 1.0.0.1 && < 1.1

7879 , exceptions >= 0.10.0 && < 0.11

7980 , free >= 5.1 && < 5.2

80− , http-media >= 0.7.1.3 && < 0.8

81+ , http-media >= 0.7.1.3 && < 0.9

8182 , http-types >= 0.12.2 && < 0.13

8283 , network-uri >= 2.6.1.0 && < 2.7

8384 , safe >= 0.3.17 && < 0.4

@@ -105,7 +106,7 @@ test-suite spec

105106 build-depends:

106107 deepseq >= 1.4.2.0 && < 1.5

107108 , hspec >= 2.6.0 && < 2.8

108− , QuickCheck >= 2.12.6.1 && < 2.13

109+ , QuickCheck >= 2.12.6.1 && < 2.14

109110

110111 build-tool-depends:

111112 hspec-discover:hspec-discover >= 2.6.0 && <2.8

servant-client-ghcjs/servant-client-ghcjs.cabal+1−1

@@ -45,7 +45,7 @@ library

4545 , exceptions >=0.8 && <0.11

4646 , ghcjs-base >=0.2.0.0 && <0.3.0.0

4747 , ghcjs-prim >=0.1.0.0 && <0.2.0.0

48− , http-media >=0.6.2 && <0.8

48+ , http-media >=0.6.2 && <0.9

4949 , http-types >=0.12 && <0.13

5050 , monad-control >=1.0.0.4 && <1.1

5151 , mtl >=2.2.2 && <2.3

servant-client/servant-client.cabal+3−2

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

11cabal-version: >=1.10

22name: servant-client

33version: 0.16

4+x-revision: 1

56synopsis: Automatic derivation of querying functions for servant

67category: Servant, Web

@@ -69,7 +70,7 @@ library

6970 build-depends:

7071 base-compat >= 0.10.5 && < 0.11

7172 , http-client >= 0.5.13.1 && < 0.7

72− , http-media >= 0.7.1.3 && < 0.8

73+ , http-media >= 0.7.1.3 && < 0.9

7374 , http-types >= 0.12.2 && < 0.13

7475 , exceptions >= 0.10.0 && < 0.11

7576 , kan-extensions >= 5.2 && < 5.3

@@ -118,7 +119,7 @@ test-suite spec

118119 , hspec >= 2.6.0 && < 2.8

119120 , HUnit >= 1.6.0.0 && < 1.7

120121 , network >= 2.8.0.0 && < 3.1

121− , QuickCheck >= 2.12.6.1 && < 2.13

122+ , QuickCheck >= 2.12.6.1 && < 2.14

122123 , servant == 0.16.*

123124 , servant-server == 0.16.*

124125 , tdigest >= 0.2 && < 0.3

servant-docs/servant-docs.cabal+2−2

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

11cabal-version: >=1.10

22name: servant-docs

33version: 0.11.3

4−x-revision: 1

4+x-revision: 2

66synopsis: generate API docs for your servant webservice

77category: Servant, Web

@@ -63,7 +63,7 @@ library

6363 , case-insensitive >= 1.2.0.11 && < 1.3

6464 , control-monad-omega >= 0.3.1 && < 0.4

6565 , hashable >= 1.2.7.0 && < 1.3

66− , http-media >= 0.7.1.3 && < 0.8

66+ , http-media >= 0.7.1.3 && < 0.9

6767 , http-types >= 0.12.2 && < 0.13

6868 , lens >= 4.17 && < 4.18

6969 , string-conversions >= 0.4.0.1 && < 0.5

servant-http-streams/servant-http-streams.cabal+3−2

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

11cabal-version: >=1.10

22name: servant-http-streams

33version: 0.16

4+x-revision: 1

56synopsis: Automatic derivation of querying functions for servant

67category: Servant, Web

@@ -67,7 +68,7 @@ library

6768 base-compat >= 0.10.5 && < 0.11

6869 , case-insensitive

6970 , http-streams >= 0.8.6.1 && < 0.9

70− , http-media >= 0.7.1.3 && < 0.8

71+ , http-media >= 0.7.1.3 && < 0.9

7172 , io-streams >= 1.5.0.1 && < 1.6

7273 , http-types >= 0.12.2 && < 0.13

7374 , http-common >= 0.8.2.0 && < 0.9

@@ -119,7 +120,7 @@ test-suite spec

119120 , hspec >= 2.6.0 && < 2.8

120121 , HUnit >= 1.6.0.0 && < 1.7

121122 , network >= 2.8.0.0 && < 3.1

122− , QuickCheck >= 2.12.6.1 && < 2.13

123+ , QuickCheck >= 2.12.6.1 && < 2.14

123124 , servant == 0.16.*

124125 , servant-server == 0.16.*

125126 , tdigest >= 0.2 && < 0.3

servant-server/servant-server.cabal+3−2

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

11cabal-version: >=1.10

22name: servant-server

33version: 0.16

4+x-revision: 1

56synopsis: A family of combinators for defining webservices APIs and serving them

67category: Servant, Web

@@ -88,7 +89,7 @@ library

8889 base-compat >= 0.10.5 && < 0.11

8990 , base64-bytestring >= 1.0.0.1 && < 1.1

9091 , exceptions >= 0.10.0 && < 0.11

91− , http-media >= 0.7.1.3 && < 0.8

92+ , http-media >= 0.7.1.3 && < 0.9

9293 , http-types >= 0.12.2 && < 0.13

9394 , network-uri >= 2.6.1.0 && < 2.8

9495 , monad-control >= 1.0.2.3 && < 1.1

@@ -165,7 +166,7 @@ test-suite spec

165166 , directory >= 1.3.0.0 && < 1.4

166167 , hspec >= 2.6.0 && < 2.8

167168 , hspec-wai >= 0.9.0 && < 0.10

168− , QuickCheck >= 2.12.6.1 && < 2.13

169+ , QuickCheck >= 2.12.6.1 && < 2.14

169170 , should-not-typecheck >= 2.1.0 && < 2.2

170171 , temporary >= 1.3 && < 1.4

171172 , wai-extra >= 3.0.24.3 && < 3.1

servant/servant.cabal+5−3

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

11cabal-version: >=1.10

22name: servant

33version: 0.16

4+x-revision: 1

56synopsis: A family of combinators for defining webservices APIs

67category: Servant, Web

@@ -110,11 +111,11 @@ library

110111 , bifunctors >= 5.5.3 && < 5.6

111112 , case-insensitive >= 1.2.0.11 && < 1.3

112113 , deepseq >= 1.4.2.0 && < 1.5

113− , http-media >= 0.7.1.3 && < 0.8

114+ , http-media >= 0.7.1.3 && < 0.9

114115 , http-types >= 0.12.2 && < 0.13

115116 , mmorph >= 1.1.2 && < 1.2

116117 , network-uri >= 2.6.1.0 && < 2.7

117− , QuickCheck >= 2.12.6.1 && <2.13

118+ , QuickCheck >= 2.12.6.1 && < 2.14

118119 , string-conversions >= 0.4.0.1 && < 0.5

119120 , tagged >= 0.8.6 && < 0.9

120121 , vault >= 0.3.1.2 && < 0.4

@@ -161,6 +162,7 @@ test-suite spec

161162 , base-compat

162163 , aeson

163164 , bytestring

165+ , http-media

164166 , mtl

165167 , servant

166168 , string-conversions

@@ -170,7 +172,7 @@ test-suite spec

170172 -- Additonal dependencies

171173 build-depends:

172174 hspec >= 2.6.0 && < 2.8

173− , QuickCheck >= 2.12.6.1 && < 2.13

175+ , QuickCheck >= 2.12.6.1 && < 2.14

174176 , quickcheck-instances >= 0.3.19 && < 0.4

175177

176178 build-tool-depends:

servant/test/Servant/API/ContentTypesSpec.hs+18−5

@@ -1,3 +1,4 @@

1+{-# LANGUAGE CPP #-}

12{-# LANGUAGE DataKinds #-}

23{-# LANGUAGE DeriveGeneric #-}

34{-# LANGUAGE MultiParamTypeClasses #-}

@@ -20,7 +21,7 @@ import Data.Either

2021import Data.Function

2122 (on)

2223import Data.List

23− (maximumBy)

24+ (sortBy)

2425import qualified Data.List.NonEmpty as NE

2526import Data.Maybe

2627 (fromJust, isJust, isNothing)

@@ -134,17 +135,29 @@ spec = describe "Servant.API.ContentTypes" $ do

134135 == Just ("application/json;charset=utf-8", encode x)

135136

136137 it "respects the Accept spec ordering" $ do

137− let highest a b c = maximumBy (compare `on` snd)

138+ let highest a b c = last $ sortBy (compare `on` snd)

139+-- when qualities are same, http-media-0.8 picks first; 0.7 last.

140+#if MIN_VERSION_http_media(0,8,0)

141+ [ ("text/plain;charset=utf-8", c)

142+ , ("application/json;charset=utf-8", b)

143+ , ("application/octet-stream", a)

144+ ]

145+#else

138146 [ ("application/octet-stream", a)

139147 , ("application/json;charset=utf-8", b)

140148 , ("text/plain;charset=utf-8", c)

141149 ]

150+#endif

142151 let acceptH a b c = addToAccept (Proxy :: Proxy OctetStream) a $

143− addToAccept (Proxy :: Proxy JSON) b $

144− addToAccept (Proxy :: Proxy PlainText ) c ""

152+ addToAccept (Proxy :: Proxy JSON) b $

153+ addToAccept (Proxy :: Proxy PlainText ) c $

154+ ""

145155 let val a b c i = handleAcceptH (Proxy :: Proxy '[OctetStream, JSON, PlainText])

146156 (acceptH a b c) (i :: Int)

147− property $ \a b c i -> fst (fromJust $ val a b c i) == fst (highest a b c)

157+ property $ \a b c i ->

158+ let acc = acceptH a b c

159+ in counterexample (show acc) $

160+ fst (fromJust $ val a b c i) === fst (highest a b c)

148161

149162 describe "handleCTypeH" $ do

150163