master..c5548bf · typeable/req

git.iko.soy/typeable/req

on c5548bf help sign in

.github/workflows/ci.yaml+15−14

since splitsnapshots

unifiedsplit

@@ -11,25 +11,27 @@ jobs:

11 ormolu:

12 runs-on: ubuntu-latest

13 steps:

14− - uses: actions/checkout@v4

14+ - uses: actions/checkout@v3

15− - uses: haskell-actions/run-ormolu@v17

15+ - uses: haskell-actions/run-ormolu@v12

16 build:

17 runs-on: ubuntu-latest

18 needs: ormolu

19 strategy:

20 matrix:

21− cabal: ["3.12"]

21+ cabal: ["3.10"]

22− ghc: ["9.6.3", "9.8.2", "9.10.1"]

22+ ghc: ["9.2.7", "9.4.4", "9.6.1"]

23+ env:

24+ CONFIG: "--enable-tests --enable-benchmarks --flags=dev"

23 steps:

25 steps:

24− - uses: actions/checkout@v4

26+ - uses: actions/checkout@v3

25− - uses: haskell-actions/setup@v2

27+ - uses: haskell/actions/setup@v2

26 id: setup-haskell-cabal

28 id: setup-haskell-cabal

27 with:

29 with:

28 ghc-version: ${{ matrix.ghc }}

30 ghc-version: ${{ matrix.ghc }}

29 cabal-version: ${{ matrix.cabal }}

31 cabal-version: ${{ matrix.cabal }}

30 - run: cabal update

32 - run: cabal update

31− - run: cabal freeze

33+ - run: cabal freeze $CONFIG

32− - uses: actions/cache@v4.2.3

34+ - uses: actions/cache@v3.3.1

33 with:

35 with:

34 path: |

36 path: |

35 ${{ steps.setup-haskell-cabal.outputs.cabal-store }}

37 ${{ steps.setup-haskell-cabal.outputs.cabal-store }}

@@ -38,10 +40,9 @@ jobs:

38 restore-keys: |

40 restore-keys: |

39 ${{ runner.os }}-${{ matrix.ghc }}-

41 ${{ runner.os }}-${{ matrix.ghc }}-

40 - run: cabal format && git diff --exit-code --color=always

42 - run: cabal format && git diff --exit-code --color=always

41− - run: cabal build

43+ - run: cabal build $CONFIG

42− - run: |

43− docker pull kennethreitz/httpbin

44− docker run -p 1234:80 kennethreitz/httpbin &

45− cabal test

44+ - run: cabal test $CONFIG

46− - run: cabal haddock

45+ - run: cabal haddock $CONFIG

46+ # Haddock fails to build, see https://github.com/haskell/cabal/issues/9060

47+ if: ${{ matrix.ghc != '9.2.7' }}

47 - run: cabal sdist

48 - run: cabal sdist

.gitignore−1

@@ -25,6 +25,5 @@ cabal.project.local

25cabal.sandbox.config

26dist-*/

27dist/

28−hie.yaml

29stack.yaml

28stack.yaml

30stack.yaml.lock

29stack.yaml.lock

CHANGELOG.md+1−17

@@ -1,20 +1,4 @@

1−## Req 3.13.4

1+## Unreleased

2−

3−* Fixed empty ciphersuite list when compiling against `tls < 2.0.6`

