4ec1f7b...master · typeable/req

git.iko.soy/typeable/req

on master help sign in

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

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: mrkkrp/ormolu-action@v10

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

16 build:

17 runs-on: ubuntu-latest

18 needs: ormolu

19 strategy:

20 matrix:

21− cabal: ["3.8"]

21+ cabal: ["3.12"]

22− ghc: ["9.0.2", "9.2.5", "9.4.4"]

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

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,7 +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 - 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+26

@@ -1,3 +1,29 @@

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+

17+## Req 3.13.1

18+

19+* 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

21+ lately.

22+

23+* Switched from `connection` to `crypton-connection`.

24+

25+* Builds with GHC 9.6.1.

26+

1## Req 3.13.0

27## Req 3.13.0

3* Add `headerRedacted` function to add header fields, which will be with

29* Add `headerRedacted` function to add header fields, which will be with

Network/HTTP/Req.hs+39−49

@@ -1,19 +1,9 @@

1−{-# LANGUAGE BangPatterns #-}

2{-# LANGUAGE DataKinds #-}

1{-# LANGUAGE DataKinds #-}

3−{-# LANGUAGE DeriveDataTypeable #-}

4−{-# LANGUAGE DeriveGeneric #-}

5−{-# LANGUAGE DeriveLift #-}

6−{-# LANGUAGE FlexibleInstances #-}

7−{-# LANGUAGE GeneralizedNewtypeDeriving #-}

8{-# LANGUAGE LambdaCase #-}

2{-# LANGUAGE LambdaCase #-}

9−{-# LANGUAGE MultiParamTypeClasses #-}

10{-# LANGUAGE OverloadedStrings #-}

3{-# LANGUAGE OverloadedStrings #-}

11{-# LANGUAGE QuasiQuotes #-}

4{-# LANGUAGE QuasiQuotes #-}

12−{-# LANGUAGE RankNTypes #-}

13{-# LANGUAGE RecordWildCards #-}

5{-# LANGUAGE RecordWildCards #-}

14{-# LANGUAGE RoleAnnotations #-}

6{-# LANGUAGE RoleAnnotations #-}

15−{-# LANGUAGE ScopedTypeVariables #-}

16−{-# LANGUAGE StandaloneDeriving #-}

17{-# LANGUAGE TemplateHaskellQuotes #-}

7{-# LANGUAGE TemplateHaskellQuotes #-}

18{-# LANGUAGE TypeFamilies #-}

8{-# LANGUAGE TypeFamilies #-}

19{-# LANGUAGE UndecidableInstances #-}

9{-# LANGUAGE UndecidableInstances #-}

@@ -213,7 +203,7 @@ module Network.HTTP.Req

213 )

203 )

214where

204where

215

205

216−import qualified Blaze.ByteString.Builder as BB

206+import Blaze.ByteString.Builder qualified as BB

217import Control.Applicative

207import Control.Applicative

218import Control.Arrow (first, second)

208import Control.Arrow (first, second)

219import Control.Exception hiding (Handler (..), TypeError)

209import Control.Exception hiding (Handler (..), TypeError)

@@ -229,55 +219,56 @@ import Control.Monad.Trans.Control

229import Control.Monad.Trans.Except (ExceptT)

219import Control.Monad.Trans.Except (ExceptT)

230import Control.Monad.Trans.Identity (IdentityT)

220import Control.Monad.Trans.Identity (IdentityT)

231import Control.Monad.Trans.Maybe (MaybeT)

221import Control.Monad.Trans.Maybe (MaybeT)

232−import qualified Control.Monad.Trans.RWS.CPS as RWS.CPS

222+import Control.Monad.Trans.RWS.CPS qualified as RWS.CPS

233−import qualified Control.Monad.Trans.RWS.Lazy as RWS.Lazy

223+import Control.Monad.Trans.RWS.Lazy qualified as RWS.Lazy

234−import qualified Control.Monad.Trans.RWS.Strict as RWS.Strict

224+import Control.Monad.Trans.RWS.Strict qualified as RWS.Strict

235import Control.Monad.Trans.Select (SelectT)

225import Control.Monad.Trans.Select (SelectT)

236−import qualified Control.Monad.Trans.State.Lazy as State.Lazy

226+import Control.Monad.Trans.State.Lazy qualified as State.Lazy

237−import qualified Control.Monad.Trans.State.Strict as State.Strict

227+import Control.Monad.Trans.State.Strict qualified as State.Strict

238−import qualified Control.Monad.Trans.Writer.CPS as Writer.CPS

228+import Control.Monad.Trans.Writer.CPS qualified as Writer.CPS

239−import qualified Control.Monad.Trans.Writer.Lazy as Writer.Lazy

229+import Control.Monad.Trans.Writer.Lazy qualified as Writer.Lazy

240−import qualified Control.Monad.Trans.Writer.Strict as Writer.Strict

230+import Control.Monad.Trans.Writer.Strict qualified as Writer.Strict

241import Control.Retry

231import Control.Retry

242import Data.Aeson (FromJSON (..), ToJSON (..))

232import Data.Aeson (FromJSON (..), ToJSON (..))

243−import qualified Data.Aeson as A

233+import Data.Aeson qualified as A

244import Data.ByteString (ByteString)

234import Data.ByteString (ByteString)

245−import qualified Data.ByteString as B

235+import Data.ByteString qualified as B

246−import qualified Data.ByteString.Lazy as BL

236+import Data.ByteString.Lazy qualified as BL

247−import qualified Data.CaseInsensitive as CI

237+import Data.CaseInsensitive qualified as CI

248import Data.Data (Data)

238import Data.Data (Data)

239+import Data.Default.Class (def)

249import Data.Function (on)

240import Data.Function (on)

250import Data.IORef

241import Data.IORef

251import Data.Kind (Constraint, Type)

242import Data.Kind (Constraint, Type)

252import Data.List (foldl', nubBy)

243import Data.List (foldl', nubBy)

253import Data.List.NonEmpty (NonEmpty (..))

244import Data.List.NonEmpty (NonEmpty (..))

254−import qualified Data.List.NonEmpty as NE

245+import Data.List.NonEmpty qualified as NE

255import Data.Maybe (fromMaybe)

246import Data.Maybe (fromMaybe)

256import Data.Proxy

247import Data.Proxy

257import Data.Semigroup (Endo (..))

248import Data.Semigroup (Endo (..))

258−import qualified Data.Set as S

249+import Data.Set qualified as S

259import Data.Text (Text)

250import Data.Text (Text)

260−import qualified Data.Text as T

251+import Data.Text qualified as T

261−import qualified Data.Text.Encoding as T

252+import Data.Text.Encoding qualified as T

262import Data.Typeable (Typeable, cast)

253import Data.Typeable (Typeable, cast)

263import GHC.Generics

254import GHC.Generics

264import GHC.TypeLits

255import GHC.TypeLits

265−import qualified Language.Haskell.TH as TH

256+import Language.Haskell.TH qualified as TH

266−import qualified Language.Haskell.TH.Quote as TH

257+import Language.Haskell.TH.Quote qualified as TH

267−import qualified Language.Haskell.TH.Syntax as TH

258+import Language.Haskell.TH.Syntax qualified as TH

268−import qualified Network.Connection as NC

259+import Network.Connection qualified as NC

269−import qualified Network.HTTP.Client as L

260+import Network.HTTP.Client qualified as L

270−import qualified Network.HTTP.Client.Internal as LI

261+import Network.HTTP.Client.Internal qualified as LI

271−import qualified Network.HTTP.Client.MultipartFormData as LM

262+import Network.HTTP.Client.MultipartFormData qualified as LM

272−import qualified Network.HTTP.Client.TLS as L

263+import Network.HTTP.Client.TLS qualified as L

273−import qualified Network.HTTP.Types as Y

264+import Network.HTTP.Types qualified as Y

274import System.IO.Unsafe (unsafePerformIO)

265import System.IO.Unsafe (unsafePerformIO)

275import Text.URI (URI)

266import Text.URI (URI)

276−import qualified Text.URI as URI

267+import Text.URI qualified as URI

277−import qualified Text.URI.QQ as QQ

268+import Text.URI.QQ qualified as QQ

278−import qualified Web.Authenticate.OAuth as OAuth

269+import Web.Authenticate.OAuth qualified as OAuth

279import Web.FormUrlEncoded (FromForm (..), ToForm (..))

270import Web.FormUrlEncoded (FromForm (..), ToForm (..))

280−import qualified Web.FormUrlEncoded as Form

271+import Web.FormUrlEncoded qualified as Form

281import Web.HttpApiData (ToHttpApiData (..))

272import Web.HttpApiData (ToHttpApiData (..))

282

273

283----------------------------------------------------------------------------

274----------------------------------------------------------------------------

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

594 withReqManager (m request)

585 withReqManager (m request)

595

586

596-- | 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

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

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

598-- 'L.Manager' controls.

589-- 'L.Manager' controls.

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

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

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

591+withReqManager m = m globalManager

601

592

602-- | 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

603-- 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

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

610-- 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

611-- 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

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

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

613−globalManager :: IORef L.Manager

604+globalManager :: L.Manager

614globalManager = unsafePerformIO $ do

605globalManager = unsafePerformIO $ do

615 context <- NC.initConnectionContext

606 context <- NC.initConnectionContext

616 let settings =

607 let settings =

617 L.mkManagerSettingsContext

608 L.mkManagerSettingsContext

618 (Just context)

609 (Just context)

619− (NC.TLSSettingsSimple False False False)

610+ def

620 Nothing

611 Nothing

621 manager <- L.newManager settings

612 manager <- L.newManager settings

622− newIORef manager

613+ return manager

623{-# NOINLINE globalManager #-}

614{-# NOINLINE globalManager #-}

624

615

625----------------------------------------------------------------------------

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

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

725 -- @since 3.6.0

716 -- @since 3.6.0

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

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

727 }

718 }

728− deriving (Typeable)

729

719

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

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

731--

721--

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

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

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

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

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

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

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

1037− deriving (Eq, Ord, Show, Data, Typeable, Generic)

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

1038

1028

1039type role Url nominal

1029type role Url nominal

1040

1030

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

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

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

2022 -- failed

2012 -- failed

2023 JsonHttpException String

2013 JsonHttpException String

2024− deriving (Show, Typeable, Generic)

2014+ deriving (Show, Generic)

2025

2015

2026instance Exception HttpException

2016instance Exception HttpException

2027

2017

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

2058 Http

2048 Http

2059 | -- | HTTPS

2049 | -- | HTTPS

2060 Https

2050 Https

2061− 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

httpbin-tests/Network/HTTP/ReqSpec.hs+72−40

@@ -11,21 +11,22 @@ import Control.Exception

11import Control.Monad (forM_)

12import Control.Monad.Trans.Control

13import Data.Aeson (ToJSON (..), Value (..), object, (.=))

14−import qualified Data.Aeson as A

14+import Data.Aeson qualified as A

15−import qualified Data.Aeson.KeyMap as Aeson.KeyMap

15+import Data.Aeson.KeyMap qualified as Aeson.KeyMap

16−import qualified Data.ByteString as B

16+import Data.ByteString qualified as B

17−import qualified Data.ByteString.Lazy as BL

17+import Data.ByteString.Lazy qualified as BL

18import Data.Functor.Identity (runIdentity)

19import Data.Maybe (fromJust)

20import Data.Proxy

21import Data.Text (Text)

22−import qualified Data.Text as T

22+import Data.Text qualified as T

23−import qualified Data.Text.Encoding as T

23+import Data.Text.Encoding qualified as T

24−import qualified Data.Text.IO as TIO

24+import Data.Text.IO qualified as TIO

25−import qualified Network.HTTP.Client as L

25+import Network.HTTP.Client qualified as L

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

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

27−import Network.HTTP.Req

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

28+import Network.HTTP.Req qualified as Req

28−import qualified Network.HTTP.Types as Y

29+import Network.HTTP.Types qualified as Y

29import Test.Hspec

30import Test.Hspec

30import Test.QuickCheck

31import Test.QuickCheck

@@ -84,8 +85,7 @@ spec = do

84 .= object

85 .= object

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

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

86 "Foo" .= ("bar" :: Text),

87 "Foo" .= ("bar" :: Text),

87− "Baz" .= ("quux" :: Text),

88+ "Baz" .= ("quux" :: Text)

88− "Host" .= ("httpbin.org" :: Text)

89 ]

90 ]

91 responseStatusCode r `shouldBe` 200

@@ -97,11 +97,10 @@ spec = do

97 (stripFunnyHeaders . stripOrigin) (responseBody r)

98 `shouldBe` object

99 [ "args" .= emptyObject,

100− "url" .= ("https://httpbin.org/get" :: Text),

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

101 "headers"

102 .= object

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

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

104− "Host" .= ("httpbin.org" :: Text)

105 ]

104 ]

106 ]

105 ]

107 responseHeader r "Content-Type" `shouldBe` return "application/json"

106 responseHeader r "Content-Type" `shouldBe` return "application/json"

@@ -118,12 +117,11 @@ spec = do

118 [ "args" .= emptyObject,

117 [ "args" .= emptyObject,

119 "json" .= text,

118 "json" .= text,

120 "data" .= reflected,

119 "data" .= reflected,

121− "url" .= ("https://httpbin.org/post" :: Text),

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

122 "headers"

121 "headers"

123 .= object

122 .= object

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

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

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

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

126− "Host" .= ("httpbin.org" :: Text),

127 "Content-Length" .= show (T.length reflected)

125 "Content-Length" .= show (T.length reflected)

128 ],

126 ],

129 "files" .= emptyObject,

127 "files" .= emptyObject,

@@ -147,12 +145,11 @@ spec = do

147 [ "args" .= emptyObject,

145 [ "args" .= emptyObject,

148 "json" .= Null,

146 "json" .= Null,

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

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

150− "url" .= ("https://httpbin.org/post" :: Text),

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

151 "headers"

149 "headers"

152 .= object

150 .= object

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

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

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

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

155− "Host" .= ("httpbin.org" :: Text),

156 "Content-Length" .= ("242" :: Text)

153 "Content-Length" .= ("242" :: Text)

157 ],

154 ],

158 "files" .= emptyObject,

155 "files" .= emptyObject,

@@ -177,11 +174,10 @@ spec = do

177 [ "args" .= emptyObject,

174 [ "args" .= emptyObject,

178 "json" .= Null,

175 "json" .= Null,

179 "data" .= contents,

176 "data" .= contents,

180− "url" .= ("https://httpbin.org/patch" :: Text),

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

181 "headers"

178 "headers"

182 .= object

179 .= object

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

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

184− "Host" .= ("httpbin.org" :: Text),

185 "Content-Length" .= show (T.length contents)

181 "Content-Length" .= show (T.length contents)

186 ],

182 ],

187 "files" .= emptyObject,

183 "files" .= emptyObject,

@@ -203,12 +199,11 @@ spec = do

203 [ "args" .= emptyObject,

199 [ "args" .= emptyObject,

204 "json" .= Null,

200 "json" .= Null,

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

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

206− "url" .= ("https://httpbin.org/put" :: Text),

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

207 "headers"

203 "headers"

208 .= object

204 .= object

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

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

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

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

211− "Host" .= ("httpbin.org" :: Text),

212 "Content-Length" .= ("18" :: Text)

207 "Content-Length" .= ("18" :: Text)

213 ],

208 ],

214 "files" .= emptyObject,

209 "files" .= emptyObject,

@@ -306,7 +301,7 @@ spec = do

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

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

307 NoReqBody

302 NoReqBody

308 ignoreResponse

303 ignoreResponse

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

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

310 responseStatusCode r `shouldBe` 200

305 responseStatusCode r `shouldBe` 200

311 responseStatusMessage r `shouldBe` "OK"

306 responseStatusMessage r `shouldBe` "OK"

312

307

@@ -406,8 +401,28 @@ blindlyThrowing = runReq defaultHttpConfig {httpConfigCheckResponse = doit}

406 doit _ _ = error "Oops!"

401 doit _ _ = error "Oops!"

407

402

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

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

409−httpbin :: Url 'Https

404+httpbin :: Url 'Http

410−httpbin = https "httpbin.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

411

426

412-- | 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

413-- to depend on that.

428-- to depend on that.

@@ -417,19 +432,36 @@ stripOrigin value = value

417

432

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

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

419stripFunnyHeaders :: Value -> Value

434stripFunnyHeaders :: Value -> Value

420−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 $

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

453+ Aeson.KeyMap.filterWithKey

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

455+ p

422− f value = value

456+ value -> value

423− hs =

457+ where

458+ whitelistedHeaders =

424− [ "Content-Type",

459+ [ "Content-Type",

425− "Accept-Encoding",

460+ "Accept-Encoding",

426− "Host",

427− "Content-Length",

461+ "Content-Length",

428− "Foo",

462+ "Foo",

429− "Baz"

463+ "Baz"

430− ]

464+ ]

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

432−stripFunnyHeaders value = value

433

465

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

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

435-- get various response status codes.

467-- get various response status codes.

pure-tests/Network/HTTP/ReqSpec.hs+17−17

@@ -13,41 +13,41 @@

14module Network.HTTP.ReqSpec (spec) where

16−import qualified Blaze.ByteString.Builder as BB

16+import Blaze.ByteString.Builder qualified as BB

17import Control.Exception (throwIO)

18import Control.Monad

19import Control.Retry

20import Data.Aeson (ToJSON (..))

21−import qualified Data.Aeson as A

21+import Data.Aeson qualified as A

22import Data.ByteString (ByteString)

23−import qualified Data.ByteString as B

23+import Data.ByteString qualified as B

24−import qualified Data.ByteString.Char8 as B8

24+import Data.ByteString.Char8 qualified as B8

25−import qualified Data.ByteString.Lazy as BL

25+import Data.ByteString.Lazy qualified as BL

26−import qualified Data.CaseInsensitive as CI

26+import Data.CaseInsensitive qualified as CI

27import Data.Either (isRight)

28−import qualified Data.List.NonEmpty as NE

28+import Data.List.NonEmpty qualified as NE

29import Data.Maybe (fromJust, fromMaybe, isJust, isNothing)

30import Data.Proxy

31import Data.Text (Text)

32−import qualified Data.Text as T

32+import Data.Text qualified as T

33−import qualified Data.Text.Encoding as T

33+import Data.Text.Encoding qualified as T

34import Data.Time

35import Data.Typeable (Typeable, eqT)

36import GHC.Exts (IsList (..))

37import GHC.Generics

38−import qualified Language.Haskell.TH as TH

38+import Language.Haskell.TH qualified as TH

39−import qualified Language.Haskell.TH.Quote as TH

39+import Language.Haskell.TH.Quote qualified as TH

40−import qualified Network.HTTP.Client as L

40+import Network.HTTP.Client qualified as L

41import Network.HTTP.Req

42−import qualified Network.HTTP.Types as Y

42+import Network.HTTP.Types qualified as Y

43−import qualified Network.HTTP.Types.Header as Y

43+import Network.HTTP.Types.Header qualified as Y

44import Test.Hspec

45import Test.Hspec.Core.Spec (SpecM)

46import Test.QuickCheck

47import Text.URI (URI)

48−import qualified Text.URI as URI

48+import Text.URI qualified as URI

49−import qualified Text.URI.QQ as QQ

49+import Text.URI.QQ qualified as QQ

50−import qualified Web.FormUrlEncoded as F

50+import Web.FormUrlEncoded qualified as F

52spec :: Spec

53spec = do

req.cabal+40−41

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

1cabal-version: 2.4

2name: req

3−version: 3.13.0

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.0.2 ghc ==9.2.5 ghc ==9.4.4

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

@@ -31,72 +31,70 @@ flag dev

32library

33 exposed-modules: Network.HTTP.Req

34− default-language: Haskell2010

34+ default-language: GHC2021

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.8,

42− connection >=0.2.2 && <0.4,

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

43− containers >=0.5 && <0.7,

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.20,

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

54− text >=0.2 && <2.1,

55+ text >=0.2 && <2.2,

55− time >=1.2 && <1.13,

56 transformers >=0.5.3.0 && <0.7,

57 transformers-base,

58 unliftio-core >=0.1.1 && <0.3

60 if flag(dev)

61− ghc-options: -O0 -Wall -Werror

61+ ghc-options:

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

63+ -Wno-unused-imports

63 else

65 else

64 ghc-options: -O2 -Wall

66 ghc-options: -O2 -Wall

66− if flag(dev)

67− ghc-options:

68− -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns

69− -Wnoncanonical-monad-instances

70−

71test-suite pure-tests

68test-suite pure-tests

72 type: exitcode-stdio-1.0

69 type: exitcode-stdio-1.0

73 main-is: Spec.hs

70 main-is: Spec.hs

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

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

75 hs-source-dirs: pure-tests

72 hs-source-dirs: pure-tests

76 other-modules: Network.HTTP.ReqSpec

73 other-modules: Network.HTTP.ReqSpec

77− default-language: Haskell2010

74+ default-language: GHC2021

78 build-depends:

75 build-depends:

79− QuickCheck >=2.7 && <3.0,

76+ QuickCheck >=2.7 && <3,

80 aeson >=0.9 && <3,

77 aeson >=0.9 && <3,

81 base >=4.15 && <5.0,

78 base >=4.15 && <5.0,

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

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

83− bytestring >=0.10.8 && <0.12,

80+ bytestring >=0.10.8 && <0.13,

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

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

85− hspec >=2.0 && <3.0,

82+ hspec >=2.0 && <3,

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

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

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

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

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

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

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

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

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

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

91− mtl >=2.0 && <3.0,

92 req,

88 req,

93 retry >=0.8 && <0.10,

89 retry >=0.8 && <0.10,

94− template-haskell >=2.14 && <2.20,

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

95− text >=0.2 && <2.1,

91+ text >=0.2 && <2.2,

96− time >=1.2 && <1.13

92+ time >=1.2 && <1.15

98 if flag(dev)

94 if flag(dev)

99− ghc-options: -O0 -Wall -Werror

95+ ghc-options:

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

97+ -Wunused-packages

100

101 else

99 else

102 ghc-options: -O2 -Wall

100 ghc-options: -O2 -Wall

@@ -104,25 +102,26 @@ test-suite pure-tests

104test-suite httpbin-tests

102test-suite httpbin-tests

105 type: exitcode-stdio-1.0

103 type: exitcode-stdio-1.0

106 main-is: Spec.hs

104 main-is: Spec.hs

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

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

108 hs-source-dirs: httpbin-tests

106 hs-source-dirs: httpbin-tests

109 other-modules: Network.HTTP.ReqSpec

107 other-modules: Network.HTTP.ReqSpec

110− default-language: Haskell2010

108+ default-language: GHC2021

111 build-depends:

109 build-depends:

112− QuickCheck >=2.7 && <3.0,

110+ QuickCheck >=2.7 && <3,

113 aeson >=2 && <3,

111 aeson >=2 && <3,

114− base >=4.15 && <5.0,

112+ base >=4.15 && <5,

115− bytestring >=0.10.8 && <0.12,

113+ bytestring >=0.10.8 && <0.13,

116 hspec >=2.0 && <3.0,

114 hspec >=2.0 && <3.0,

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

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

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

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

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

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

120− mtl >=2.0 && <3.0,

121 req,

118 req,

122− text >=0.2 && <2.1

119+ text >=0.2 && <2.2

123

120

124 if flag(dev)

121 if flag(dev)

125− ghc-options: -O0 -Wall -Werror

122+ ghc-options:

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

124+ -Wunused-packages

126

125

127 else

126 else

128− ghc-options: -O2 -Wall

127+ buildable: False