on 7a53c7b help sign in
12 files changed+149−236
since splitsnapshots
unifiedsplit
.github/workflows/ci.yaml+15−14 .gitignore−1 CHANGELOG.md+1−19 Network/HTTP/Req.hs+9−9 README.md+1−1 Setup.hs+6 cabal.project−4 httpbin-data/robots.txt → httpbun-data/robots.txt httpbin-data/utf8.html → httpbun-data/utf8.html httpbin-tests/Network/HTTP/ReqSpec.hs → httpbun-tests/Network/HTTP/ReqSpec.hs+81−147 httpbin-tests/Spec.hs → httpbun-tests/Spec.hs req.cabal+36−41
.github/workflows/ci.yaml+15−14
@@ -11,25 +11,27 @@ jobs:
1111 ormolu:
1212 runs-on: ubuntu-latest
1313 steps:
14− - uses: actions/checkout@v4
15− - uses: haskell-actions/run-ormolu@v17
14+ - uses: actions/checkout@v3
15+ - uses: haskell-actions/run-ormolu@v12
1616 build:
1717 runs-on: ubuntu-latest
1818 needs: ormolu
1919 strategy:
2020 matrix:
21− cabal: ["3.12"]
22− ghc: ["9.6.3", "9.8.2", "9.10.1"]
21+ cabal: ["3.10"]
22+ ghc: ["9.2.7", "9.4.4", "9.6.1"]
23+ env:
24+ CONFIG: "--enable-tests --enable-benchmarks --flags=dev"
2325 steps:
24− - uses: actions/checkout@v4
25− - uses: haskell-actions/setup@v2
26+ - uses: actions/checkout@v3
27+ - uses: haskell/actions/setup@v2
2628 id: setup-haskell-cabal
2729 with:
2830 ghc-version: ${{ matrix.ghc }}
2931 cabal-version: ${{ matrix.cabal }}
3032 - run: cabal update
31− - run: cabal freeze
32− - uses: actions/cache@v4.2.3
33+ - run: cabal freeze $CONFIG
34+ - uses: actions/cache@v3.3.1
3335 with:
3436 path: |
3537 ${{ steps.setup-haskell-cabal.outputs.cabal-store }}
@@ -38,10 +40,9 @@ jobs:
3840 restore-keys: |
3941 ${{ runner.os }}-${{ matrix.ghc }}-
4042 - run: cabal format && git diff --exit-code --color=always
41− - run: cabal build
42− - run: |
43− docker pull kennethreitz/httpbin
44− docker run -p 1234:80 kennethreitz/httpbin &
45− cabal test
46− - run: cabal haddock
43+ - run: cabal build $CONFIG
44+ - run: cabal test $CONFIG
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' }}
4748 - run: cabal sdist
.gitignore−1
@@ -25,6 +25,5 @@ cabal.project.local
2525cabal.sandbox.config
2626dist-*/
2727dist/
28−hie.yaml
2928stack.yaml
3029stack.yaml.lock
CHANGELOG.md+1−19
@@ -1,20 +1,4 @@
1−## Req 3.13.4
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
1+## Unreleased
182
193* Switched the non-pure test suite to use https://httpbun.org instead of
204 https://httpbin.org since the latter proved to be highly unreliable
@@ -22,8 +6,6 @@
226
237* Switched from `connection` to `crypton-connection`.
248
25−* Builds with GHC 9.6.1.
26−
279## Req 3.13.0
2810
2911* Add `headerRedacted` function to add header fields, which will be with
Network/HTTP/Req.hs+9−9
@@ -236,7 +236,6 @@ import Data.ByteString qualified as B
236236import Data.ByteString.Lazy qualified as BL
237237import Data.CaseInsensitive qualified as CI
238238import Data.Data (Data)
239−import Data.Default.Class (def)
240239import Data.Function (on)
241240import Data.IORef
242241import Data.Kind (Constraint, Type)
@@ -585,10 +584,10 @@ req' method url body options m = do
585584 withReqManager (m request)
586585
587586-- | 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
589588-- 'L.Manager' controls.
590589withReqManager :: (MonadIO m) => (L.Manager -> m a) -> m a
591−withReqManager m = m globalManager
590+withReqManager m = liftIO (readIORef globalManager) >>= m
592591
593592-- | The global 'L.Manager' that 'req' uses. Here we just go with the
594593-- default settings, so users don't need to deal with this manager stuff at
@@ -601,16 +600,16 @@ withReqManager m = m globalManager
601600-- manager. From that moment on the 'IORef' will be just reused—exactly the
602601-- behavior we want here in order to maximize connection sharing. GHC could
603602-- spoil the plan by inlining the definition, hence the @NOINLINE@ pragma.
604−globalManager :: L.Manager
603+globalManager :: IORef L.Manager
605604globalManager = unsafePerformIO $ do
606605 context <- NC.initConnectionContext
607606 let settings =
608607 L.mkManagerSettingsContext
609608 (Just context)
610− def
609+ (NC.TLSSettingsSimple False False False)
611610 Nothing
612611 manager <- L.newManager settings
613− return manager
612+ newIORef manager
614613{-# NOINLINE globalManager #-}
615614
616615----------------------------------------------------------------------------
@@ -716,6 +715,7 @@ data HttpConfig = HttpConfig
716715 -- @since 3.6.0
717716 httpConfigBodyPreviewLength :: forall a. (Num a) => a
718717 }
718+ deriving (Typeable)
719719
720720-- | The default value of 'HttpConfig'.
721721--
@@ -1024,7 +1024,7 @@ instance (HttpMethod method) => RequestComponent (Tagged "method" method) where
10241024-- > -- https://%D1%8E%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4.%D1%80%D1%84
10251025data Url (scheme :: Scheme) = Url Scheme (NonEmpty Text)
10261026 -- 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)
10281028
10291029type role Url nominal
10301030
@@ -2011,7 +2011,7 @@ data HttpException
20112011 | -- | A wrapper with Aeson-produced 'String' describing why decoding
20122012 -- failed
20132013 JsonHttpException String
2014− deriving (Show, Generic)
2014+ deriving (Show, Typeable, Generic)
20152015
20162016instance Exception HttpException
20172017
@@ -2048,4 +2048,4 @@ data Scheme
20482048 Http
20492049 | -- | HTTPS
20502050 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 @@
44[![Hackage](https://img.shields.io/hackage/v/req.svg?style=flat)](https://hackage.haskell.org/package/req)
55[![Stackage Nightly](http://stackage.org/package/req/badge/nightly)](http://stackage.org/nightly/package/req)
66[![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)
88
99* [Related packages](#related-packages)
1010* [Blog posts](#blog-posts)
Setup.hsnew file+6
@@ -0,0 +1,6 @@
1+module Main (main) where
2+
3+import Distribution.Simple
4+
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 @@
11{-# LANGUAGE DataKinds #-}
22{-# LANGUAGE FlexibleInstances #-}
3−{-# LANGUAGE LambdaCase #-}
43{-# LANGUAGE OverloadedStrings #-}
54{-# LANGUAGE RankNTypes #-}
65{-# OPTIONS_GHC -fno-warn-orphans #-}
@@ -24,8 +23,7 @@ import Data.Text.Encoding qualified as T
2423import Data.Text.IO qualified as TIO
2524import Network.HTTP.Client qualified as L
2625import Network.HTTP.Client.MultipartFormData qualified as LM
27−import Network.HTTP.Req hiding (req)
28−import Network.HTTP.Req qualified as Req
26+import Network.HTTP.Req
2927import Network.HTTP.Types qualified as Y
3028import Test.Hspec
3129import Test.QuickCheck
@@ -34,25 +32,25 @@ spec :: Spec
3432spec = do
3533 describe "exception throwing on non-2xx status codes" $
3634 it "throws indeed for non-2xx" $
37− req GET (httpbin /: "foo") NoReqBody ignoreResponse mempty
35+ req GET (httpbun /: "foo") NoReqBody ignoreResponse mempty
3836 `shouldThrow` selector404
3937
4038 describe "exception throwing on non-2xx status codes (Req monad)" $
4139 it "throws indeed for non-2xx" $
4240 asIO . runReq defaultHttpConfig $
4341 liftBaseWith $ \run ->
44− run (req GET (httpbin /: "foo") NoReqBody ignoreResponse mempty)
42+ run (req GET (httpbun /: "foo") NoReqBody ignoreResponse mempty)
4543 `shouldThrow` selector404
4644
4745 describe "response check via httpConfigCheckResponse" $
4846 context "if it's set to always throw" $
4947 it "throws indeed" $
50− blindlyThrowing (req GET httpbin NoReqBody ignoreResponse mempty)
48+ blindlyThrowing (req GET httpbun NoReqBody ignoreResponse mempty)
5149 `shouldThrow` anyException
5250
5351 describe "isStatusCodeException" $
5452 it "extracts non-2xx response" $
55− req GET (httpbin /: "foo") NoReqBody ignoreResponse mempty
53+ req GET (httpbun /: "foo") NoReqBody ignoreResponse mempty
5654 `shouldThrow` selector404ByStatusCodeException
5755
5856 describe "receiving user-agent header back" $
@@ -60,7 +58,7 @@ spec = do
6058 r <-
6159 req
6260 GET
63− (httpbin /: "user-agent")
61+ (httpbun /: "user-agent")
6462 NoReqBody
6563 jsonResponse
6664 (header "user-agent" "Req")
@@ -75,7 +73,7 @@ spec = do
7573 r <-
7674 req
7775 GET
78− (httpbin /: "headers")
76+ (httpbun /: "headers")
7977 NoReqBody
8078 jsonResponse
8179 (header "Foo" "bar" <> header "Baz" "quux")
@@ -93,11 +91,12 @@ spec = do
9391
9492 describe "receiving GET data back" $
9593 it "works" $ do
96− r <- req GET (httpbin /: "get") NoReqBody jsonResponse mempty
94+ r <- req GET (httpbun /: "get") NoReqBody jsonResponse mempty
9795 (stripFunnyHeaders . stripOrigin) (responseBody r)
9896 `shouldBe` object
9997 [ "args" .= emptyObject,
100− "url" .= ("http://localhost:1234/get" :: Text),
98+ "url" .= ("https://httpbun.org/get" :: Text),
99+ "method" .= ("GET" :: Text),
101100 "headers"
102101 .= object
103102 [ "Accept-Encoding" .= ("gzip" :: Text)
@@ -111,13 +110,14 @@ spec = do
111110 it "works" $ do
112111 let text = "foo" :: Text
113112 reflected = reflectJSON text
114− r <- req POST (httpbin /: "post") (ReqBodyJson text) jsonResponse mempty
113+ r <- req POST (httpbun /: "post") (ReqBodyJson text) jsonResponse mempty
115114 (stripFunnyHeaders . stripOrigin) (responseBody r)
116115 `shouldBe` object
117116 [ "args" .= emptyObject,
118117 "json" .= text,
119118 "data" .= reflected,
120− "url" .= ("http://localhost:1234/post" :: Text),
119+ "url" .= ("https://httpbun.org/post" :: Text),
120+ "method" .= ("POST" :: Text),
121121 "headers"
122122 .= object
123123 [ "Content-Type" .= ("application/json; charset=utf-8" :: Text),
@@ -138,14 +138,15 @@ spec = do
138138 [ LM.partBS "foo" "foo data!",
139139 LM.partBS "bar" "bar data!"
140140 ]
141− r <- req POST (httpbin /: "post") body jsonResponse mempty
141+ r <- req POST (httpbun /: "post") body jsonResponse mempty
142142 let contentType = fromJust (getRequestContentType body)
143143 (stripFunnyHeaders . stripOrigin) (responseBody r)
144144 `shouldBe` object
145145 [ "args" .= emptyObject,
146146 "json" .= Null,
147147 "data" .= ("" :: Text),
148− "url" .= ("http://localhost:1234/post" :: Text),
148+ "url" .= ("https://httpbun.org/post" :: Text),
149+ "method" .= ("POST" :: Text),
149150 "headers"
150151 .= object
151152 [ "Content-Type" .= T.decodeUtf8 contentType,
@@ -166,15 +167,16 @@ spec = do
166167 describe "receiving PATCHed file back" $
167168 it "works" $ do
168169 let file :: FilePath
169− file = "httpbin-data/robots.txt"
170+ file = "httpbun-data/robots.txt"
170171 contents <- TIO.readFile file
171− r <- req PATCH (httpbin /: "patch") (ReqBodyFile file) jsonResponse mempty
172+ r <- req PATCH (httpbun /: "patch") (ReqBodyFile file) jsonResponse mempty
172173 (stripFunnyHeaders . stripOrigin) (responseBody r)
173174 `shouldBe` object
174175 [ "args" .= emptyObject,
175176 "json" .= Null,
176177 "data" .= contents,
177− "url" .= ("http://localhost:1234/patch" :: Text),
178+ "url" .= ("https://httpbun.org/patch" :: Text),
179+ "method" .= ("PATCH" :: Text),
178180 "headers"
179181 .= object
180182 [ "Accept-Encoding" .= ("gzip" :: Text),
@@ -193,13 +195,14 @@ spec = do
193195 "foo" =: ("bar" :: Text)
194196 <> "baz" =: (5 :: Int)
195197 <> queryFlag "quux"
196− r <- req PUT (httpbin /: "put") (ReqBodyUrlEnc params) jsonResponse mempty
198+ r <- req PUT (httpbun /: "put") (ReqBodyUrlEnc params) jsonResponse mempty
197199 (stripFunnyHeaders . stripOrigin) (responseBody r)
198200 `shouldBe` object
199201 [ "args" .= emptyObject,
200202 "json" .= Null,
201203 "data" .= ("" :: Text),
202− "url" .= ("http://localhost:1234/put" :: Text),
204+ "url" .= ("https://httpbun.org/put" :: Text),
205+ "method" .= ("PUT" :: Text),
203206 "headers"
204207 .= object
205208 [ "Content-Type" .= ("application/x-www-form-urlencoded" :: Text),
@@ -218,24 +221,19 @@ spec = do
218221 responseStatusCode r `shouldBe` 200
219222 responseStatusMessage r `shouldBe` "OK"
220223
221− -- TODO /delete
222−
223− describe "receiving UTF-8 encoded Unicode data" $
224− it "works" $ do
225− r <-
226− req
227− GET
228− (httpbin /: "encoding" /: "utf8")
229− NoReqBody
230− bsResponse
231− mempty
232− utf8data <- B.readFile "httpbin-data/utf8.html"
233− responseBody r `shouldBe` utf8data
234− responseStatusCode r `shouldBe` 200
235− responseStatusMessage r `shouldBe` "OK"
236−
237− -- TODO /gzip
238− -- TODO /deflate
224+ -- describe "receiving UTF-8 encoded Unicode data" $
225+ -- it "works" $ do
226+ -- r <-
227+ -- req
228+ -- GET
229+ -- (httpbun /: "encoding" /: "utf8")
230+ -- NoReqBody
231+ -- bsResponse
232+ -- mempty
233+ -- utf8data <- B.readFile "httpbun-data/utf8.html"
234+ -- responseBody r `shouldBe` utf8data
235+ -- responseStatusCode r `shouldBe` 200
236+ -- responseStatusMessage r `shouldBe` "OK"
239237
240238 describe "retrying" $
241239 it "retries as many times as specified" $ do
@@ -246,7 +244,7 @@ spec = do
246244 prepareForShit $
247245 req
248246 GET
249− (httpbin /: "status" /~ status)
247+ (httpbun /: "status" /~ status)
250248 NoReqBody
251249 ignoreResponse
252250 mempty
@@ -258,25 +256,18 @@ spec = do
258256 forM_ [400 .. 431] checkStatusCode
259257 forM_ [500 .. 511] checkStatusCode
260258
261− -- TODO /response-headers
262− -- TODO /redirect
263−
264259 describe "redirects" $
265260 it "follows redirects" $ do
266261 r <-
267262 req
268263 GET
269− (httpbin /: "redirect-to")
264+ (httpbun /: "redirect-to")
270265 NoReqBody
271266 ignoreResponse
272− ("url" =: ("https://httpbin.org" :: Text))
267+ ("url" =: ("https://httpbun.org" :: Text))
273268 responseStatusCode r `shouldBe` 200
274269 responseStatusMessage r `shouldBe` "OK"
275270
276− -- TODO /relative-redicet
277− -- TODO /absolute-redirect
278− -- TODO /cookies
279−
280271 describe "basicAuth" $ do
281272 let user, password :: Text
282273 user = "Scooby"
@@ -287,43 +278,32 @@ spec = do
287278 prepareForShit $
288279 req
289280 GET
290− (httpbin /: "basic-auth" /~ user /~ password)
281+ (httpbun /: "basic-auth" /~ user /~ password)
291282 NoReqBody
292283 ignoreResponse
293284 mempty
294285 responseStatusCode r `shouldBe` 401
295− responseStatusMessage r `shouldBe` "UNAUTHORIZED"
286+ responseStatusMessage r `shouldBe` "Unauthorized"
296287 context "when we provide appropriate basic auth data" $
297288 it "succeeds" $ do
298289 r <-
299290 req
300291 GET
301− (httpbin /: "basic-auth" /~ user /~ password)
292+ (httpbun /: "basic-auth" /~ user /~ password)
302293 NoReqBody
303294 ignoreResponse
304− (basicAuthUnsafe (T.encodeUtf8 user) (T.encodeUtf8 password))
295+ (basicAuth (T.encodeUtf8 user) (T.encodeUtf8 password))
305296 responseStatusCode r `shouldBe` 200
306297 responseStatusMessage r `shouldBe` "OK"
307298
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−
316299 describe "robots.txt" $
317300 it "works" $ do
318− r <- req GET (httpbin /: "robots.txt") NoReqBody bsResponse mempty
319− robots <- B.readFile "httpbin-data/robots.txt"
301+ r <- req GET (httpbun /: "robots.txt") NoReqBody bsResponse mempty
302+ robots <- B.readFile "httpbun-data/robots.txt"
320303 responseBody r `shouldBe` robots
321304 responseStatusCode r `shouldBe` 200
322305 responseStatusMessage r `shouldBe` "OK"
323306
324− -- TODO /deny
325− -- TODO /cache
326−
327307 describe "getting random bytes" $ do
328308 it "works" $
329309 property $ \n' -> do
@@ -332,7 +312,7 @@ spec = do
332312 r <-
333313 req
334314 GET
335− (httpbin /: "bytes" /~ n)
315+ (httpbun /: "bytes" /~ n)
336316 NoReqBody
337317 lbsResponse
338318 mempty
@@ -348,36 +328,27 @@ spec = do
348328 n = 1000
349329 req
350330 GET
351− (httpbin /: "bytes" /~ n)
331+ (httpbun /: "bytes" /~ n)
352332 NoReqBody
353333 (Proxy :: Proxy (JsonResponse Value))
354334 mempty
355335 `shouldThrow` selector
356336
357− describe "streaming random bytes" $
358− it "works" $
359− property $ \n' -> do
360− let n :: Word
361− n = getSmall n'
362− r <-
363− req
364− GET
365− (httpbin /: "stream-bytes" /~ n)
366− NoReqBody
367− bsResponse
368− mempty
369− responseBody r `shouldSatisfy` ((== n) . fromIntegral . B.length)
370− responseStatusCode r `shouldBe` 200
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
337+-- describe "streaming random bytes" $
338+-- it "works" $
339+-- property $ \n' -> do
340+-- let n :: Word
341+-- n = getSmall n'
342+-- r <-
343+-- req
344+-- GET
345+-- (httpbun /: "stream-bytes" /~ n)
346+-- NoReqBody
347+-- bsResponse
348+-- mempty
349+-- responseBody r `shouldSatisfy` ((== n) . fromIntegral . B.length)
350+-- responseStatusCode r `shouldBe` 200
351+-- responseStatusMessage r `shouldBe` "OK"
381352
382353----------------------------------------------------------------------------
383354-- Instances
@@ -400,29 +371,9 @@ blindlyThrowing = runReq defaultHttpConfig {httpConfigCheckResponse = doit}
400371 where
401372 doit _ _ = error "Oops!"
402373
403−-- | 'Url' representing <https://httpbin.org>.
404−httpbin :: Url 'Http
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
374+-- | 'Url' representing <https://httpbun.org>.
375+httpbun :: Url 'Https
376+httpbun = https "httpbun.org"
426377
427378-- | Remove “origin” field from JSON value. Origin may change, we don't want
428379-- to depend on that.
@@ -432,38 +383,21 @@ stripOrigin value = value
432383
433384-- | Remove funny headers that might break the tests.
434385stripFunnyHeaders :: Value -> Value
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 $
453− Aeson.KeyMap.filterWithKey
454− (\k _ -> k `elem` whitelistedHeaders)
455− p
456− value -> value
457− where
458− whitelistedHeaders =
459− [ "Content-Type",
460− "Accept-Encoding",
461− "Content-Length",
462− "Foo",
463− "Baz"
464− ]
465−
466−-- | This is a complete test case that makes use of <https://httpbin.org> to
386+stripFunnyHeaders (Object m) =
387+ let f (Object p) = Object $ Aeson.KeyMap.filterWithKey (\k _ -> k `elem` hs) p
388+ f value = value
389+ hs =
390+ [ "Content-Type",
391+ "Accept-Encoding",
392+ "Host",
393+ "Content-Length",
394+ "Foo",
395+ "Baz"
396+ ]
397+ in Object (runIdentity (Aeson.KeyMap.alterF (pure . fmap f) "headers" m))
398+stripFunnyHeaders value = value
399+
400+-- | This is a complete test case that makes use of <https://httpbun.org> to
467401-- get various response status codes.
468402checkStatusCode :: Int -> SpecWith ()
469403checkStatusCode code =
@@ -473,7 +407,7 @@ checkStatusCode code =
473407 prepareForShit $
474408 req
475409 GET
476− (httpbin /: "status" /~ code)
410+ (httpbun /: "status" /~ code)
477411 NoReqBody
478412 ignoreResponse
479413 mempty
httpbin-tests/Spec.hs → httpbun-tests/Spec.hsrenamed

The content is the same.

req.cabal+36−41
@@ -1,11 +1,11 @@
11cabal-version: 2.4
22name: req
3−version: 3.13.4
3+version: 3.13.0
44license: BSD-3-Clause
55license-file: LICENSE.md
66maintainer: Mark Karpov <markkarpov92@gmail.com>
77author: 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
99homepage: https://github.com/mrkkrp/req
1010bug-reports: https://github.com/mrkkrp/req/issues
1111synopsis: HTTP client library
@@ -13,8 +13,8 @@ description: HTTP client library.
1313category: Network, Web
1414build-type: Simple
1515data-files:
16− httpbin-data/utf8.html
17− httpbin-data/robots.txt
16+ httpbun-data/utf8.html
17+ httpbun-data/robots.txt
1818
1919extra-doc-files:
2020 CHANGELOG.md
@@ -35,32 +35,29 @@ library
3535 build-depends:
3636 aeson >=0.9 && <3,
3737 authenticate-oauth >=1.5 && <1.8,
38− base >=4.15 && <5,
38+ base >=4.15 && <5.0,
3939 blaze-builder >=0.3 && <0.5,
40− bytestring >=0.10.8 && <0.13,
40+ bytestring >=0.10.8 && <0.12,
4141 case-insensitive >=0.2 && <1.3,
42− containers >=0.5 && <0.8,
43− crypton-connection >=0.4.2 && <0.5,
44− data-default-class >=0.2.0.0,
42+ containers >=0.5 && <0.7,
43+ crypton-connection >=0.2.2 && <0.4,
4544 exceptions >=0.6 && <0.11,
46− http-api-data >=0.2 && <0.7,
45+ http-api-data >=0.2 && <0.6,
4746 http-client >=0.7.13.1 && <0.8,
4847 http-client-tls >=0.3.2 && <0.4,
49− http-types >=0.8 && <10,
48+ http-types >=0.8 && <10.0,
5049 modern-uri >=0.3 && <0.4,
5150 monad-control >=1.0 && <1.1,
5251 mtl >=2.0 && <3.0,
5352 retry >=0.8 && <0.10,
54− template-haskell >=2.19 && <2.23,
55− text >=0.2 && <2.2,
53+ template-haskell >=2.14 && <2.21,
54+ text >=0.2 && <2.1,
5655 transformers >=0.5.3.0 && <0.7,
5756 transformers-base,
5857 unliftio-core >=0.1.1 && <0.3
5958
6059 if flag(dev)
61− ghc-options:
62− -Wall -Werror -Wpartial-fields -Wunused-packages
63− -Wno-unused-imports
60+ ghc-options: -Wall -Werror -Wpartial-fields -Wunused-packages
6461
6562 else
6663 ghc-options: -O2 -Wall
@@ -68,60 +65,58 @@ library
6865test-suite pure-tests
6966 type: exitcode-stdio-1.0
7067 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
7269 hs-source-dirs: pure-tests
7370 other-modules: Network.HTTP.ReqSpec
7471 default-language: GHC2021
7572 build-depends:
76− QuickCheck >=2.7 && <3,
73+ QuickCheck >=2.7 && <3.0,
7774 aeson >=0.9 && <3,
7875 base >=4.15 && <5.0,
7976 blaze-builder >=0.3 && <0.5,
80− bytestring >=0.10.8 && <0.13,
77+ bytestring >=0.10.8 && <0.12,
8178 case-insensitive >=0.2 && <1.3,
82− hspec >=2.0 && <3,
83− hspec-core >=2.0 && <3,
84− http-api-data >=0.2 && <0.7,
79+ hspec >=2.0 && <3.0,
80+ hspec-core >=2.0 && <3.0,
81+ http-api-data >=0.2 && <0.6,
8582 http-client >=0.7 && <0.8,
86− http-types >=0.8 && <10,
83+ http-types >=0.8 && <10.0,
8784 modern-uri >=0.3 && <0.4,
85+ mtl >=2.0 && <3.0,
8886 req,
8987 retry >=0.8 && <0.10,
90− template-haskell >=2.19 && <2.23,
91− text >=0.2 && <2.2,
92− time >=1.2 && <1.15
88+ template-haskell >=2.14 && <2.21,
89+ text >=0.2 && <2.1,
90+ time >=1.2 && <1.13
9391
9492 if flag(dev)
95− ghc-options:
96− -Wall -Werror -Wredundant-constraints -Wpartial-fields
97− -Wunused-packages
93+ ghc-options: -Wall -Werror
9894
9995 else
10096 ghc-options: -O2 -Wall
10197
102−test-suite httpbin-tests
98+test-suite httpbun-tests
10399 type: exitcode-stdio-1.0
104100 main-is: Spec.hs
105− build-tool-depends: hspec-discover:hspec-discover >=2 && <3
106− hs-source-dirs: httpbin-tests
101+ build-tool-depends: hspec-discover:hspec-discover >=2.0 && <3.0
102+ hs-source-dirs: httpbun-tests
107103 other-modules: Network.HTTP.ReqSpec
108104 default-language: GHC2021
109105 build-depends:
110− QuickCheck >=2.7 && <3,
106+ QuickCheck >=2.7 && <3.0,
111107 aeson >=2 && <3,
112− base >=4.15 && <5,
113− bytestring >=0.10.8 && <0.13,
108+ base >=4.15 && <5.0,
109+ bytestring >=0.10.8 && <0.12,
114110 hspec >=2.0 && <3.0,
115111 http-client >=0.7 && <0.8,
116− http-types >=0.8 && <10,
112+ http-types >=0.8 && <10.0,
117113 monad-control >=1.0 && <1.1,
114+ mtl >=2.0 && <3.0,
118115 req,
119− text >=0.2 && <2.2
116+ text >=0.2 && <2.1
120117
121118 if flag(dev)
122− ghc-options:
123− -Wall -Werror -Wredundant-constraints -Wpartial-fields
124− -Wunused-packages
119+ ghc-options: -Wall -Werror
125120
126121 else
127− buildable: False
122+ ghc-options: -O2 -Wall