83bfee5...master · typeable/req

git.iko.soy/typeable/req

on master help sign in

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

since splitsnapshots

unifiedsplit

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

11 ormolu:

12 runs-on: ubuntu-latest

13 steps:

14− - uses: actions/checkout@v3

14+ - uses: actions/checkout@v4

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

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

16 build:

17 runs-on: ubuntu-latest

18 needs: ormolu

19 strategy:

20 matrix:

21− cabal: ["3.10"]

21+ cabal: ["3.12"]

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

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

23− env:

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

25 steps:

23 steps:

26− - uses: actions/checkout@v3

24+ - uses: actions/checkout@v4

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

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

28 id: setup-haskell-cabal

26 id: setup-haskell-cabal

29 with:

27 with:

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

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

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

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

32 - run: cabal update

30 - run: cabal update

33− - run: cabal freeze $CONFIG

31+ - run: cabal freeze

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

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

35 with:

33 with:

36 path: |

34 path: |

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

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

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

40 restore-keys: |

38 restore-keys: |

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

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

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

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

43− - run: cabal build $CONFIG

41+ - run: cabal build

42+ - run: |

43+ docker pull kennethreitz/httpbin

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

44− - run: cabal test $CONFIG

45+ cabal test

45− - run: cabal haddock $CONFIG

46+ - run: cabal haddock

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

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

48 - run: cabal sdist

47 - run: cabal sdist

.gitignore+1

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

25cabal.sandbox.config

26dist-*/

27dist/

28+hie.yaml

28stack.yaml

29stack.yaml

29stack.yaml.lock

30stack.yaml.lock

CHANGELOG.md+16

@@ -1,3 +1,19 @@

1+## Req 3.13.4

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).

7+## Req 3.13.3

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+

1## Req 3.13.1

17## Req 3.13.1

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

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

Network/HTTP/Req.hs+9−9

@@ -236,6 +236,7 @@ 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)

239import Data.Function (on)

240import Data.Function (on)

240import Data.IORef

241import Data.IORef

241import Data.Kind (Constraint, Type)

242import Data.Kind (Constraint, Type)

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

584 withReqManager (m request)

585 withReqManager (m request)

585

586

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

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

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

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

588-- 'L.Manager' controls.

589-- 'L.Manager' controls.

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

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

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

591+withReqManager m = m globalManager

591

592

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

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

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

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

@@ -600,16 +601,16 @@ withReqManager m = liftIO (readIORef globalManager) >>= m

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

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

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

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

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

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

603−globalManager :: IORef L.Manager

604+globalManager :: L.Manager

604globalManager = unsafePerformIO $ do

605globalManager = unsafePerformIO $ do

605 context <- NC.initConnectionContext

606 context <- NC.initConnectionContext

606 let settings =

607 let settings =

607 L.mkManagerSettingsContext

608 L.mkManagerSettingsContext

608 (Just context)

609 (Just context)

609− (NC.TLSSettingsSimple False False False)

610+ def

610 Nothing

611 Nothing

611 manager <- L.newManager settings

612 manager <- L.newManager settings

612− newIORef manager

613+ return manager

613{-# NOINLINE globalManager #-}

614{-# NOINLINE globalManager #-}

614

615

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

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

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

715 -- @since 3.6.0

716 -- @since 3.6.0

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

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

717 }

718 }

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, Typeable, Generic)

1027+ deriving (Eq, Ord, Show, Data, 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, Typeable, Generic)

2014+ deriving (Show, Generic)

2015

2016instance Exception HttpException

2017

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

2048 Http

2049 | -- | HTTPS

2050 Https

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

2051+ deriving (Eq, Ord, Show, Data, 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/workflows/CI/badge.svg?branch=master)

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

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

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

Setup.hsdeleted−6

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

1−module Main (main) where

2−

3−import Distribution.Simple

4−

5−main :: IO ()

6−main = defaultMain

cabal.projectnew file+4

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

1+packages: .

2+tests: True

3+benchmarks: True

4+constraints: req +dev

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

The content is the same.

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

The content is the same.

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

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

