on master help sign in
11 files changed+519−248
since splitsnapshots
unifiedsplit
.github/dependabot.yml+6 .github/workflows/ci.yaml+16−15 .gitignore+1 CHANGELOG.md+55 Network/HTTP/Req.hs+219−68 README.md+1−3 Setup.hs−6 cabal.project+4 httpbin-tests/Network/HTTP/ReqSpec.hs+103−65 pure-tests/Network/HTTP/ReqSpec.hs+53−30 req.cabal+61−61
.github/dependabot.ymlnew file+6
@@ -0,0 +1,6 @@
1+version: 2
2+updates:
3+ - package-ecosystem: "github-actions"
4+ directory: "/"
5+ schedule:
6+ interval: "weekly"
.github/workflows/ci.yaml+16−15
@@ -11,27 +11,25 @@ jobs:
1111 ormolu:
1212 runs-on: ubuntu-latest
1313 steps:
14− - uses: actions/checkout@v2.3.4
15− - uses: mrkkrp/ormolu-action@v1
14+ - uses: actions/checkout@v4
15+ - uses: haskell-actions/run-ormolu@v17
1616 build:
1717 runs-on: ubuntu-latest
1818 needs: ormolu
1919 strategy:
2020 matrix:
21− cabal: ["3.2"]
22− ghc: ["8.6.5", "8.8.4", "8.10.3"]
23− env:
24− CONFIG: "--enable-tests --enable-benchmarks --flags=dev"
21+ cabal: ["3.12"]
22+ ghc: ["9.6.3", "9.8.2", "9.10.1"]
2523 steps:
26− - uses: actions/checkout@v2.3.4
27− - uses: haskell/actions/setup@v1.1.5
24+ - uses: actions/checkout@v4
25+ - uses: haskell-actions/setup@v2
2826 id: setup-haskell-cabal
2927 with:
3028 ghc-version: ${{ matrix.ghc }}
3129 cabal-version: ${{ matrix.cabal }}
32− - run: cabal v2-update
33− - run: cabal v2-freeze $CONFIG
34− - uses: actions/cache@v2.1.3
30+ - run: cabal update
31+ - run: cabal freeze
32+ - uses: actions/cache@v4.2.3
3533 with:
3634 path: |
3735 ${{ steps.setup-haskell-cabal.outputs.cabal-store }}
@@ -40,7 +38,10 @@ jobs:
4038 restore-keys: |
4139 ${{ runner.os }}-${{ matrix.ghc }}-
4240 - run: cabal format && git diff --exit-code --color=always
43− - run: cabal v2-build $CONFIG
44− - run: cabal v2-test $CONFIG
45− - run: cabal v2-haddock $CONFIG
46− - run: cabal v2-sdist
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
47+ - run: cabal sdist
.gitignore+1
@@ -25,5 +25,6 @@ cabal.project.local
2525cabal.sandbox.config
2626dist-*/
2727dist/
28+hie.yaml
2829stack.yaml
2930stack.yaml.lock
CHANGELOG.md+55
@@ -1,3 +1,58 @@
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
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+
27+## Req 3.13.0
28+
29+* Add `headerRedacted` function to add header fields, which will be with
30+ redacted values on print.
31+
32+## Req 3.12.0
33+
34+* Add `isStatusCodeException` function.
35+* Add `instance HttpResponse (Network.HTTP.Client.Response ())`.
36+
37+## Req 3.11.0
38+
39+* Add the `queryParamToList` method to the `QueryParam` type class.
40+* Add the `formToQuery` function. [Issue 126](https://github.com/mrkkrp/req/issues/126).
41+* Add `FromForm` instances (in the `Web.FormUrlEncoded` module) to the
42+ `Option` and `FormUrlEncodedParam` types.
43+
44+## Req 3.10.0
45+
46+* Add `MonadHttp` instances for `transformers` types.
47+
48+## Req 3.9.2
49+
50+* The test suite works with `aeson-2.x.x.x`.
51+
52+## Req 3.9.1
53+
54+* Builds with GHC 9.0.
55+
156## Req 3.9.0
257
358* The `useHttpURI` and `useHttpsURI` functions now preserve trailing
Network/HTTP/Req.hs+219−68
@@ -1,20 +1,9 @@
1−{-# LANGUAGE BangPatterns #-}
2−{-# LANGUAGE CPP #-}
31{-# LANGUAGE DataKinds #-}
4−{-# LANGUAGE DeriveDataTypeable #-}
5−{-# LANGUAGE DeriveGeneric #-}
6−{-# LANGUAGE DeriveLift #-}
7−{-# LANGUAGE FlexibleInstances #-}
8−{-# LANGUAGE GeneralizedNewtypeDeriving #-}
92{-# LANGUAGE LambdaCase #-}
10−{-# LANGUAGE MultiParamTypeClasses #-}
113{-# LANGUAGE OverloadedStrings #-}
124{-# LANGUAGE QuasiQuotes #-}
13−{-# LANGUAGE RankNTypes #-}
145{-# LANGUAGE RecordWildCards #-}
156{-# LANGUAGE RoleAnnotations #-}
16−{-# LANGUAGE ScopedTypeVariables #-}
17−{-# LANGUAGE StandaloneDeriving #-}
187{-# LANGUAGE TemplateHaskellQuotes #-}
198{-# LANGUAGE TypeFamilies #-}
209{-# LANGUAGE UndecidableInstances #-}
@@ -155,11 +144,13 @@ module Network.HTTP.Req
155144 -- $query-parameters
156145 (=:),
157146 queryFlag,
147+ formToQuery,
158148 QueryParam (..),
159149
160150 -- *** Headers
161151 header,
162152 attachHeader,
153+ headerRedacted,
163154
164155 -- *** Cookies
165156 -- $cookies
@@ -206,58 +197,78 @@ module Network.HTTP.Req
206197
207198 -- * Other
208199 HttpException (..),
200+ isStatusCodeException,
209201 CanHaveBody (..),
210202 Scheme (..),
211203 )
212204where
213205
214−import qualified Blaze.ByteString.Builder as BB
206+import Blaze.ByteString.Builder qualified as BB
215207import Control.Applicative
216208import Control.Arrow (first, second)
217209import Control.Exception hiding (Handler (..), TypeError)
210+import Control.Monad (guard, void, (>=>))
218211import Control.Monad.Base
219212import Control.Monad.Catch (Handler (..), MonadCatch, MonadMask, MonadThrow)
220213import Control.Monad.IO.Class
221214import Control.Monad.IO.Unlift
222−import Control.Monad.Reader
215+import Control.Monad.Reader (ReaderT (ReaderT), ask, lift, runReaderT)
216+import Control.Monad.Trans.Accum (AccumT)
217+import Control.Monad.Trans.Cont (ContT)
223218import Control.Monad.Trans.Control
219+import Control.Monad.Trans.Except (ExceptT)
220+import Control.Monad.Trans.Identity (IdentityT)
221+import Control.Monad.Trans.Maybe (MaybeT)
222+import Control.Monad.Trans.RWS.CPS qualified as RWS.CPS
223+import Control.Monad.Trans.RWS.Lazy qualified as RWS.Lazy
224+import Control.Monad.Trans.RWS.Strict qualified as RWS.Strict
225+import Control.Monad.Trans.Select (SelectT)
226+import Control.Monad.Trans.State.Lazy qualified as State.Lazy
227+import Control.Monad.Trans.State.Strict qualified as State.Strict
228+import Control.Monad.Trans.Writer.CPS qualified as Writer.CPS
229+import Control.Monad.Trans.Writer.Lazy qualified as Writer.Lazy
230+import Control.Monad.Trans.Writer.Strict qualified as Writer.Strict
224231import Control.Retry
225232import Data.Aeson (FromJSON (..), ToJSON (..))
226−import qualified Data.Aeson as A
233+import Data.Aeson qualified as A
227234import Data.ByteString (ByteString)
228−import qualified Data.ByteString as B
229−import qualified Data.ByteString.Lazy as BL
230−import qualified Data.CaseInsensitive as CI
235+import Data.ByteString qualified as B
236+import Data.ByteString.Lazy qualified as BL
237+import Data.CaseInsensitive qualified as CI
231238import Data.Data (Data)
239+import Data.Default.Class (def)
232240import Data.Function (on)
233241import Data.IORef
234242import Data.Kind (Constraint, Type)
235243import Data.List (foldl', nubBy)
236244import Data.List.NonEmpty (NonEmpty (..))
237−import qualified Data.List.NonEmpty as NE
245+import Data.List.NonEmpty qualified as NE
238246import Data.Maybe (fromMaybe)
239247import Data.Proxy
240−import Data.Semigroup hiding (Option, option)
248+import Data.Semigroup (Endo (..))
249+import Data.Set qualified as S
241250import Data.Text (Text)
242−import qualified Data.Text as T
243−import qualified Data.Text.Encoding as T
251+import Data.Text qualified as T
252+import Data.Text.Encoding qualified as T
244253import Data.Typeable (Typeable, cast)
245254import GHC.Generics
246255import GHC.TypeLits
247−import qualified Language.Haskell.TH as TH
248−import qualified Language.Haskell.TH.Quote as TH
249−import qualified Language.Haskell.TH.Syntax as TH
250−import qualified Network.Connection as NC
251−import qualified Network.HTTP.Client as L
252−import qualified Network.HTTP.Client.Internal as LI
253−import qualified Network.HTTP.Client.MultipartFormData as LM
254−import qualified Network.HTTP.Client.TLS as L
255−import qualified Network.HTTP.Types as Y
256+import Language.Haskell.TH qualified as TH
257+import Language.Haskell.TH.Quote qualified as TH
258+import Language.Haskell.TH.Syntax qualified as TH
259+import Network.Connection qualified as NC
260+import Network.HTTP.Client qualified as L
261+import Network.HTTP.Client.Internal qualified as LI
262+import Network.HTTP.Client.MultipartFormData qualified as LM
263+import Network.HTTP.Client.TLS qualified as L
264+import Network.HTTP.Types qualified as Y
256265import System.IO.Unsafe (unsafePerformIO)
257266import Text.URI (URI)
258−import qualified Text.URI as URI
259−import qualified Text.URI.QQ as QQ
260−import qualified Web.Authenticate.OAuth as OAuth
267+import Text.URI qualified as URI
268+import Text.URI.QQ qualified as QQ
269+import Web.Authenticate.OAuth qualified as OAuth
270+import Web.FormUrlEncoded (FromForm (..), ToForm (..))
271+import Web.FormUrlEncoded qualified as Form
261272import Web.HttpApiData (ToHttpApiData (..))
262273
263274----------------------------------------------------------------------------
@@ -478,7 +489,7 @@ reqCb method url body responseProxy options adjustRequest =
478489--
479490-- @since 3.7.0
480491reqHandler ::
481− MonadHttp m =>
492+ (MonadHttp m) =>
482493 -- | How to get final result from a 'L.Response'
483494 (L.Response L.BodyReader -> IO b) ->
484495 -- | 'L.Request' to perform
@@ -574,10 +585,10 @@ req' method url body options m = do
574585 withReqManager (m request)
575586
576587-- | Perform an action using the global implicit 'L.Manager' that the rest
577−-- of the library uses. This allows to reuse connections that the
588+-- of the library uses. This allows us to reuse connections that the
578589-- 'L.Manager' controls.
579−withReqManager :: MonadIO m => (L.Manager -> m a) -> m a
580−withReqManager m = liftIO (readIORef globalManager) >>= m
590+withReqManager :: (MonadIO m) => (L.Manager -> m a) -> m a
591+withReqManager m = m globalManager
581592
582593-- | The global 'L.Manager' that 'req' uses. Here we just go with the
583594-- default settings, so users don't need to deal with this manager stuff at
@@ -590,16 +601,16 @@ withReqManager m = liftIO (readIORef globalManager) >>= m
590601-- manager. From that moment on the 'IORef' will be just reused—exactly the
591602-- behavior we want here in order to maximize connection sharing. GHC could
592603-- spoil the plan by inlining the definition, hence the @NOINLINE@ pragma.
593−globalManager :: IORef L.Manager
604+globalManager :: L.Manager
594605globalManager = unsafePerformIO $ do
595606 context <- NC.initConnectionContext
596607 let settings =
597608 L.mkManagerSettingsContext
598609 (Just context)
599− (NC.TLSSettingsSimple False False False)
610+ def
600611 Nothing
601612 manager <- L.newManager settings
602− newIORef manager
613+ return manager
603614{-# NOINLINE globalManager #-}
604615
605616----------------------------------------------------------------------------
@@ -619,7 +630,7 @@ globalManager = unsafePerformIO $ do
619630-- | A type class for monads that support performing HTTP requests.
620631-- Typically, you only need to define the 'handleHttpException' method
621632-- unless you want to tweak 'HttpConfig'.
622−class MonadIO m => MonadHttp m where
633+class (MonadIO m) => MonadHttp m where
623634 -- | This method describes how to deal with 'HttpException' that was
624635 -- caught by the library. One option is to re-throw it if you are OK with
625636 -- exceptions, but if you prefer working with something like
@@ -680,8 +691,8 @@ data HttpConfig = HttpConfig
680691 -- | The retry policy to use for request retrying. By default 'def' is
681692 -- used (see 'RetryPolicyM').
682693 --
683− -- __Note__: signature of this function was changed in the version
684− -- /1.0.0/.
694+ -- __Note__: signature of this function was changed to disallow 'IO' in
695+ -- version /1.0.0/ and then changed back to its current form in /3.1.0/.
685696 --
686697 -- @since 0.3.0
687698 httpConfigRetryPolicy :: RetryPolicyM IO,
@@ -703,9 +714,8 @@ data HttpConfig = HttpConfig
703714 -- | Max length of preview fragment of response body.
704715 --
705716 -- @since 3.6.0
706− httpConfigBodyPreviewLength :: forall a. Num a => a
717+ httpConfigBodyPreviewLength :: forall a. (Num a) => a
707718 }
708− deriving (Typeable)
709719
710720-- | The default value of 'HttpConfig'.
711721--
@@ -787,12 +797,87 @@ instance MonadHttp Req where
787797 handleHttpException = Req . lift . throwIO
788798 getHttpConfig = Req ask
789799
800+-- | @since 3.10.0
801+instance (MonadHttp m, Monoid w) => MonadHttp (AccumT w m) where
802+ handleHttpException = lift . handleHttpException
803+ getHttpConfig = lift getHttpConfig
804+
805+-- | @since 3.10.0
806+instance (MonadHttp m) => MonadHttp (ContT r m) where
807+ handleHttpException = lift . handleHttpException
808+ getHttpConfig = lift getHttpConfig
809+
810+-- | @since 3.10.0
811+instance (MonadHttp m) => MonadHttp (ExceptT e m) where
812+ handleHttpException = lift . handleHttpException
813+ getHttpConfig = lift getHttpConfig
814+
815+-- | @since 3.10.0
816+instance (MonadHttp m) => MonadHttp (IdentityT m) where
817+ handleHttpException = lift . handleHttpException
818+ getHttpConfig = lift getHttpConfig
819+
820+-- | @since 3.10.0
821+instance (MonadHttp m) => MonadHttp (MaybeT m) where
822+ handleHttpException = lift . handleHttpException
823+ getHttpConfig = lift getHttpConfig
824+
825+-- | @since 3.10.0
826+instance (MonadHttp m) => MonadHttp (ReaderT r m) where
827+ handleHttpException = lift . handleHttpException
828+ getHttpConfig = lift getHttpConfig
829+
830+-- | @since 3.10.0
831+instance (MonadHttp m, Monoid w) => MonadHttp (RWS.CPS.RWST r w s m) where
832+ handleHttpException = lift . handleHttpException
833+ getHttpConfig = lift getHttpConfig
834+
835+-- | @since 3.10.0
836+instance (MonadHttp m, Monoid w) => MonadHttp (RWS.Lazy.RWST r w s m) where
837+ handleHttpException = lift . handleHttpException
838+ getHttpConfig = lift getHttpConfig
839+
840+-- | @since 3.10.0
841+instance (MonadHttp m, Monoid w) => MonadHttp (RWS.Strict.RWST r w s m) where
842+ handleHttpException = lift . handleHttpException
843+ getHttpConfig = lift getHttpConfig
844+
845+-- | @since 3.10.0
846+instance (MonadHttp m) => MonadHttp (SelectT r m) where
847+ handleHttpException = lift . handleHttpException
848+ getHttpConfig = lift getHttpConfig
849+
850+-- | @since 3.10.0
851+instance (MonadHttp m) => MonadHttp (State.Lazy.StateT s m) where
852+ handleHttpException = lift . handleHttpException
853+ getHttpConfig = lift getHttpConfig
854+
855+-- | @since 3.10.0
856+instance (MonadHttp m) => MonadHttp (State.Strict.StateT s m) where
857+ handleHttpException = lift . handleHttpException
858+ getHttpConfig = lift getHttpConfig
859+
860+-- | @since 3.10.0
861+instance (MonadHttp m, Monoid w) => MonadHttp (Writer.CPS.WriterT w m) where
862+ handleHttpException = lift . handleHttpException
863+ getHttpConfig = lift getHttpConfig
864+
865+-- | @since 3.10.0
866+instance (MonadHttp m, Monoid w) => MonadHttp (Writer.Lazy.WriterT w m) where
867+ handleHttpException = lift . handleHttpException
868+ getHttpConfig = lift getHttpConfig
869+
870+-- | @since 3.10.0
871+instance (MonadHttp m, Monoid w) => MonadHttp (Writer.Strict.WriterT w m) where
872+ handleHttpException = lift . handleHttpException
873+ getHttpConfig = lift getHttpConfig
874+
790875-- | Run a computation in the 'Req' monad with the given 'HttpConfig'. In
791876-- the case of an exceptional situation an 'HttpException' will be thrown.
792877--
793878-- @since 0.4.0
794879runReq ::
795− MonadIO m =>
880+ (MonadIO m) =>
796881 -- | 'HttpConfig' to use
797882 HttpConfig ->
798883 -- | Computation to run
@@ -897,7 +982,7 @@ class HttpMethod a where
897982 -- | Return name of the method as a 'ByteString'.
898983 httpMethodName :: Proxy a -> ByteString
899984
900−instance HttpMethod method => RequestComponent (Tagged "method" method) where
985+instance (HttpMethod method) => RequestComponent (Tagged "method" method) where
901986 getRequestMod _ = Endo $ \x ->
902987 x {L.method = httpMethodName (Proxy :: Proxy method)}
903988
@@ -939,23 +1024,20 @@ instance HttpMethod method => RequestComponent (Tagged "method" method) where
9391024-- > -- https://%D1%8E%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4.%D1%80%D1%84
9401025data Url (scheme :: Scheme) = Url Scheme (NonEmpty Text)
9411026 -- NOTE The second value is the path segments in reversed order.
942− deriving (Eq, Ord, Show, Data, Typeable, Generic)
1027+ deriving (Eq, Ord, Show, Data, Generic)
9431028
9441029type role Url nominal
9451030
9461031-- With template-haskell >=2.15 and text >=1.2.4 Lift can be derived, however
9471032-- the derived lift forgets the type of the scheme.
948−instance Typeable scheme => TH.Lift (Url scheme) where
1033+instance (Typeable scheme) => TH.Lift (Url scheme) where
9491034 lift url =
9501035 TH.dataToExpQ (fmap liftText . cast) url `TH.sigE` case url of
9511036 Url Http _ -> [t|Url 'Http|]
9521037 Url Https _ -> [t|Url 'Https|]
9531038 where
9541039 liftText t = TH.AppE (TH.VarE 'T.pack) <$> TH.lift (T.unpack t)
955−
956−#if MIN_VERSION_template_haskell(2,16,0)
957− liftTyped url = TH.TExp <$> TH.lift url
958−#endif
1040+ liftTyped = TH.Code . TH.unsafeTExpCoerce . TH.lift
9591041
9601042-- | Given host name, produce a 'Url' which has “http” as its scheme and
9611043-- empty path. This also sets port to @80@.
@@ -971,7 +1053,7 @@ https = Url Https . pure
9711053-- path segment can be of any type that is an instance of 'ToHttpApiData'.
9721054infixl 5 /~
9731055
974−(/~) :: ToHttpApiData a => Url scheme -> a -> Url scheme
1056+(/~) :: (ToHttpApiData a) => Url scheme -> a -> Url scheme
9751057Url secure path /~ segment = Url secure (NE.cons (toUrlPiece segment) path)
9761058
9771059-- | A type-constrained version of @('/~')@ to remove ambiguity in the cases
@@ -1159,7 +1241,7 @@ instance HttpBody NoReqBody where
11591241-- charset=utf-8\"@ value.
11601242newtype ReqBodyJson a = ReqBodyJson a
11611243
1162−instance ToJSON a => HttpBody (ReqBodyJson a) where
1244+instance (ToJSON a) => HttpBody (ReqBodyJson a) where
11631245 getRequestBody (ReqBodyJson a) = L.RequestBodyLBS (A.encode a)
11641246 getRequestContentType _ = pure "application/json; charset=utf-8"
11651247
@@ -1212,6 +1294,13 @@ newtype FormUrlEncodedParam = FormUrlEncodedParam [(Text, Maybe Text)]
12121294instance QueryParam FormUrlEncodedParam where
12131295 queryParam name mvalue =
12141296 FormUrlEncodedParam [(name, toQueryParam <$> mvalue)]
1297+ queryParamToList (FormUrlEncodedParam p) = p
1298+
1299+-- | Use 'formToQuery'.
1300+--
1301+-- @since 3.11.0
1302+instance FromForm FormUrlEncodedParam where
1303+ fromForm = Right . formToQuery
12151304
12161305-- | Multipart form data. Please consult the
12171306-- "Network.HTTP.Client.MultipartFormData" module for how to construct
@@ -1251,7 +1340,7 @@ instance HttpBody ReqBodyMultipart where
12511340-- | Create 'ReqBodyMultipart' request body from a collection of 'LM.Part's.
12521341--
12531342-- @since 0.2.0
1254−reqBodyMultipart :: MonadIO m => [LM.Part] -> m ReqBodyMultipart
1343+reqBodyMultipart :: (MonadIO m) => [LM.Part] -> m ReqBodyMultipart
12551344reqBodyMultipart parts = liftIO $ do
12561345 boundary <- LM.webkitBoundary
12571346 body <- LM.renderParts boundary parts
@@ -1291,7 +1380,7 @@ type family
12911380 TypeError
12921381 ('Text "This HTTP method does not allow attaching a request body.")
12931382
1294−instance HttpBody body => RequestComponent (Tagged "body" body) where
1383+instance (HttpBody body) => RequestComponent (Tagged "body" body) where
12951384 getRequestMod (Tagged body) = Endo $ \x ->
12961385 x
12971386 { L.requestBody = getRequestBody body,
@@ -1337,6 +1426,12 @@ instance Monoid (Option scheme) where
13371426 mempty = Option mempty Nothing
13381427 mappend = (<>)
13391428
1429+-- | Use 'formToQuery'.
1430+--
1431+-- @since 3.11.0
1432+instance FromForm (Option scheme) where
1433+ fromForm = Right . formToQuery
1434+
13401435-- | A helper to create an 'Option' that modifies only collection of query
13411436-- parameters. This helper is not a part of the public API.
13421437withQueryParams :: (Y.QueryText -> Y.QueryText) -> Option scheme
@@ -1355,7 +1450,7 @@ instance RequestComponent (Option scheme) where
13551450
13561451-- | Finalize given 'L.Request' by applying a finalizer from the given
13571452-- 'Option' (if it has any).
1358−finalizeRequest :: MonadIO m => Option scheme -> L.Request -> m L.Request
1453+finalizeRequest :: (MonadIO m) => Option scheme -> L.Request -> m L.Request
13591454finalizeRequest (Option _ mfinalizer) = liftIO . fromMaybe pure mfinalizer
13601455
13611456----------------------------------------------------------------------------
@@ -1388,9 +1483,27 @@ name =: value = queryParam name (pure value)
13881483-- This operator is defined in terms of 'queryParam':
13891484--
13901485-- > queryFlag name = queryParam name (Nothing :: Maybe ())
1391−queryFlag :: QueryParam param => Text -> param
1486+queryFlag :: (QueryParam param) => Text -> param
13921487queryFlag name = queryParam name (Nothing :: Maybe ())
13931488
1489+-- | Construct query parameters from a 'ToForm' instance. This function
1490+-- produces the same query params as 'Form.urlEncodeAsFormStable'.
1491+--
1492+-- Note that 'Form.Form' doesn't have the concept of parameters with the
1493+-- empty value (i.e. what you can get by @key =: ""@). If the value is
1494+-- empty, it will be encoded as a valueless parameter (i.e. what you can get
1495+-- by @queryFlag key@).
1496+--
1497+-- @since 3.11.0
1498+formToQuery :: (QueryParam param, Monoid param, ToForm f) => f -> param
1499+formToQuery f = mconcat . fmap toParam . Form.toListStable $ toForm f
1500+ where
1501+ toParam (key, val) =
1502+ queryParam key $
1503+ if val == ""
1504+ then Nothing
1505+ else Just val
1506+
13941507-- | A type class for query-parameter-like things. The reason to have an
13951508-- overloaded 'queryParam' is to be able to use it as an 'Option' and as a
13961509-- 'FormUrlEncodedParam' when constructing form URL encoded request bodies.
@@ -1400,11 +1513,17 @@ class QueryParam param where
14001513 -- 'Nothing', it won't be included at all (i.e. you create a flag this
14011514 -- way). It's recommended to use @('=:')@ and 'queryFlag' instead of this
14021515 -- method, because they are easier to read.
1403− queryParam :: ToHttpApiData a => Text -> Maybe a -> param
1516+ queryParam :: (ToHttpApiData a) => Text -> Maybe a -> param
1517+
1518+ -- | Get the query parameter names and values set by 'queryParam'.
1519+ --
1520+ -- @since 3.11.0
1521+ queryParamToList :: param -> [(Text, Maybe Text)]
14041522
14051523instance QueryParam (Option scheme) where
14061524 queryParam name mvalue =
14071525 withQueryParams ((:) (name, toQueryParam <$> mvalue))
1526+ queryParamToList (Option f _) = fst $ appEndo f ([], L.defaultRequest)
14081527
14091528----------------------------------------------------------------------------
14101529-- Request—Optional parameters—Headers
@@ -1428,6 +1547,14 @@ attachHeader :: ByteString -> ByteString -> L.Request -> L.Request
14281547attachHeader name value x =
14291548 x {L.requestHeaders = (CI.mk name, value) : L.requestHeaders x}
14301549
1550+-- | Same as 'header', but with redacted values on print.
1551+--
1552+-- @since 3.13.0
1553+headerRedacted :: ByteString -> ByteString -> Option scheme
1554+headerRedacted name value = withRequest $ \x ->
1555+ let y = attachHeader name value x
1556+ in y {L.redactHeaders = CI.mk name `S.insert` L.redactHeaders y}
1557+
14311558----------------------------------------------------------------------------
14321559-- Request—Optional parameters—Cookies
14331560
@@ -1635,7 +1762,7 @@ ignoreResponse = Proxy
16351762newtype JsonResponse a = JsonResponse (L.Response a)
16361763 deriving (Show)
16371764
1638−instance FromJSON a => HttpResponse (JsonResponse a) where
1765+instance (FromJSON a) => HttpResponse (JsonResponse a) where
16391766 type HttpResponseBody (JsonResponse a) = a
16401767 toVanillaResponse (JsonResponse r) = r
16411768 getHttpResponse r = do
@@ -1751,14 +1878,14 @@ brReadN br n = go 0 id id
17511878
17521879-- | Get the response body.
17531880responseBody ::
1754− HttpResponse response =>
1881+ (HttpResponse response) =>
17551882 response ->
17561883 HttpResponseBody response
17571884responseBody = L.responseBody . toVanillaResponse
17581885
17591886-- | Get the response status code.
17601887responseStatusCode ::
1761− HttpResponse response =>
1888+ (HttpResponse response) =>
17621889 response ->
17631890 Int
17641891responseStatusCode =
@@ -1766,7 +1893,7 @@ responseStatusCode =
17661893
17671894-- | Get the response status message.
17681895responseStatusMessage ::
1769− HttpResponse response =>
1896+ (HttpResponse response) =>
17701897 response ->
17711898 ByteString
17721899responseStatusMessage =
@@ -1774,7 +1901,7 @@ responseStatusMessage =
17741901
17751902-- | Lookup a particular header from a response.
17761903responseHeader ::
1777− HttpResponse response =>
1904+ (HttpResponse response) =>
17781905 -- | Response interpretation
17791906 response ->
17801907 -- | Header to lookup
@@ -1786,7 +1913,7 @@ responseHeader r h =
17861913
17871914-- | Get the response 'L.CookieJar'.
17881915responseCookieJar ::
1789− HttpResponse response =>
1916+ (HttpResponse response) =>
17901917 response ->
17911918 L.CookieJar
17921919responseCookieJar = L.responseCookieJar . toVanillaResponse
@@ -1840,6 +1967,16 @@ class HttpResponse response where
18401967 acceptHeader :: Proxy response -> Maybe ByteString
18411968 acceptHeader Proxy = Nothing
18421969
1970+-- | This instance has been added to make it easier to inspect 'L.Response'
1971+-- using Req's functions like 'responseStatusCode', 'responseStatusMessage',
1972+-- etc.
1973+--
1974+-- @since 3.12.0
1975+instance HttpResponse (L.Response ()) where
1976+ type HttpResponseBody (L.Response ()) = ()
1977+ toVanillaResponse = id
1978+ getHttpResponse = return . void
1979+
18431980----------------------------------------------------------------------------
18441981-- Other
18451982
@@ -1874,10 +2011,24 @@ data HttpException
18742011 | -- | A wrapper with Aeson-produced 'String' describing why decoding
18752012 -- failed
18762013 JsonHttpException String
1877− deriving (Show, Typeable, Generic)
2014+ deriving (Show, Generic)
18782015
18792016instance Exception HttpException
18802017
2018+-- | Return 'Just' if the given 'HttpException' is wrapping a http-client's
2019+-- 'L.StatusCodeException'. Otherwise, return 'Nothing'.
2020+--
2021+-- @since 3.12.0
2022+isStatusCodeException :: HttpException -> Maybe (L.Response ())
2023+isStatusCodeException
2024+ ( VanillaHttpException
2025+ ( L.HttpExceptionRequest
2026+ _
2027+ (L.StatusCodeException r _)
2028+ )
2029+ ) = Just r
2030+isStatusCodeException _ = Nothing
2031+
18812032-- | A simple type isomorphic to 'Bool' that we only have for better error
18822033-- messages. We use it as a kind and its data constructors as type-level
18832034-- tags.
@@ -1897,4 +2048,4 @@ data Scheme
18972048 Http
18982049 | -- | HTTPS
18992050 Https
1900− deriving (Eq, Ord, Show, Data, Typeable, Generic, TH.Lift)
2051+ deriving (Eq, Ord, Show, Data, Generic, TH.Lift)
README.md+1−3
@@ -4,10 +4,8 @@
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/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)
88
9−* [Motivation and Req vs other libraries](#motivation-and-req-vs-other-libraries)
10−* [Unsolved problems](#unsolved-problems)
119* [Related packages](#related-packages)
1210* [Blog posts](#blog-posts)
1311* [Contribution](#contribution)
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+103−65
@@ -1,6 +1,6 @@
1−{-# LANGUAGE CPP #-}
21{-# LANGUAGE DataKinds #-}
32{-# LANGUAGE FlexibleInstances #-}
3+{-# LANGUAGE LambdaCase #-}
44{-# LANGUAGE OverloadedStrings #-}
55{-# LANGUAGE RankNTypes #-}
66{-# OPTIONS_GHC -fno-warn-orphans #-}
@@ -8,29 +8,28 @@
88module Network.HTTP.ReqSpec (spec) where
99
1010import Control.Exception
11−import Control.Monad.Reader
11+import Control.Monad (forM_)
1212import Control.Monad.Trans.Control
1313import Data.Aeson (ToJSON (..), Value (..), object, (.=))
14−import qualified Data.Aeson as A
15−import qualified Data.ByteString as B
16−import qualified Data.ByteString.Lazy as BL
17−import qualified Data.HashMap.Strict as HM
14+import Data.Aeson qualified as A
15+import Data.Aeson.KeyMap qualified as Aeson.KeyMap
16+import Data.ByteString qualified as B
17+import Data.ByteString.Lazy qualified as BL
18+import Data.Functor.Identity (runIdentity)
19+import Data.Maybe (fromJust)
1820import Data.Proxy
1921import Data.Text (Text)
20−import qualified Data.Text as T
21−import qualified Data.Text.Encoding as T
22−import qualified Data.Text.IO as TIO
23−import qualified Network.HTTP.Client as L
24−import qualified Network.HTTP.Client.MultipartFormData as LM
25−import Network.HTTP.Req
26−import qualified Network.HTTP.Types as Y
22+import Data.Text qualified as T
23+import Data.Text.Encoding qualified as T
24+import Data.Text.IO qualified as TIO
25+import Network.HTTP.Client qualified as L
26+import Network.HTTP.Client.MultipartFormData qualified as LM
27+import Network.HTTP.Req hiding (req)
28+import Network.HTTP.Req qualified as Req
29+import Network.HTTP.Types qualified as Y
2730import Test.Hspec
2831import Test.QuickCheck
2932
30−#if !MIN_VERSION_base(4,13,0)
31−import Data.Semigroup ((<>))
32−#endif
33−
3433spec :: Spec
3534spec = do
3635 describe "exception throwing on non-2xx status codes" $
@@ -51,6 +50,11 @@ spec = do
5150 blindlyThrowing (req GET httpbin NoReqBody ignoreResponse mempty)
5251 `shouldThrow` anyException
5352
53+ describe "isStatusCodeException" $
54+ it "extracts non-2xx response" $
55+ req GET (httpbin /: "foo") NoReqBody ignoreResponse mempty
56+ `shouldThrow` selector404ByStatusCodeException
57+
5458 describe "receiving user-agent header back" $
5559 it "works" $ do
5660 r <-
@@ -81,8 +85,7 @@ spec = do
8185 .= object
8286 [ "Accept-Encoding" .= ("gzip" :: Text),
8387 "Foo" .= ("bar" :: Text),
84− "Baz" .= ("quux" :: Text),
85− "Host" .= ("httpbin.org" :: Text)
88+ "Baz" .= ("quux" :: Text)
8689 ]
8790 ]
8891 responseStatusCode r `shouldBe` 200
@@ -94,11 +97,10 @@ spec = do
9497 (stripFunnyHeaders . stripOrigin) (responseBody r)
9598 `shouldBe` object
9699 [ "args" .= emptyObject,
97− "url" .= ("https://httpbin.org/get" :: Text),
100+ "url" .= ("http://localhost:1234/get" :: Text),
98101 "headers"
99102 .= object
100− [ "Accept-Encoding" .= ("gzip" :: Text),
101− "Host" .= ("httpbin.org" :: Text)
103+ [ "Accept-Encoding" .= ("gzip" :: Text)
102104 ]
103105 ]
104106 responseHeader r "Content-Type" `shouldBe` return "application/json"
@@ -115,12 +117,11 @@ spec = do
115117 [ "args" .= emptyObject,
116118 "json" .= text,
117119 "data" .= reflected,
118− "url" .= ("https://httpbin.org/post" :: Text),
120+ "url" .= ("http://localhost:1234/post" :: Text),
119121 "headers"
120122 .= object
121123 [ "Content-Type" .= ("application/json; charset=utf-8" :: Text),
122124 "Accept-Encoding" .= ("gzip" :: Text),
123− "Host" .= ("httpbin.org" :: Text),
124125 "Content-Length" .= show (T.length reflected)
125126 ],
126127 "files" .= emptyObject,
@@ -138,18 +139,17 @@ spec = do
138139 LM.partBS "bar" "bar data!"
139140 ]
140141 r <- req POST (httpbin /: "post") body jsonResponse mempty
141− let Just contentType = getRequestContentType body
142+ let contentType = fromJust (getRequestContentType body)
142143 (stripFunnyHeaders . stripOrigin) (responseBody r)
143144 `shouldBe` object
144145 [ "args" .= emptyObject,
145146 "json" .= Null,
146147 "data" .= ("" :: Text),
147− "url" .= ("https://httpbin.org/post" :: Text),
148+ "url" .= ("http://localhost:1234/post" :: Text),
148149 "headers"
149150 .= object
150151 [ "Content-Type" .= T.decodeUtf8 contentType,
151152 "Accept-Encoding" .= ("gzip" :: Text),
152− "Host" .= ("httpbin.org" :: Text),
153153 "Content-Length" .= ("242" :: Text)
154154 ],
155155 "files" .= emptyObject,
@@ -174,11 +174,10 @@ spec = do
174174 [ "args" .= emptyObject,
175175 "json" .= Null,
176176 "data" .= contents,
177− "url" .= ("https://httpbin.org/patch" :: Text),
177+ "url" .= ("http://localhost:1234/patch" :: Text),
178178 "headers"
179179 .= object
180180 [ "Accept-Encoding" .= ("gzip" :: Text),
181− "Host" .= ("httpbin.org" :: Text),
182181 "Content-Length" .= show (T.length contents)
183182 ],
184183 "files" .= emptyObject,
@@ -200,12 +199,11 @@ spec = do
200199 [ "args" .= emptyObject,
201200 "json" .= Null,
202201 "data" .= ("" :: Text),
203− "url" .= ("https://httpbin.org/put" :: Text),
202+ "url" .= ("http://localhost:1234/put" :: Text),
204203 "headers"
205204 .= object
206205 [ "Content-Type" .= ("application/x-www-form-urlencoded" :: Text),
207206 "Accept-Encoding" .= ("gzip" :: Text),
208− "Host" .= ("httpbin.org" :: Text),
209207 "Content-Length" .= ("18" :: Text)
210208 ],
211209 "files" .= emptyObject,
@@ -263,21 +261,17 @@ spec = do
263261 -- TODO /response-headers
264262 -- TODO /redirect
265263
266− -- FIXME Redirects test is temporarily disabled due to
267− --
268− -- https://github.com/postmanlabs/httpbin/issues/617
269−
270− -- describe "redirects" $
271− -- it "follows redirects" $ do
272− -- r <-
273− -- req
274− -- GET
275− -- (httpbin /: "redirect-to")
276− -- NoReqBody
277− -- ignoreResponse
278− -- ("url" =: ("https://httpbin.org" :: Text))
279− -- responseStatusCode r `shouldBe` 200
280− -- responseStatusMessage r `shouldBe` "OK"
264+ describe "redirects" $
265+ it "follows redirects" $ do
266+ r <-
267+ req
268+ GET
269+ (httpbin /: "redirect-to")
270+ NoReqBody
271+ ignoreResponse
272+ ("url" =: ("https://httpbin.org" :: Text))
273+ responseStatusCode r `shouldBe` 200
274+ responseStatusMessage r `shouldBe` "OK"
281275
282276 -- TODO /relative-redicet
283277 -- TODO /absolute-redirect
@@ -307,7 +301,7 @@ spec = do
307301 (httpbin /: "basic-auth" /~ user /~ password)
308302 NoReqBody
309303 ignoreResponse
310− (basicAuth (T.encodeUtf8 user) (T.encodeUtf8 password))
304+ (basicAuthUnsafe (T.encodeUtf8 user) (T.encodeUtf8 password))
311305 responseStatusCode r `shouldBe` 200
312306 responseStatusMessage r `shouldBe` "OK"
313307
@@ -407,30 +401,67 @@ blindlyThrowing = runReq defaultHttpConfig {httpConfigCheckResponse = doit}
407401 doit _ _ = error "Oops!"
408402
409403-- | 'Url' representing <https://httpbin.org>.
410−httpbin :: Url 'Https
411−httpbin = 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
412426
413427-- | Remove “origin” field from JSON value. Origin may change, we don't want
414428-- to depend on that.
415429stripOrigin :: Value -> Value
416−stripOrigin (Object m) = Object (HM.delete "origin" m)
430+stripOrigin (Object m) = Object (Aeson.KeyMap.delete "origin" m)
417431stripOrigin value = value
418432
419433-- | Remove funny headers that might break the tests.
420434stripFunnyHeaders :: Value -> Value
421−stripFunnyHeaders (Object m) =
422− let f (Object p) = Object $ HM.filterWithKey (\k _ -> k `elem` hs) p
423− f value = value
424− hs =
425− [ "Content-Type",
426− "Accept-Encoding",
427− "Host",
428− "Content-Length",
429− "Foo",
430− "Baz"
431− ]
432− in Object (HM.adjust f "headers" m)
433−stripFunnyHeaders 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+ ]
434465
435466-- | This is a complete test case that makes use of <https://httpbin.org> to
436467-- get various response status codes.
@@ -460,12 +491,19 @@ selector404
460491 L.responseStatus response == Y.status404 && not (B.null chunk)
461492selector404 _ = False
462493
494+-- | Same as 'selector404' except that it uses 'isStatusCodeException'.
495+selector404ByStatusCodeException :: HttpException -> Bool
496+selector404ByStatusCodeException e =
497+ case isStatusCodeException e of
498+ Nothing -> False
499+ Just r -> responseStatusCode r == 404
500+
463501-- | The empty JSON 'Object'.
464502emptyObject :: Value
465−emptyObject = Object HM.empty
503+emptyObject = Object Aeson.KeyMap.empty
466504
467505-- | Get a rendered JSON value as 'Text'.
468−reflectJSON :: ToJSON a => a -> Text
506+reflectJSON :: (ToJSON a) => a -> Text
469507reflectJSON = T.decodeUtf8 . BL.toStrict . A.encode
470508
471509-- | Clarify to the type checker that the inner computation is in the 'IO'
pure-tests/Network/HTTP/ReqSpec.hs+53−30
@@ -1,4 +1,3 @@
1−{-# LANGUAGE CPP #-}
21{-# LANGUAGE DataKinds #-}
32{-# LANGUAGE DeriveGeneric #-}
43{-# LANGUAGE FlexibleInstances #-}
@@ -14,43 +13,41 @@
1413
1514module Network.HTTP.ReqSpec (spec) where
1615
17−import qualified Blaze.ByteString.Builder as BB
16+import Blaze.ByteString.Builder qualified as BB
1817import Control.Exception (throwIO)
1918import Control.Monad
2019import Control.Retry
2120import Data.Aeson (ToJSON (..))
22−import qualified Data.Aeson as A
21+import Data.Aeson qualified as A
2322import Data.ByteString (ByteString)
24−import qualified Data.ByteString as B
25−import qualified Data.ByteString.Char8 as B8
26−import qualified Data.ByteString.Lazy as BL
27−import qualified Data.CaseInsensitive as CI
23+import Data.ByteString qualified as B
24+import Data.ByteString.Char8 qualified as B8
25+import Data.ByteString.Lazy qualified as BL
26+import Data.CaseInsensitive qualified as CI
2827import Data.Either (isRight)
29−import qualified Data.List.NonEmpty as NE
28+import Data.List.NonEmpty qualified as NE
3029import Data.Maybe (fromJust, fromMaybe, isJust, isNothing)
3130import Data.Proxy
3231import Data.Text (Text)
33−import qualified Data.Text as T
34−import qualified Data.Text.Encoding as T
32+import Data.Text qualified as T
33+import Data.Text.Encoding qualified as T
3534import Data.Time
3635import Data.Typeable (Typeable, eqT)
36+import GHC.Exts (IsList (..))
3737import GHC.Generics
38−import qualified Language.Haskell.TH as TH
39−import qualified Language.Haskell.TH.Quote as TH
40−import qualified Network.HTTP.Client as L
38+import Language.Haskell.TH qualified as TH
39+import Language.Haskell.TH.Quote qualified as TH
40+import Network.HTTP.Client qualified as L
4141import Network.HTTP.Req
42−import qualified Network.HTTP.Types as Y
43−import qualified Network.HTTP.Types.Header as Y
42+import Network.HTTP.Types qualified as Y
43+import Network.HTTP.Types.Header qualified as Y
4444import Test.Hspec
4545import Test.Hspec.Core.Spec (SpecM)
4646import Test.QuickCheck
4747import Text.URI (URI)
48−import qualified Text.URI as URI
49−import qualified Text.URI.QQ as QQ
50−
51−#if !MIN_VERSION_base(4,13,0)
52−import Data.Semigroup ((<>))
53−#endif
48+import Text.URI qualified as URI
49+import Text.URI.QQ qualified as QQ
50+import Web.FormUrlEncoded qualified as F
5451
5552spec :: Spec
5653spec = do
@@ -164,11 +161,13 @@ spec = do
164161 let uriHttp = uri' {URI.uriScheme = Just [QQ.scheme|http|]}
165162 uriHttps = uri' {URI.uriScheme = Just [QQ.scheme|https|]}
166163 requestHttp <-
167− let Left (url', options) = fromJust (useURI uriHttp)
168− in req_ GET url' NoReqBody options
164+ case fromJust (useURI uriHttp) of
165+ Left (url', options) -> req_ GET url' NoReqBody options
166+ _ -> error "(useURI uriHttp) should have returned Left"
169167 requestHttps <-
170− let Right (url', options) = fromJust (useURI uriHttps)
171− in req_ GET url' NoReqBody options
168+ case fromJust (useURI uriHttps) of
169+ Right (url', options) -> req_ GET url' NoReqBody options
170+ _ -> error "(useURI uriHttps) should have returned Right"
172171 L.host requestHttp `shouldBe` uriHost uriHttp
173172 L.host requestHttps `shouldBe` uriHost uriHttps
174173 L.port requestHttp `shouldBe` uriPort 80 uriHttp
@@ -238,6 +237,19 @@ spec = do
238237 L.RequestBodyLBS x -> x `shouldBe` renderQuery params
239238 _ -> expectationFailure "Wrong request body constructor."
240239
240+ describe "query params" $ do
241+ describe "FormUrlEncodedParam" $ do
242+ describe "formToQuery" $ do
243+ it "should produce the same parameters as F.urlEncodeFormStable" $
244+ property $ \form -> do
245+ request <- req_ POST url (ReqBodyUrlEnc $ formToQuery form) mempty
246+ case L.requestBody request of
247+ L.RequestBodyLBS x -> x `shouldBe` F.urlEncodeFormStable form
248+ _ -> expectationFailure "Wrong request body constructor"
249+ specParamToList (Proxy :: Proxy FormUrlEncodedParam)
250+ describe "Option" $ do
251+ specParamToList (Proxy :: Proxy (Option 'Http))
252+
241253 describe "optional parameters" $ do
242254 describe "header" $ do
243255 it "sets specified header value" $
@@ -266,11 +278,7 @@ spec = do
266278 it "cookie jar is set without modifications" $
267279 property $ \cjar -> do
268280 request <- req_ GET url NoReqBody (cookieJar cjar)
269−#if MIN_VERSION_http_client(0,7,0)
270281 L.cookieJar request `shouldSatisfy` (maybe False (L.equalCookieJar cjar))
271−#else
272− L.cookieJar request `shouldBe` Just cjar
273−#endif
274282 describe "basicAuth" $ do
275283 it "sets Authorization header to correct value" $
276284 property $ \username password -> do
@@ -405,7 +413,7 @@ spec = do
405413 -- 'Https, Option _) type checks, so we can catch if the type of scheme
406414 -- is unspecified.
407415 let testTypeOfQuoterResult ::
408− forall a s. Typeable a => (a, Option s) -> Bool
416+ forall a s. (Typeable a) => (a, Option s) -> Bool
409417 testTypeOfQuoterResult _ = isJust $ eqT @a @(Url 'Https)
410418 in property $ testTypeOfQuoterResult [urlQ|https://example.org/|]
411419 it "doesn't work for invalid urls" $
@@ -495,6 +503,9 @@ instance Arbitrary Day where
495503instance Arbitrary DiffTime where
496504 arbitrary = secondsToDiffTime <$> arbitrary
497505
506+instance Arbitrary F.Form where
507+ arbitrary = (F.Form . fromList) <$> arbitrary
508+
498509----------------------------------------------------------------------------
499510-- Helper types
500511
@@ -607,3 +618,15 @@ basicProxyAuthHeader :: ByteString -> ByteString -> ByteString
607618basicProxyAuthHeader username password =
608619 fromJust . lookup Y.hProxyAuthorization . L.requestHeaders $
609620 L.applyBasicProxyAuth username password L.defaultRequest
621+
622+-- | Spec about 'paramToList' for the type @p@.
623+specParamToList :: (QueryParam p, Monoid p) => Proxy p -> Spec
624+specParamToList typeProxy = do
625+ describe "paramToList" $ do
626+ it "should reproduce the parameters given by queryParam" $
627+ property $ \(QueryParams params) -> do
628+ let queryParam0 =
629+ (mconcat $ fmap (uncurry queryParam) params)
630+ `asProxyTypeOf` typeProxy
631+ got = queryParamToList queryParam0
632+ got `shouldBe` params
req.cabal+61−61
@@ -1,11 +1,11 @@
1−cabal-version: 1.18
1+cabal-version: 2.4
22name: req
3−version: 3.9.0
4−license: BSD3
3+version: 3.13.4
4+license: BSD-3-Clause
55license-file: LICENSE.md
66maintainer: Mark Karpov <markkarpov92@gmail.com>
77author: Mark Karpov <markkarpov92@gmail.com>
8−tested-with: ghc ==8.6.5 ghc ==8.8.4 ghc ==8.10.3
8+tested-with: ghc ==9.6.3 ghc ==9.8.2 ghc ==9.10.1
99homepage: https://github.com/mrkkrp/req
1010bug-reports: https://github.com/mrkkrp/req/issues
1111synopsis: HTTP client library
@@ -31,97 +31,97 @@ flag dev
3131
3232library
3333 exposed-modules: Network.HTTP.Req
34− default-language: Haskell2010
34+ default-language: GHC2021
3535 build-depends:
36− aeson >=0.9 && <1.6,
37− authenticate-oauth >=1.5 && <1.7,
38− base >=4.12 && <5.0,
36+ aeson >=0.9 && <3,
37+ authenticate-oauth >=1.5 && <1.8,
38+ base >=4.15 && <5,
3939 blaze-builder >=0.3 && <0.5,
40− bytestring >=0.10.8 && <0.12,
40+ bytestring >=0.10.8 && <0.13,
4141 case-insensitive >=0.2 && <1.3,
42− connection >=0.2.2 && <0.4,
42+ containers >=0.5 && <0.8,
43+ crypton-connection >=0.4.2 && <0.5,
44+ data-default-class >=0.2.0.0,
4345 exceptions >=0.6 && <0.11,
44− http-api-data >=0.2 && <0.5,
45− http-client >=0.5 && <0.8,
46+ http-api-data >=0.2 && <0.7,
47+ http-client >=0.7.13.1 && <0.8,
4648 http-client-tls >=0.3.2 && <0.4,
47− http-types >=0.8 && <10.0,
49+ http-types >=0.8 && <10,
4850 modern-uri >=0.3 && <0.4,
4951 monad-control >=1.0 && <1.1,
5052 mtl >=2.0 && <3.0,
51− retry >=0.8 && <0.9,
52− template-haskell >=2.14 && <2.17,
53− text >=0.2 && <1.3,
54− time >=1.2 && <1.10,
55− transformers >=0.4 && <0.6,
53+ retry >=0.8 && <0.10,
54+ template-haskell >=2.19 && <2.23,
55+ text >=0.2 && <2.2,
56+ transformers >=0.5.3.0 && <0.7,
5657 transformers-base,
5758 unliftio-core >=0.1.1 && <0.3
5859
5960 if flag(dev)
60− ghc-options: -O0 -Wall -Werror
61+ ghc-options:
62+ -Wall -Werror -Wpartial-fields -Wunused-packages
63+ -Wno-unused-imports
6164
6265 else
6366 ghc-options: -O2 -Wall
6467
65− if flag(dev)
66− ghc-options:
67− -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns
68− -Wnoncanonical-monad-instances
69−
7068test-suite pure-tests
71− type: exitcode-stdio-1.0
72− main-is: Spec.hs
73− build-tools: hspec-discover >=2.0 && <3.0
74− hs-source-dirs: pure-tests
75− other-modules: Network.HTTP.ReqSpec
76− default-language: Haskell2010
69+ type: exitcode-stdio-1.0
70+ main-is: Spec.hs
71+ build-tool-depends: hspec-discover:hspec-discover >=2 && <3
72+ hs-source-dirs: pure-tests
73+ other-modules: Network.HTTP.ReqSpec
74+ default-language: GHC2021
7775 build-depends:
78− QuickCheck >=2.7 && <3.0,
79− aeson >=0.9 && <1.6,
80− base >=4.12 && <5.0,
76+ QuickCheck >=2.7 && <3,
77+ aeson >=0.9 && <3,
78+ base >=4.15 && <5.0,
8179 blaze-builder >=0.3 && <0.5,
82− bytestring >=0.10.8 && <0.12,
80+ bytestring >=0.10.8 && <0.13,
8381 case-insensitive >=0.2 && <1.3,
84− hspec >=2.0 && <3.0,
85− hspec-core >=2.0 && <3.0,
86− http-client >=0.5 && <0.8,
87− http-types >=0.8 && <10.0,
82+ hspec >=2.0 && <3,
83+ hspec-core >=2.0 && <3,
84+ http-api-data >=0.2 && <0.7,
85+ http-client >=0.7 && <0.8,
86+ http-types >=0.8 && <10,
8887 modern-uri >=0.3 && <0.4,
89− mtl >=2.0 && <3.0,
9088 req,
91− retry >=0.8 && <0.9,
92− template-haskell >=2.14 && <2.17,
93− text >=0.2 && <1.3,
94− time >=1.2 && <1.10
89+ retry >=0.8 && <0.10,
90+ template-haskell >=2.19 && <2.23,
91+ text >=0.2 && <2.2,
92+ time >=1.2 && <1.15
9593
9694 if flag(dev)
97− ghc-options: -O0 -Wall -Werror
95+ ghc-options:
96+ -Wall -Werror -Wredundant-constraints -Wpartial-fields
97+ -Wunused-packages
9898
9999 else
100100 ghc-options: -O2 -Wall
101101
102102test-suite httpbin-tests
103− type: exitcode-stdio-1.0
104− main-is: Spec.hs
105− build-tools: hspec-discover >=2.0 && <3.0
106− hs-source-dirs: httpbin-tests
107− other-modules: Network.HTTP.ReqSpec
108− default-language: Haskell2010
103+ type: exitcode-stdio-1.0
104+ main-is: Spec.hs
105+ build-tool-depends: hspec-discover:hspec-discover >=2 && <3
106+ hs-source-dirs: httpbin-tests
107+ other-modules: Network.HTTP.ReqSpec
108+ default-language: GHC2021
109109 build-depends:
110− QuickCheck >=2.7 && <3.0,
111− aeson >=0.9 && <1.6,
112− base >=4.12 && <5.0,
113− bytestring >=0.10.8 && <0.12,
110+ QuickCheck >=2.7 && <3,
111+ aeson >=2 && <3,
112+ base >=4.15 && <5,
113+ bytestring >=0.10.8 && <0.13,
114114 hspec >=2.0 && <3.0,
115− http-client >=0.5 && <0.8,
116− http-types >=0.8 && <10.0,
115+ http-client >=0.7 && <0.8,
116+ http-types >=0.8 && <10,
117117 monad-control >=1.0 && <1.1,
118− mtl >=2.0 && <3.0,
119118 req,
120− text >=0.2 && <1.3,
121− unordered-containers >=0.2.5 && <0.3
119+ text >=0.2 && <2.2
122120
123121 if flag(dev)
124− ghc-options: -O0 -Wall -Werror
122+ ghc-options:
123+ -Wall -Werror -Wredundant-constraints -Wpartial-fields
124+ -Wunused-packages
125125
126126 else
127− ghc-options: -O2 -Wall
127+ buildable: False