4− (see [PR 175](https://github.com/mrkkrp/req/pull/175)). As a side effect, now

5− compatible with older versions of `crypton-connection` (>= 0.3).

6−

7−## Req 3.13.3

8−

9−* Works with `crypton-connection-0.4` and newer.

10−

11−## Req 3.13.2

12−

13−* Disable the problematic `httpbin-tests` test suite by default. Only enable

14− it when the `dev` flag is enabled. In that case it is expected that an

15− httpbin server is run locally at `localhost:1234`.

16−

17−## Req 3.13.1

19* Switched the non-pure test suite to use https://httpbun.org instead of

3* Switched the non-pure test suite to use https://httpbun.org instead of

20 https://httpbin.org since the latter proved to be highly unreliable

4 https://httpbin.org since the latter proved to be highly unreliable

Network/HTTP/Req.hs+9−9

@@ -236,7 +236,6 @@ import Data.ByteString qualified as B

236import Data.ByteString.Lazy qualified as BL

237import Data.CaseInsensitive qualified as CI

238import Data.Data (Data)

239−import Data.Default.Class (def)

240import Data.Function (on)

239import Data.Function (on)

241import Data.IORef

240import Data.IORef

242import Data.Kind (Constraint, Type)

241import Data.Kind (Constraint, Type)

@@ -585,10 +584,10 @@ req' method url body options m = do

585 withReqManager (m request)

584 withReqManager (m request)

586

585

587-- | Perform an action using the global implicit 'L.Manager' that the rest

586-- | Perform an action using the global implicit 'L.Manager' that the rest

588−-- of the library uses. This allows us to reuse connections that the

587+-- of the library uses. This allows to reuse connections that the

589-- 'L.Manager' controls.

588-- 'L.Manager' controls.

590withReqManager :: (MonadIO m) => (L.Manager -> m a) -> m a

589withReqManager :: (MonadIO m) => (L.Manager -> m a) -> m a

591−withReqManager m = m globalManager

590+withReqManager m = liftIO (readIORef globalManager) >>= m

592

591

593-- | The global 'L.Manager' that 'req' uses. Here we just go with the

592-- | The global 'L.Manager' that 'req' uses. Here we just go with the

594-- default settings, so users don't need to deal with this manager stuff at

593-- default settings, so users don't need to deal with this manager stuff at

@@ -601,16 +600,16 @@ withReqManager m = m globalManager

601-- manager. From that moment on the 'IORef' will be just reused—exactly the

600-- manager. From that moment on the 'IORef' will be just reused—exactly the

602-- behavior we want here in order to maximize connection sharing. GHC could

601-- behavior we want here in order to maximize connection sharing. GHC could

603-- spoil the plan by inlining the definition, hence the @NOINLINE@ pragma.

602-- spoil the plan by inlining the definition, hence the @NOINLINE@ pragma.

604−globalManager :: L.Manager

603+globalManager :: IORef L.Manager

605globalManager = unsafePerformIO $ do

604globalManager = unsafePerformIO $ do

606 context <- NC.initConnectionContext

605 context <- NC.initConnectionContext

607 let settings =

606 let settings =

608 L.mkManagerSettingsContext

607 L.mkManagerSettingsContext

609 (Just context)

608 (Just context)

610− def

609+ (NC.TLSSettingsSimple False False False)

611 Nothing

610 Nothing

612 manager <- L.newManager settings

611 manager <- L.newManager settings

613− return manager

612+ newIORef manager

614{-# NOINLINE globalManager #-}

613{-# NOINLINE globalManager #-}

615

614

616----------------------------------------------------------------------------

615----------------------------------------------------------------------------

@@ -716,6 +715,7 @@ data HttpConfig = HttpConfig

716 -- @since 3.6.0

715 -- @since 3.6.0

717 httpConfigBodyPreviewLength :: forall a. (Num a) => a

716 httpConfigBodyPreviewLength :: forall a. (Num a) => a

718 }

717 }

718+ deriving (Typeable)

719

720-- | The default value of 'HttpConfig'.

721--

@@ -1024,7 +1024,7 @@ instance (HttpMethod method) => RequestComponent (Tagged "method" method) where

1024-- > -- https://%D1%8E%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4.%D1%80%D1%84

1025data Url (scheme :: Scheme) = Url Scheme (NonEmpty Text)

1026 -- NOTE The second value is the path segments in reversed order.

1027− deriving (Eq, Ord, Show, Data, Generic)

1027+ deriving (Eq, Ord, Show, Data, Typeable, Generic)

1028

1029type role Url nominal

1030

@@ -2011,7 +2011,7 @@ data HttpException

2011 | -- | A wrapper with Aeson-produced 'String' describing why decoding

2012 -- failed

2013 JsonHttpException String

2014− deriving (Show, Generic)

2014+ deriving (Show, Typeable, Generic)

2015

2016instance Exception HttpException

2017

@@ -2048,4 +2048,4 @@ data Scheme

2048 Http

2049 | -- | HTTPS

2050 Https

2051− deriving (Eq, Ord, Show, Data, Generic, TH.Lift)

2051+ deriving (Eq, Ord, Show, Data, Typeable, Generic, TH.Lift)

README.md+1−1

@@ -4,7 +4,7 @@

4[![Hackage](https://img.shields.io/hackage/v/req.svg?style=flat)](https://hackage.haskell.org/package/req)

5[![Stackage Nightly](http://stackage.org/package/req/badge/nightly)](http://stackage.org/nightly/package/req)

6[![Stackage LTS](http://stackage.org/package/req/badge/lts)](http://stackage.org/lts/package/req)

7−[![CI](https://github.com/mrkkrp/req/actions/workflows/ci.yaml/badge.svg)](https://github.com/mrkkrp/req/actions/workflows/ci.yaml)

7+![CI](https://github.com/mrkkrp/req/workflows/CI/badge.svg?branch=master)

9* [Related packages](#related-packages)

10* [Blog posts](#blog-posts)

Setup.hsnew file+6

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

1+module Main (main) where

3+import Distribution.Simple

5+main :: IO ()

6+main = defaultMain

cabal.projectdeleted−4

@@ -1,4 +0,0 @@

1−packages: .

2−tests: True

3−benchmarks: True

4−constraints: req +dev

httpbin-data/robots.txt → httpbun-data/robots.txtrenamed

The content is the same.

httpbin-data/utf8.html → httpbun-data/utf8.htmlrenamed

The content is the same.

httpbin-tests/Network/HTTP/ReqSpec.hs → httpbun-tests/Network/HTTP/ReqSpec.hsrenamed+81−147

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

1{-# LANGUAGE DataKinds #-}

2{-# LANGUAGE FlexibleInstances #-}

3−{-# LANGUAGE LambdaCase #-}

4{-# LANGUAGE OverloadedStrings #-}

3{-# LANGUAGE OverloadedStrings #-}

5{-# LANGUAGE RankNTypes #-}

4{-# LANGUAGE RankNTypes #-}

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

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

@@ -24,8 +23,7 @@ import Data.Text.Encoding qualified as T

24import Data.Text.IO qualified as TIO

23import Data.Text.IO qualified as TIO

25import Network.HTTP.Client qualified as L

24import Network.HTTP.Client qualified as L

26import Network.HTTP.Client.MultipartFormData qualified as LM

25import Network.HTTP.Client.MultipartFormData qualified as LM

27−import Network.HTTP.Req hiding (req)

26+import Network.HTTP.Req

28−import Network.HTTP.Req qualified as Req

29import Network.HTTP.Types qualified as Y

27import Network.HTTP.Types qualified as Y

30import Test.Hspec

28import Test.Hspec

31import Test.QuickCheck

29import Test.QuickCheck

@@ -34,25 +32,25 @@ spec :: Spec

34spec = do

32spec = do

35 describe "exception throwing on non-2xx status codes" $

33 describe "exception throwing on non-2xx status codes" $

36 it "throws indeed for non-2xx" $

34 it "throws indeed for non-2xx" $

37− req GET (httpbin /: "foo") NoReqBody ignoreResponse mempty

35+ req GET (httpbun /: "foo") NoReqBody ignoreResponse mempty

38 `shouldThrow` selector404

36 `shouldThrow` selector404

40 describe "exception throwing on non-2xx status codes (Req monad)" $

38 describe "exception throwing on non-2xx status codes (Req monad)" $

41 it "throws indeed for non-2xx" $

39 it "throws indeed for non-2xx" $

42 asIO . runReq defaultHttpConfig $

40 asIO . runReq defaultHttpConfig $

43 liftBaseWith $ \run ->

41 liftBaseWith $ \run ->

44− run (req GET (httpbin /: "foo") NoReqBody ignoreResponse mempty)

42+ run (req GET (httpbun /: "foo") NoReqBody ignoreResponse mempty)

45 `shouldThrow` selector404

43 `shouldThrow` selector404

47 describe "response check via httpConfigCheckResponse" $

45 describe "response check via httpConfigCheckResponse" $

48 context "if it's set to always throw" $

46 context "if it's set to always throw" $

49 it "throws indeed" $

47 it "throws indeed" $

50− blindlyThrowing (req GET httpbin NoReqBody ignoreResponse mempty)

48+ blindlyThrowing (req GET httpbun NoReqBody ignoreResponse mempty)

51 `shouldThrow` anyException

49 `shouldThrow` anyException

53 describe "isStatusCodeException" $

51 describe "isStatusCodeException" $

54 it "extracts non-2xx response" $

52 it "extracts non-2xx response" $

55− req GET (httpbin /: "foo") NoReqBody ignoreResponse mempty

53+ req GET (httpbun /: "foo") NoReqBody ignoreResponse mempty

56 `shouldThrow` selector404ByStatusCodeException

54 `shouldThrow` selector404ByStatusCodeException

58 describe "receiving user-agent header back" $

56 describe "receiving user-agent header back" $

@@ -60,7 +58,7 @@ spec = do

60 r <-

58 r <-

61 req

59 req

62 GET

60 GET

63− (httpbin /: "user-agent")

61+ (httpbun /: "user-agent")

64 NoReqBody

62 NoReqBody

65 jsonResponse

63 jsonResponse

66 (header "user-agent" "Req")

64 (header "user-agent" "Req")

@@ -75,7 +73,7 @@ spec = do

75 r <-

73 r <-

76 req

74 req

77 GET

75 GET

78− (httpbin /: "headers")

76+ (httpbun /: "headers")

79 NoReqBody

77 NoReqBody

80 jsonResponse

78 jsonResponse

81 (header "Foo" "bar" <> header "Baz" "quux")

79 (header "Foo" "bar" <> header "Baz" "quux")

@@ -93,11 +91,12 @@ spec = do

94 describe "receiving GET data back" $

92 describe "receiving GET data back" $

95 it "works" $ do

93 it "works" $ do

96− r <- req GET (httpbin /: "get") NoReqBody jsonResponse mempty

94+ r <- req GET (httpbun /: "get") NoReqBody jsonResponse mempty

97 (stripFunnyHeaders . stripOrigin) (responseBody r)

95 (stripFunnyHeaders . stripOrigin) (responseBody r)

98 `shouldBe` object

96 `shouldBe` object

99 [ "args" .= emptyObject,

97 [ "args" .= emptyObject,

100− "url" .= ("http://localhost:1234/get" :: Text),

98+ "url" .= ("https://httpbun.org/get" :: Text),

99+ "method" .= ("GET" :: Text),

101 "headers"

100 "headers"

102 .= object

101 .= object

103 [ "Accept-Encoding" .= ("gzip" :: Text)

102 [ "Accept-Encoding" .= ("gzip" :: Text)

@@ -111,13 +110,14 @@ spec = do

111 it "works" $ do

110 it "works" $ do

112 let text = "foo" :: Text

111 let text = "foo" :: Text

113 reflected = reflectJSON text

112 reflected = reflectJSON text

114− r <- req POST (httpbin /: "post") (ReqBodyJson text) jsonResponse mempty

113+ r <- req POST (httpbun /: "post") (ReqBodyJson text) jsonResponse mempty

115 (stripFunnyHeaders . stripOrigin) (responseBody r)

114 (stripFunnyHeaders . stripOrigin) (responseBody r)

116 `shouldBe` object

115 `shouldBe` object

117 [ "args" .= emptyObject,

116 [ "args" .= emptyObject,

118 "json" .= text,

117 "json" .= text,

119 "data" .= reflected,

118 "data" .= reflected,

120− "url" .= ("http://localhost:1234/post" :: Text),

119+ "url" .= ("https://httpbun.org/post" :: Text),

120+ "method" .= ("POST" :: Text),

121 "headers"

122 .= object

123 [ "Content-Type" .= ("application/json; charset=utf-8" :: Text),

@@ -138,14 +138,15 @@ spec = do

138 [ LM.partBS "foo" "foo data!",

139 LM.partBS "bar" "bar data!"

140 ]

141− r <- req POST (httpbin /: "post") body jsonResponse mempty

141+ r <- req POST (httpbun /: "post") body jsonResponse mempty

142 let contentType = fromJust (getRequestContentType body)

143 (stripFunnyHeaders . stripOrigin) (responseBody r)

144 `shouldBe` object

145 [ "args" .= emptyObject,

146 "json" .= Null,

147 "data" .= ("" :: Text),

148− "url" .= ("http://localhost:1234/post" :: Text),

148+ "url" .= ("https://httpbun.org/post" :: Text),

149+ "method" .= ("POST" :: Text),

149 "headers"

150 "headers"

150 .= object

151 .= object

151 [ "Content-Type" .= T.decodeUtf8 contentType,

152 [ "Content-Type" .= T.decodeUtf8 contentType,

@@ -166,15 +167,16 @@ spec = do

166 describe "receiving PATCHed file back" $

167 describe "receiving PATCHed file back" $

167 it "works" $ do

168 it "works" $ do

168 let file :: FilePath

169 let file :: FilePath

169− file = "httpbin-data/robots.txt"

170+ file = "httpbun-data/robots.txt"

170 contents <- TIO.readFile file

171 contents <- TIO.readFile file

171− r <- req PATCH (httpbin /: "patch") (ReqBodyFile file) jsonResponse mempty

172+ r <- req PATCH (httpbun /: "patch") (ReqBodyFile file) jsonResponse mempty

172 (stripFunnyHeaders . stripOrigin) (responseBody r)

173 (stripFunnyHeaders . stripOrigin) (responseBody r)

173 `shouldBe` object

174 `shouldBe` object

174 [ "args" .= emptyObject,

175 [ "args" .= emptyObject,

175 "json" .= Null,

176 "json" .= Null,

176 "data" .= contents,

177 "data" .= contents,

177− "url" .= ("http://localhost:1234/patch" :: Text),

178+ "url" .= ("https://httpbun.org/patch" :: Text),

179+ "method" .= ("PATCH" :: Text),

178 "headers"

180 "headers"

179 .= object

181 .= object

180 [ "Accept-Encoding" .= ("gzip" :: Text),

182 [ "Accept-Encoding" .= ("gzip" :: Text),

@@ -193,13 +195,14 @@ spec = do

193 "foo" =: ("bar" :: Text)

195 "foo" =: ("bar" :: Text)

194 <> "baz" =: (5 :: Int)

196 <> "baz" =: (5 :: Int)

195 <> queryFlag "quux"

197 <> queryFlag "quux"

196− r <- req PUT (httpbin /: "put") (ReqBodyUrlEnc params) jsonResponse mempty

198+ r <- req PUT (httpbun /: "put") (ReqBodyUrlEnc params) jsonResponse mempty

197 (stripFunnyHeaders . stripOrigin) (responseBody r)

199 (stripFunnyHeaders . stripOrigin) (responseBody r)

198 `shouldBe` object

200 `shouldBe` object

199 [ "args" .= emptyObject,

201 [ "args" .= emptyObject,

200 "json" .= Null,

202 "json" .= Null,

201 "data" .= ("" :: Text),

203 "data" .= ("" :: Text),

202− "url" .= ("http://localhost:1234/put" :: Text),

204+ "url" .= ("https://httpbun.org/put" :: Text),

205+ "method" .= ("PUT" :: Text),

203 "headers"

206 "headers"

204 .= object

207 .= object

205 [ "Content-Type" .= ("application/x-www-form-urlencoded" :: Text),

208 [ "Content-Type" .= ("application/x-www-form-urlencoded" :: Text),

@@ -218,24 +221,19 @@ spec = do

218 responseStatusCode r `shouldBe` 200

221 responseStatusCode r `shouldBe` 200

219 responseStatusMessage r `shouldBe` "OK"

222 responseStatusMessage r `shouldBe` "OK"

220

223

221− -- TODO /delete

222−

223− describe "receiving UTF-8 encoded Unicode data" $

224+ -- describe "receiving UTF-8 encoded Unicode data" $

224− it "works" $ do

225+ -- it "works" $ do

225− r <-

226+ -- r <-

226− req

227+ -- req

227− GET

228+ -- GET

228− (httpbin /: "encoding" /: "utf8")

229+ -- (httpbun /: "encoding" /: "utf8")

229− NoReqBody

230+ -- NoReqBody

230− bsResponse

231+ -- bsResponse

231− mempty

232+ -- mempty

232− utf8data <- B.readFile "httpbin-data/utf8.html"

233+ -- utf8data <- B.readFile "httpbun-data/utf8.html"

233− responseBody r `shouldBe` utf8data

234+ -- responseBody r `shouldBe` utf8data

234− responseStatusCode r `shouldBe` 200

235+ -- responseStatusCode r `shouldBe` 200

235− responseStatusMessage r `shouldBe` "OK"

236+ -- responseStatusMessage r `shouldBe` "OK"

236−

237− -- TODO /gzip

238− -- TODO /deflate

239

237

240 describe "retrying" $

238 describe "retrying" $

241 it "retries as many times as specified" $ do

239 it "retries as many times as specified" $ do

@@ -246,7 +244,7 @@ spec = do

246 prepareForShit $

244 prepareForShit $

247 req

245 req

248 GET

246 GET

249− (httpbin /: "status" /~ status)

247+ (httpbun /: "status" /~ status)

250 NoReqBody

248 NoReqBody

251 ignoreResponse

249 ignoreResponse

252 mempty

250 mempty

@@ -258,25 +256,18 @@ spec = do

258 forM_ [400 .. 431] checkStatusCode

256 forM_ [400 .. 431] checkStatusCode

259 forM_ [500 .. 511] checkStatusCode

257 forM_ [500 .. 511] checkStatusCode

260

258

261− -- TODO /response-headers

262− -- TODO /redirect

263−

264 describe "redirects" $

259 describe "redirects" $

265 it "follows redirects" $ do

260 it "follows redirects" $ do

266 r <-

261 r <-

267 req

262 req

268 GET

263 GET

269− (httpbin /: "redirect-to")

264+ (httpbun /: "redirect-to")

270 NoReqBody

265 NoReqBody

271 ignoreResponse

266 ignoreResponse

272− ("url" =: ("https://httpbin.org" :: Text))

267+ ("url" =: ("https://httpbun.org" :: Text))

273 responseStatusCode r `shouldBe` 200

268 responseStatusCode r `shouldBe` 200

274 responseStatusMessage r `shouldBe` "OK"

269 responseStatusMessage r `shouldBe` "OK"

275

270

276− -- TODO /relative-redicet

277− -- TODO /absolute-redirect

278− -- TODO /cookies

279−

280 describe "basicAuth" $ do

271 describe "basicAuth" $ do

281 let user, password :: Text

272 let user, password :: Text

282 user = "Scooby"

273 user = "Scooby"

@@ -287,43 +278,32 @@ spec = do

287 prepareForShit $

278 prepareForShit $

288 req

279 req

289 GET

280 GET

290− (httpbin /: "basic-auth" /~ user /~ password)

281+ (httpbun /: "basic-auth" /~ user /~ password)

291 NoReqBody

282 NoReqBody

292 ignoreResponse

283 ignoreResponse

293 mempty

284 mempty

294 responseStatusCode r `shouldBe` 401

285 responseStatusCode r `shouldBe` 401

295− responseStatusMessage r `shouldBe` "UNAUTHORIZED"

286+ responseStatusMessage r `shouldBe` "Unauthorized"

296 context "when we provide appropriate basic auth data" $

287 context "when we provide appropriate basic auth data" $

297 it "succeeds" $ do

288 it "succeeds" $ do

298 r <-

289 r <-

299 req

290 req

300 GET

291 GET

301− (httpbin /: "basic-auth" /~ user /~ password)

292+ (httpbun /: "basic-auth" /~ user /~ password)

302 NoReqBody

293 NoReqBody

303 ignoreResponse

294 ignoreResponse

304− (basicAuthUnsafe (T.encodeUtf8 user) (T.encodeUtf8 password))

295+ (basicAuth (T.encodeUtf8 user) (T.encodeUtf8 password))

305 responseStatusCode r `shouldBe` 200

296 responseStatusCode r `shouldBe` 200

306 responseStatusMessage r `shouldBe` "OK"

297 responseStatusMessage r `shouldBe` "OK"

307

298

308− -- TODO /hidden-basic-auth

309− -- TODO /digest-auth

310− -- TODO /stream

311− -- TODO /delay

312− -- TODO /drip

313− -- TODO /range

314− -- TODO /html

315−

316 describe "robots.txt" $

299 describe "robots.txt" $

317 it "works" $ do

300 it "works" $ do

318− r <- req GET (httpbin /: "robots.txt") NoReqBody bsResponse mempty

301+ r <- req GET (httpbun /: "robots.txt") NoReqBody bsResponse mempty

319− robots <- B.readFile "httpbin-data/robots.txt"

302+ robots <- B.readFile "httpbun-data/robots.txt"

320 responseBody r `shouldBe` robots

303 responseBody r `shouldBe` robots

321 responseStatusCode r `shouldBe` 200

304 responseStatusCode r `shouldBe` 200

322 responseStatusMessage r `shouldBe` "OK"

305 responseStatusMessage r `shouldBe` "OK"

323

306

324− -- TODO /deny

325− -- TODO /cache

326−

327 describe "getting random bytes" $ do

307 describe "getting random bytes" $ do

328 it "works" $

308 it "works" $

329 property $ \n' -> do

309 property $ \n' -> do

@@ -332,7 +312,7 @@ spec = do

332 r <-

312 r <-

333 req

313 req

334 GET

314 GET

335− (httpbin /: "bytes" /~ n)

315+ (httpbun /: "bytes" /~ n)

336 NoReqBody

316 NoReqBody

337 lbsResponse

317 lbsResponse

338 mempty

318 mempty

@@ -348,36 +328,27 @@ spec = do

348 n = 1000

328 n = 1000

349 req

329 req

350 GET

330 GET

351− (httpbin /: "bytes" /~ n)

331+ (httpbun /: "bytes" /~ n)

352 NoReqBody

332 NoReqBody

353 (Proxy :: Proxy (JsonResponse Value))

333 (Proxy :: Proxy (JsonResponse Value))

354 mempty

334 mempty

355 `shouldThrow` selector

335 `shouldThrow` selector

356

336

357− describe "streaming random bytes" $

337+-- describe "streaming random bytes" $

358− it "works" $

338+-- it "works" $

359− property $ \n' -> do

339+-- property $ \n' -> do

360− let n :: Word

340+-- let n :: Word

361− n = getSmall n'

341+-- n = getSmall n'

362− r <-

342+-- r <-

363− req

343+-- req

364− GET

344+-- GET

365− (httpbin /: "stream-bytes" /~ n)

345+-- (httpbun /: "stream-bytes" /~ n)

366− NoReqBody

346+-- NoReqBody

367− bsResponse

347+-- bsResponse

368− mempty

348+-- mempty

369− responseBody r `shouldSatisfy` ((== n) . fromIntegral . B.length)

349+-- responseBody r `shouldSatisfy` ((== n) . fromIntegral . B.length)

370− responseStatusCode r `shouldBe` 200

350+-- responseStatusCode r `shouldBe` 200

371− responseStatusMessage r `shouldBe` "OK"

351+-- responseStatusMessage r `shouldBe` "OK"

372−

373−-- TODO /links

374−-- TODO /image

375−-- TODO /image/png

376−-- TODO /image/jpeg

377−-- TODO /image/webp

378−-- TODO /image/svg

379−-- TODO /forms/post

380−-- TODO /xml

381

352

382----------------------------------------------------------------------------

353----------------------------------------------------------------------------

383-- Instances

354-- Instances

@@ -400,29 +371,9 @@ blindlyThrowing = runReq defaultHttpConfig {httpConfigCheckResponse = doit}

400 where

371 where

401 doit _ _ = error "Oops!"

372 doit _ _ = error "Oops!"

402

373

403−-- | 'Url' representing <https://httpbin.org>.

374+-- | 'Url' representing <https://httpbun.org>.

404−httpbin :: Url 'Http

375+httpbun :: Url 'Https

405−httpbin = http "localhost"

376+httpbun = https "httpbun.org"

406−

407−req ::

408− ( MonadHttp m,

409− HttpMethod method,

410− HttpBody body,

411− HttpResponse response,

412− HttpBodyAllowed (AllowsBody method) (ProvidesBody body)

413− ) =>

414− method ->

415− Url scheme ->

416− body ->

417− Proxy response ->

418− Option scheme ->

419− m response

420−req method url body responseProxy options =

421− Req.req method url body responseProxy (options <> defaultOptions)

422−

423−-- | Options to apply by default.

424−defaultOptions :: Option scheme

425−defaultOptions = port 1234

426

377

427-- | Remove “origin” field from JSON value. Origin may change, we don't want

378-- | Remove “origin” field from JSON value. Origin may change, we don't want

428-- to depend on that.

379-- to depend on that.

@@ -432,38 +383,21 @@ stripOrigin value = value

432

383

433-- | Remove funny headers that might break the tests.

384-- | Remove funny headers that might break the tests.

434stripFunnyHeaders :: Value -> Value

385stripFunnyHeaders :: Value -> Value

435−stripFunnyHeaders = \case

386+stripFunnyHeaders (Object m) =

436− Object m ->

437− Object

438− ( runIdentity

439− ( Aeson.KeyMap.alterF

440− (pure . fmap stripFunnyHeaders')

441− "headers"

442− m

443− )

444− )

445− value -> value

446−

447−-- | Similar to 'stripFunnyHeaders', but acts directly on the argument

448−-- without trying to access its "headers" field.

449−stripFunnyHeaders' :: Value -> Value

450−stripFunnyHeaders' = \case

451− Object p ->

452− Object $

453− Aeson.KeyMap.filterWithKey

387+ let f (Object p) = Object $ Aeson.KeyMap.filterWithKey (\k _ -> k `elem` hs) p

454− (\k _ -> k `elem` whitelistedHeaders)

455− p

456− value -> value

388+ f value = value

457− where

389+ hs =

458− whitelistedHeaders =

459− [ "Content-Type",

390+ [ "Content-Type",

460− "Accept-Encoding",

391+ "Accept-Encoding",

392+ "Host",

461− "Content-Length",

393+ "Content-Length",

462− "Foo",

394+ "Foo",

463− "Baz"

395+ "Baz"

464− ]

396+ ]

465−

397+ in Object (runIdentity (Aeson.KeyMap.alterF (pure . fmap f) "headers" m))

398+stripFunnyHeaders value = value

399+

466−-- | This is a complete test case that makes use of <https://httpbin.org> to

400+-- | This is a complete test case that makes use of <https://httpbun.org> to

467-- get various response status codes.

401-- get various response status codes.

468checkStatusCode :: Int -> SpecWith ()

402checkStatusCode :: Int -> SpecWith ()

469checkStatusCode code =

403checkStatusCode code =

@@ -473,7 +407,7 @@ checkStatusCode code =

473 prepareForShit $

407 prepareForShit $

474 req

408 req

475 GET

409 GET

476− (httpbin /: "status" /~ code)

410+ (httpbun /: "status" /~ code)

477 NoReqBody

411 NoReqBody

478 ignoreResponse

412 ignoreResponse

479 mempty

413 mempty

httpbin-tests/Spec.hs → httpbun-tests/Spec.hsrenamed

The content is the same.

req.cabal+36−41

@@ -1,11 +1,11 @@

1cabal-version: 2.4

2name: req

3−version: 3.13.4

3+version: 3.13.0

4license: BSD-3-Clause

5license-file: LICENSE.md

6maintainer: Mark Karpov <markkarpov92@gmail.com>

7author: Mark Karpov <markkarpov92@gmail.com>

8−tested-with: ghc ==9.6.3 ghc ==9.8.2 ghc ==9.10.1

8+tested-with: ghc ==9.2.7 ghc ==9.4.4 ghc ==9.6.1

9homepage: https://github.com/mrkkrp/req

10bug-reports: https://github.com/mrkkrp/req/issues

11synopsis: HTTP client library

@@ -13,8 +13,8 @@ description: HTTP client library.

13category: Network, Web

14build-type: Simple

15data-files:

16− httpbin-data/utf8.html

16+ httpbun-data/utf8.html

17− httpbin-data/robots.txt

17+ httpbun-data/robots.txt

19extra-doc-files:

20 CHANGELOG.md

@@ -35,32 +35,29 @@ library

35 build-depends:

36 aeson >=0.9 && <3,

37 authenticate-oauth >=1.5 && <1.8,

38− base >=4.15 && <5,

38+ base >=4.15 && <5.0,

39 blaze-builder >=0.3 && <0.5,

40− bytestring >=0.10.8 && <0.13,

40+ bytestring >=0.10.8 && <0.12,

41 case-insensitive >=0.2 && <1.3,

42− containers >=0.5 && <0.8,

42+ containers >=0.5 && <0.7,

43− crypton-connection >=0.4.2 && <0.5,

43+ crypton-connection >=0.2.2 && <0.4,

44− data-default-class >=0.2.0.0,

45 exceptions >=0.6 && <0.11,

44 exceptions >=0.6 && <0.11,

46− http-api-data >=0.2 && <0.7,

45+ http-api-data >=0.2 && <0.6,

47 http-client >=0.7.13.1 && <0.8,

46 http-client >=0.7.13.1 && <0.8,

48 http-client-tls >=0.3.2 && <0.4,

47 http-client-tls >=0.3.2 && <0.4,

49− http-types >=0.8 && <10,

48+ http-types >=0.8 && <10.0,

50 modern-uri >=0.3 && <0.4,

49 modern-uri >=0.3 && <0.4,

51 monad-control >=1.0 && <1.1,

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

52 mtl >=2.0 && <3.0,

51 mtl >=2.0 && <3.0,

53 retry >=0.8 && <0.10,

52 retry >=0.8 && <0.10,

54− template-haskell >=2.19 && <2.23,

53+ template-haskell >=2.14 && <2.21,

55− text >=0.2 && <2.2,

54+ text >=0.2 && <2.1,

56 transformers >=0.5.3.0 && <0.7,

55 transformers >=0.5.3.0 && <0.7,

57 transformers-base,

56 transformers-base,

58 unliftio-core >=0.1.1 && <0.3

57 unliftio-core >=0.1.1 && <0.3

60 if flag(dev)

59 if flag(dev)

61− ghc-options:

62− -Wall -Werror -Wpartial-fields -Wunused-packages

60+ ghc-options: -Wall -Werror -Wpartial-fields -Wunused-packages

63− -Wno-unused-imports

65 else

62 else

66 ghc-options: -O2 -Wall

63 ghc-options: -O2 -Wall

@@ -68,60 +65,58 @@ library

68test-suite pure-tests

65test-suite pure-tests

69 type: exitcode-stdio-1.0

66 type: exitcode-stdio-1.0

70 main-is: Spec.hs

67 main-is: Spec.hs

71− build-tool-depends: hspec-discover:hspec-discover >=2 && <3

68+ build-tool-depends: hspec-discover:hspec-discover >=2.0 && <3.0

72 hs-source-dirs: pure-tests

69 hs-source-dirs: pure-tests

73 other-modules: Network.HTTP.ReqSpec

70 other-modules: Network.HTTP.ReqSpec

74 default-language: GHC2021

71 default-language: GHC2021

75 build-depends:

72 build-depends:

76− QuickCheck >=2.7 && <3,

73+ QuickCheck >=2.7 && <3.0,

77 aeson >=0.9 && <3,

74 aeson >=0.9 && <3,

78 base >=4.15 && <5.0,

75 base >=4.15 && <5.0,

79 blaze-builder >=0.3 && <0.5,

76 blaze-builder >=0.3 && <0.5,

80− bytestring >=0.10.8 && <0.13,

77+ bytestring >=0.10.8 && <0.12,

81 case-insensitive >=0.2 && <1.3,

78 case-insensitive >=0.2 && <1.3,

82− hspec >=2.0 && <3,

79+ hspec >=2.0 && <3.0,

83− hspec-core >=2.0 && <3,

80+ hspec-core >=2.0 && <3.0,

84− http-api-data >=0.2 && <0.7,

81+ http-api-data >=0.2 && <0.6,

85 http-client >=0.7 && <0.8,

82 http-client >=0.7 && <0.8,

86− http-types >=0.8 && <10,

83+ http-types >=0.8 && <10.0,

87 modern-uri >=0.3 && <0.4,

84 modern-uri >=0.3 && <0.4,

85+ mtl >=2.0 && <3.0,

88 req,

86 req,

89 retry >=0.8 && <0.10,

87 retry >=0.8 && <0.10,

90− template-haskell >=2.19 && <2.23,

88+ template-haskell >=2.14 && <2.21,

91− text >=0.2 && <2.2,

89+ text >=0.2 && <2.1,

92− time >=1.2 && <1.15

90+ time >=1.2 && <1.13

94 if flag(dev)

92 if flag(dev)

95− ghc-options:

93+ ghc-options: -Wall -Werror

96− -Wall -Werror -Wredundant-constraints -Wpartial-fields

97− -Wunused-packages

99 else

95 else

100 ghc-options: -O2 -Wall

96 ghc-options: -O2 -Wall

101

102−test-suite httpbin-tests

98+test-suite httpbun-tests

103 type: exitcode-stdio-1.0

99 type: exitcode-stdio-1.0

104 main-is: Spec.hs

100 main-is: Spec.hs

105− build-tool-depends: hspec-discover:hspec-discover >=2 && <3

101+ build-tool-depends: hspec-discover:hspec-discover >=2.0 && <3.0

106− hs-source-dirs: httpbin-tests

102+ hs-source-dirs: httpbun-tests

107 other-modules: Network.HTTP.ReqSpec

103 other-modules: Network.HTTP.ReqSpec

108 default-language: GHC2021

104 default-language: GHC2021

109 build-depends:

105 build-depends:

110− QuickCheck >=2.7 && <3,

106+ QuickCheck >=2.7 && <3.0,

111 aeson >=2 && <3,

107 aeson >=2 && <3,

112− base >=4.15 && <5,

108+ base >=4.15 && <5.0,

113− bytestring >=0.10.8 && <0.13,

109+ bytestring >=0.10.8 && <0.12,

114 hspec >=2.0 && <3.0,

110 hspec >=2.0 && <3.0,

115 http-client >=0.7 && <0.8,

111 http-client >=0.7 && <0.8,

116− http-types >=0.8 && <10,

112+ http-types >=0.8 && <10.0,

117 monad-control >=1.0 && <1.1,

113 monad-control >=1.0 && <1.1,

114+ mtl >=2.0 && <3.0,

118 req,

115 req,

119− text >=0.2 && <2.2

116+ text >=0.2 && <2.1

120

117

121 if flag(dev)

118 if flag(dev)

122− ghc-options:

119+ ghc-options: -Wall -Werror

123− -Wall -Werror -Wredundant-constraints -Wpartial-fields

124− -Wunused-packages

125

120

126 else

121 else

127− buildable: False

122+ ghc-options: -O2 -Wall