master...05d975c · typeable/servant

.travis.yml+1

since splitsnapshots

unifiedsplit

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

15branches:

16 only:

17 - master

18+ - release-0.16

18

19

19cache:

20cache:

20 directories:

21 directories:

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

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

1cabal-version: >=1.10

2name: servant-client-core

3version: 0.16

4+x-revision: 1

4

5

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

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

6category: Servant, Web

7category: Servant, Web

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

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

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

78 , exceptions >= 0.10.0 && < 0.11

79 , exceptions >= 0.10.0 && < 0.11

79 , free >= 5.1 && < 5.2

80 , free >= 5.1 && < 5.2

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

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

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

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

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

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

83 , safe >= 0.3.17 && < 0.4

84 , safe >= 0.3.17 && < 0.4

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

105 build-depends:

106 build-depends:

106 deepseq >= 1.4.2.0 && < 1.5

107 deepseq >= 1.4.2.0 && < 1.5

107 , hspec >= 2.6.0 && < 2.8

108 , hspec >= 2.6.0 && < 2.8

108− , QuickCheck >= 2.12.6.1 && < 2.13

109+ , QuickCheck >= 2.12.6.1 && < 2.14

109

110

110 build-tool-depends:

111 build-tool-depends:

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

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

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

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

45 , exceptions >=0.8 && <0.11

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

47 , 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

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

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

51 , mtl >=2.2.2 && <2.3

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

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

1cabal-version: >=1.10

2name: servant-client

3version: 0.16

4+x-revision: 1

4

5

5synopsis: Automatic derivation of querying functions for servant

6synopsis: Automatic derivation of querying functions for servant

6category: Servant, Web

7category: Servant, Web

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

69 build-depends:

70 build-depends:

70 base-compat >= 0.10.5 && < 0.11

71 base-compat >= 0.10.5 && < 0.11

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

72 , 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

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

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

74 , exceptions >= 0.10.0 && < 0.11

75 , exceptions >= 0.10.0 && < 0.11

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

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

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

118 , hspec >= 2.6.0 && < 2.8

119 , hspec >= 2.6.0 && < 2.8

119 , HUnit >= 1.6.0.0 && < 1.7

120 , HUnit >= 1.6.0.0 && < 1.7

120 , network >= 2.8.0.0 && < 3.1

121 , network >= 2.8.0.0 && < 3.1

121− , QuickCheck >= 2.12.6.1 && < 2.13

122+ , QuickCheck >= 2.12.6.1 && < 2.14

122 , servant == 0.16.*

123 , servant == 0.16.*

123 , servant-server == 0.16.*

124 , servant-server == 0.16.*

124 , tdigest >= 0.2 && < 0.3

125 , tdigest >= 0.2 && < 0.3

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

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

1cabal-version: >=1.10

2name: servant-docs

3version: 0.11.3

4−x-revision: 1

4+x-revision: 2

5

6synopsis: generate API docs for your servant webservice

7category: Servant, Web

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

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

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

65 , 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

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

68 , lens >= 4.17 && < 4.18

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

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

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

1cabal-version: >=1.10

2name: servant-http-streams

3version: 0.16

4+x-revision: 1

4

5

5synopsis: Automatic derivation of querying functions for servant

6synopsis: Automatic derivation of querying functions for servant

6category: Servant, Web

7category: Servant, Web

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

67 base-compat >= 0.10.5 && < 0.11

68 base-compat >= 0.10.5 && < 0.11

68 , case-insensitive

69 , case-insensitive

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

70 , 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

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

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

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

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

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

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

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

119 , hspec >= 2.6.0 && < 2.8

120 , hspec >= 2.6.0 && < 2.8

120 , HUnit >= 1.6.0.0 && < 1.7

121 , HUnit >= 1.6.0.0 && < 1.7

121 , network >= 2.8.0.0 && < 3.1

122 , network >= 2.8.0.0 && < 3.1

122− , QuickCheck >= 2.12.6.1 && < 2.13

123+ , QuickCheck >= 2.12.6.1 && < 2.14

123 , servant == 0.16.*

124 , servant == 0.16.*