1{-# LANGUAGE DataKinds #-}

2{-# LANGUAGE FlexibleInstances #-}

3+{-# LANGUAGE LambdaCase #-}

3{-# LANGUAGE OverloadedStrings #-}

4{-# LANGUAGE OverloadedStrings #-}

4{-# LANGUAGE RankNTypes #-}

5{-# LANGUAGE RankNTypes #-}

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

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

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

23import Data.Text.IO qualified as TIO

24import Data.Text.IO qualified as TIO

24import Network.HTTP.Client qualified as L

25import Network.HTTP.Client qualified as L

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

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

26−import Network.HTTP.Req

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

28+import Network.HTTP.Req qualified as Req

27import Network.HTTP.Types qualified as Y

29import Network.HTTP.Types qualified as Y

28import Test.Hspec

30import Test.Hspec

29import Test.QuickCheck

31import Test.QuickCheck

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

32spec = do

34spec = do

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

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

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

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

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

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

36 `shouldThrow` selector404

38 `shouldThrow` selector404

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

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

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

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

40 asIO . runReq defaultHttpConfig $

42 asIO . runReq defaultHttpConfig $

41 liftBaseWith $ \run ->

43 liftBaseWith $ \run ->

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

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

43 `shouldThrow` selector404

45 `shouldThrow` selector404

45 describe "response check via httpConfigCheckResponse" $

47 describe "response check via httpConfigCheckResponse" $

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

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

47 it "throws indeed" $

49 it "throws indeed" $

48− blindlyThrowing (req GET httpbun NoReqBody ignoreResponse mempty)

50+ blindlyThrowing (req GET httpbin NoReqBody ignoreResponse mempty)

49 `shouldThrow` anyException

51 `shouldThrow` anyException

51 describe "isStatusCodeException" $

53 describe "isStatusCodeException" $

52 it "extracts non-2xx response" $

54 it "extracts non-2xx response" $

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

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

54 `shouldThrow` selector404ByStatusCodeException

56 `shouldThrow` selector404ByStatusCodeException

56 describe "receiving user-agent header back" $

58 describe "receiving user-agent header back" $

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

58 r <-

60 r <-

59 req

61 req

60 GET

62 GET

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

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

62 NoReqBody

64 NoReqBody

63 jsonResponse

65 jsonResponse

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

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

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

73 r <-

75 r <-

74 req

76 req

75 GET

77 GET

76− (httpbun /: "headers")

78+ (httpbin /: "headers")

77 NoReqBody

79 NoReqBody

78 jsonResponse

80 jsonResponse

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

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

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

92 describe "receiving GET data back" $

94 describe "receiving GET data back" $

93 it "works" $ do

95 it "works" $ do

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

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

95 (stripFunnyHeaders . stripOrigin) (responseBody r)

97 (stripFunnyHeaders . stripOrigin) (responseBody r)

96 `shouldBe` object

98 `shouldBe` object

97 [ "args" .= emptyObject,

99 [ "args" .= emptyObject,

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

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

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

100 "headers"

101 "headers"

101 .= object

102 .= object

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

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

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

110 it "works" $ do

111 it "works" $ do

111 let text = "foo" :: Text

112 let text = "foo" :: Text

112 reflected = reflectJSON text

113 reflected = reflectJSON text

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

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

114 (stripFunnyHeaders . stripOrigin) (responseBody r)

115 (stripFunnyHeaders . stripOrigin) (responseBody r)

115 `shouldBe` object

116 `shouldBe` object

116 [ "args" .= emptyObject,

117 [ "args" .= emptyObject,

117 "json" .= text,

118 "json" .= text,

118 "data" .= reflected,

119 "data" .= reflected,

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

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

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

121 "headers"

122 .= object

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

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

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

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

140 ]

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

141+ r <- req POST (httpbin /: "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" .= ("https://httpbun.org/post" :: Text),

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

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

150 "headers"

149 "headers"

151 .= object

150 .= object

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

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

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

167 describe "receiving PATCHed file back" $

166 describe "receiving PATCHed file back" $

168 it "works" $ do

167 it "works" $ do

169 let file :: FilePath

168 let file :: FilePath

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

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

171 contents <- TIO.readFile file

170 contents <- TIO.readFile file

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

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

173 (stripFunnyHeaders . stripOrigin) (responseBody r)

172 (stripFunnyHeaders . stripOrigin) (responseBody r)

174 `shouldBe` object

173 `shouldBe` object

175 [ "args" .= emptyObject,

174 [ "args" .= emptyObject,

176 "json" .= Null,

175 "json" .= Null,

177 "data" .= contents,

176 "data" .= contents,

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

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

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

180 "headers"

178 "headers"

181 .= object

179 .= object

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

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

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

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

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

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

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

197 <> queryFlag "quux"

195 <> queryFlag "quux"

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

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

199 (stripFunnyHeaders . stripOrigin) (responseBody r)

197 (stripFunnyHeaders . stripOrigin) (responseBody r)

200 `shouldBe` object

198 `shouldBe` object

201 [ "args" .= emptyObject,

199 [ "args" .= emptyObject,

202 "json" .= Null,

200 "json" .= Null,

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

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

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

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

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

206 "headers"

203 "headers"

207 .= object

204 .= object

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

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

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

221 responseStatusCode r `shouldBe` 200

218 responseStatusCode r `shouldBe` 200

222 responseStatusMessage r `shouldBe` "OK"

219 responseStatusMessage r `shouldBe` "OK"

223

220

221+ -- TODO /delete

222+

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

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

225− -- it "works" $ do

224+ it "works" $ do

226− -- r <-

225+ r <-

227− -- req

226+ req

228− -- GET

227+ GET

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

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

230− -- NoReqBody

229+ NoReqBody

231− -- bsResponse

230+ bsResponse

232− -- mempty

231+ mempty

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

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

234− -- responseBody r `shouldBe` utf8data

233+ responseBody r `shouldBe` utf8data

235− -- responseStatusCode r `shouldBe` 200

234+ responseStatusCode r `shouldBe` 200

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

235+ responseStatusMessage r `shouldBe` "OK"

236+

237+ -- TODO /gzip

238+ -- TODO /deflate

237

239

238 describe "retrying" $

240 describe "retrying" $

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

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

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

244 prepareForShit $

246 prepareForShit $

245 req

247 req

246 GET

248 GET

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

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

248 NoReqBody

250 NoReqBody

249 ignoreResponse

251 ignoreResponse

250 mempty

252 mempty

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

256 forM_ [400 .. 431] checkStatusCode

258 forM_ [400 .. 431] checkStatusCode

257 forM_ [500 .. 511] checkStatusCode

259 forM_ [500 .. 511] checkStatusCode

258

260

261+ -- TODO /response-headers

262+ -- TODO /redirect

263+

259 describe "redirects" $

264 describe "redirects" $

260 it "follows redirects" $ do

265 it "follows redirects" $ do

261 r <-

266 r <-

262 req

267 req

263 GET

268 GET

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

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

265 NoReqBody

270 NoReqBody

266 ignoreResponse

271 ignoreResponse

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

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

268 responseStatusCode r `shouldBe` 200

273 responseStatusCode r `shouldBe` 200

269 responseStatusMessage r `shouldBe` "OK"

274 responseStatusMessage r `shouldBe` "OK"

270

275

276+ -- TODO /relative-redicet

277+ -- TODO /absolute-redirect

278+ -- TODO /cookies

279+

271 describe "basicAuth" $ do

280 describe "basicAuth" $ do

272 let user, password :: Text

281 let user, password :: Text

273 user = "Scooby"

282 user = "Scooby"

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

278 prepareForShit $

287 prepareForShit $

279 req

288 req

280 GET

289 GET

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

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

282 NoReqBody

291 NoReqBody

283 ignoreResponse

292 ignoreResponse

284 mempty

293 mempty

285 responseStatusCode r `shouldBe` 401

294 responseStatusCode r `shouldBe` 401

286− responseStatusMessage r `shouldBe` "Unauthorized"

295+ responseStatusMessage r `shouldBe` "UNAUTHORIZED"

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

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

288 it "succeeds" $ do

297 it "succeeds" $ do

289 r <-

298 r <-

290 req

299 req

291 GET

300 GET

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

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

293 NoReqBody

302 NoReqBody

294 ignoreResponse

303 ignoreResponse

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

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

296 responseStatusCode r `shouldBe` 200

305 responseStatusCode r `shouldBe` 200

297 responseStatusMessage r `shouldBe` "OK"

306 responseStatusMessage r `shouldBe` "OK"

298

307

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+

299 describe "robots.txt" $

316 describe "robots.txt" $

300 it "works" $ do

317 it "works" $ do

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

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

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

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

303 responseBody r `shouldBe` robots

320 responseBody r `shouldBe` robots

304 responseStatusCode r `shouldBe` 200

321 responseStatusCode r `shouldBe` 200

305 responseStatusMessage r `shouldBe` "OK"

322 responseStatusMessage r `shouldBe` "OK"

306

323

324+ -- TODO /deny

325+ -- TODO /cache

326+

307 describe "getting random bytes" $ do

327 describe "getting random bytes" $ do

308 it "works" $

328 it "works" $

309 property $ \n' -> do

329 property $ \n' -> do

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

312 r <-

332 r <-

313 req

333 req

314 GET

334 GET

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

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

316 NoReqBody

336 NoReqBody

317 lbsResponse

337 lbsResponse

318 mempty

338 mempty

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

328 n = 1000

348 n = 1000

329 req

349 req

330 GET

350 GET

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

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

332 NoReqBody

352 NoReqBody

333 (Proxy :: Proxy (JsonResponse Value))

353 (Proxy :: Proxy (JsonResponse Value))

334 mempty

354 mempty

335 `shouldThrow` selector

355 `shouldThrow` selector

336

356

337−-- describe "streaming random bytes" $

357+ describe "streaming random bytes" $

338−-- it "works" $

358+ it "works" $

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

359+ property $ \n' -> do

340−-- let n :: Word

360+ let n :: Word

341−-- n = getSmall n'

361+ n = getSmall n'

342−-- r <-

362+ r <-

343−-- req

363+ req

344−-- GET

364+ GET

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

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

346−-- NoReqBody

366+ NoReqBody

347−-- bsResponse

367+ bsResponse

348−-- mempty

368+ mempty

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

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

350−-- responseStatusCode r `shouldBe` 200

370+ responseStatusCode r `shouldBe` 200

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

371+ 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

352

381

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

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

354-- Instances

383-- Instances

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

371 where

400 where

372 doit _ _ = error "Oops!"

401 doit _ _ = error "Oops!"

373

402

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

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

375−httpbun :: Url 'Https

404+httpbin :: Url 'Http

376−httpbun = https "httpbun.org"

405+httpbin = http "localhost"

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

377

426

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

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

379-- to depend on that.

428-- to depend on that.

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

383

432

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

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

385stripFunnyHeaders :: Value -> Value

434stripFunnyHeaders :: Value -> Value

386−stripFunnyHeaders (Object m) =

435+stripFunnyHeaders = \case

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 $

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

453+ Aeson.KeyMap.filterWithKey

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

455+ p

388− f value = value

456+ value -> value

389− hs =

457+ where

458+ whitelistedHeaders =

390− [ "Content-Type",

459+ [ "Content-Type",

391− "Accept-Encoding",

460+ "Accept-Encoding",

392− "Host",

393− "Content-Length",

461+ "Content-Length",

394− "Foo",

462+ "Foo",

395− "Baz"

463+ "Baz"

396− ]

464+ ]

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

465+

398−stripFunnyHeaders value = value

399−

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

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

401-- get various response status codes.

467-- get various response status codes.

402checkStatusCode :: Int -> SpecWith ()

468checkStatusCode :: Int -> SpecWith ()

403checkStatusCode code =

469checkStatusCode code =

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

407 prepareForShit $

473 prepareForShit $

408 req

474 req

409 GET

475 GET

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

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

411 NoReqBody

477 NoReqBody

412 ignoreResponse

478 ignoreResponse

413 mempty

479 mempty

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

The content is the same.

req.cabal+35−32

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

1cabal-version: 2.4

2name: req

3−version: 3.13.1

3+version: 3.13.4

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.2.7 ghc ==9.4.4 ghc ==9.6.1

8+tested-with: ghc ==9.6.3 ghc ==9.8.2 ghc ==9.10.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− httpbun-data/utf8.html

16+ httpbin-data/utf8.html

17− httpbun-data/robots.txt

17+ httpbin-data/robots.txt

19extra-doc-files:

20 CHANGELOG.md

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

35 build-depends:

36 aeson >=0.9 && <3,

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

38− base >=4.15 && <5.0,

38+ base >=4.15 && <5,

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

40− bytestring >=0.10.8 && <0.12,

40+ bytestring >=0.10.8 && <0.13,

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

42− containers >=0.5 && <0.7,

42+ containers >=0.5 && <0.8,

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

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

44+ data-default-class >=0.2.0.0,

44 exceptions >=0.6 && <0.11,

45 exceptions >=0.6 && <0.11,

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

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

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

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

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

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

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

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

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

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

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

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

51 mtl >=2.0 && <3.0,

52 mtl >=2.0 && <3.0,

52 retry >=0.8 && <0.10,

53 retry >=0.8 && <0.10,

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

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

54− text >=0.2 && <2.1,

55+ text >=0.2 && <2.2,

55 transformers >=0.5.3.0 && <0.7,

56 transformers >=0.5.3.0 && <0.7,

56 transformers-base,

57 transformers-base,

57 unliftio-core >=0.1.1 && <0.3

58 unliftio-core >=0.1.1 && <0.3

59 if flag(dev)

60 if flag(dev)

61+ ghc-options:

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

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

63+ -Wno-unused-imports

62 else

65 else

63 ghc-options: -O2 -Wall

66 ghc-options: -O2 -Wall

@@ -65,28 +68,28 @@ library

65test-suite pure-tests

68test-suite pure-tests

66 type: exitcode-stdio-1.0

69 type: exitcode-stdio-1.0

67 main-is: Spec.hs

70 main-is: Spec.hs

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

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

69 hs-source-dirs: pure-tests

72 hs-source-dirs: pure-tests

70 other-modules: Network.HTTP.ReqSpec

73 other-modules: Network.HTTP.ReqSpec

71 default-language: GHC2021

74 default-language: GHC2021

72 build-depends:

75 build-depends:

73− QuickCheck >=2.7 && <3.0,

76+ QuickCheck >=2.7 && <3,

74 aeson >=0.9 && <3,

77 aeson >=0.9 && <3,

75 base >=4.15 && <5.0,

78 base >=4.15 && <5.0,

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

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

77− bytestring >=0.10.8 && <0.12,

80+ bytestring >=0.10.8 && <0.13,

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

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

79− hspec >=2.0 && <3.0,

82+ hspec >=2.0 && <3,

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

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

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

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

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

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

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

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

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

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

85 req,

88 req,

86 retry >=0.8 && <0.10,

89 retry >=0.8 && <0.10,

87− template-haskell >=2.14 && <2.21,

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

88− text >=0.2 && <2.1,

91+ text >=0.2 && <2.2,

89− time >=1.2 && <1.13

92+ time >=1.2 && <1.15

91 if flag(dev)

94 if flag(dev)

92 ghc-options:

95 ghc-options:

@@ -96,24 +99,24 @@ test-suite pure-tests

96 else

99 else

97 ghc-options: -O2 -Wall

100 ghc-options: -O2 -Wall

101

99−test-suite httpbun-tests

102+test-suite httpbin-tests

100 type: exitcode-stdio-1.0

103 type: exitcode-stdio-1.0

101 main-is: Spec.hs

104 main-is: Spec.hs

102− build-tool-depends: hspec-discover:hspec-discover >=2.0 && <3.0

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

103− hs-source-dirs: httpbun-tests

106+ hs-source-dirs: httpbin-tests

104 other-modules: Network.HTTP.ReqSpec

107 other-modules: Network.HTTP.ReqSpec

105 default-language: GHC2021

108 default-language: GHC2021

106 build-depends:

109 build-depends:

107− QuickCheck >=2.7 && <3.0,

110+ QuickCheck >=2.7 && <3,

108 aeson >=2 && <3,

111 aeson >=2 && <3,

109− base >=4.15 && <5.0,

112+ base >=4.15 && <5,

110− bytestring >=0.10.8 && <0.12,

113+ bytestring >=0.10.8 && <0.13,

111 hspec >=2.0 && <3.0,

114 hspec >=2.0 && <3.0,

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

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

113− http-types >=0.8 && <10.0,

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

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

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

115 req,

118 req,

116− text >=0.2 && <2.1

119+ text >=0.2 && <2.2

117

120

118 if flag(dev)

121 if flag(dev)

119 ghc-options:

122 ghc-options:

@@ -121,4 +124,4 @@ test-suite httpbun-tests

121 -Wunused-packages

124 -Wunused-packages

122

125

123 else

126 else

124− ghc-options: -O2 -Wall

127+ buildable: False