124 , servant-server == 0.16.*

125 , servant-server == 0.16.*

125 , tdigest >= 0.2 && < 0.3

126 , tdigest >= 0.2 && < 0.3

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

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

1cabal-version: >=1.10

2name: servant-server

3version: 0.16

4+x-revision: 1

4

5

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

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

6category: Servant, Web

7category: Servant, Web

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

88 base-compat >= 0.10.5 && < 0.11

89 base-compat >= 0.10.5 && < 0.11

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

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

90 , exceptions >= 0.10.0 && < 0.11

91 , exceptions >= 0.10.0 && < 0.11

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

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

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

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

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

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

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

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

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

165 , directory >= 1.3.0.0 && < 1.4

166 , directory >= 1.3.0.0 && < 1.4

166 , hspec >= 2.6.0 && < 2.8

167 , hspec >= 2.6.0 && < 2.8

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

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

168− , QuickCheck >= 2.12.6.1 && < 2.13

169+ , QuickCheck >= 2.12.6.1 && < 2.14

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

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

170 , temporary >= 1.3 && < 1.4

171 , temporary >= 1.3 && < 1.4

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

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

servant/servant.cabal+5−3

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

1cabal-version: >=1.10

2name: servant

3version: 0.16

4+x-revision: 1

4

5

5synopsis: A family of combinators for defining webservices APIs

6synopsis: A family of combinators for defining webservices APIs

6category: Servant, Web

7category: Servant, Web

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

110 , bifunctors >= 5.5.3 && < 5.6

111 , bifunctors >= 5.5.3 && < 5.6

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

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

112 , deepseq >= 1.4.2.0 && < 1.5

113 , 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

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

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

115 , mmorph >= 1.1.2 && < 1.2

116 , mmorph >= 1.1.2 && < 1.2

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

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

117− , QuickCheck >= 2.12.6.1 && <2.13

118+ , QuickCheck >= 2.12.6.1 && < 2.14

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

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

119 , tagged >= 0.8.6 && < 0.9

120 , tagged >= 0.8.6 && < 0.9

120 , vault >= 0.3.1.2 && < 0.4

121 , vault >= 0.3.1.2 && < 0.4

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

161 , base-compat

162 , base-compat

162 , aeson

163 , aeson

163 , bytestring

164 , bytestring

165+ , http-media

164 , mtl

166 , mtl

165 , servant

167 , servant

166 , string-conversions

168 , string-conversions

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

170 -- Additonal dependencies

172 -- Additonal dependencies

171 build-depends:

173 build-depends:

172 hspec >= 2.6.0 && < 2.8

174 hspec >= 2.6.0 && < 2.8

173− , QuickCheck >= 2.12.6.1 && < 2.13

175+ , QuickCheck >= 2.12.6.1 && < 2.14

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

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

175

177

176 build-tool-depends:

178 build-tool-depends:

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

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

1+{-# LANGUAGE CPP #-}

1{-# LANGUAGE DataKinds #-}

2{-# LANGUAGE DataKinds #-}

2{-# LANGUAGE DeriveGeneric #-}

3{-# LANGUAGE DeriveGeneric #-}

3{-# LANGUAGE MultiParamTypeClasses #-}

4{-# LANGUAGE MultiParamTypeClasses #-}

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

20import Data.Function

21import Data.Function

21 (on)

22 (on)

22import Data.List

23import Data.List

23− (maximumBy)

24+ (sortBy)

24import qualified Data.List.NonEmpty as NE

25import qualified Data.List.NonEmpty as NE

25import Data.Maybe

26import Data.Maybe

26 (fromJust, isJust, isNothing)

27 (fromJust, isJust, isNothing)

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

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

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

135

136

136 it "respects the Accept spec ordering" $ do

137 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

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

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

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

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

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

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

141 ]

149 ]

150+#endif

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

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

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

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

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

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

154+ ""

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

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

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

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

157+ property $ \a b c i ->

158+ let acc = acceptH a b c

159+ in counterexample (show acc) $

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

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

148

161

149 describe "handleCTypeH" $ do

162 describe "handleCTypeH" $ do

150

163