on 95f6a21 help sign in
.github/dependabot.ymldeleted−6
since splitsnapshots
unifiedsplit
@@ -1,6 +0,0 @@
1−version: 2
2−updates:
3− - package-ecosystem: "github-actions"
4− directory: "/"
5− schedule:
6− interval: "weekly"
.github/workflows/ci.yaml+13−14
@@ -11,25 +11,27 @@ jobs:
11 ormolu:
11 ormolu:
12 runs-on: ubuntu-latest
12 runs-on: ubuntu-latest
13 steps:
13 steps:
14− - uses: actions/checkout@v4
14+ - uses: actions/checkout@v2.3.4
15− - uses: haskell-actions/run-ormolu@v17
15+ - uses: mrkkrp/ormolu-action@v6
16 build:
16 build:
17 runs-on: ubuntu-latest
17 runs-on: ubuntu-latest
18 needs: ormolu
18 needs: ormolu
19 strategy:
19 strategy:
20 matrix:
20 matrix:
21− cabal: ["3.12"]
21+ cabal: ["3.6"]
22− ghc: ["9.6.3", "9.8.2", "9.10.1"]
22+ ghc: ["8.10.7", "9.0.2", "9.2.1"]
23+ env:
24+ CONFIG: "--enable-tests --enable-benchmarks --flags=dev"
23 steps:
25 steps:
24− - uses: actions/checkout@v4
26+ - uses: actions/checkout@v2.3.4
25− - uses: haskell-actions/setup@v2
27+ - uses: haskell/actions/setup@v1.2.9
26 id: setup-haskell-cabal
28 id: setup-haskell-cabal
27 with:
29 with:
28 ghc-version: ${{ matrix.ghc }}
30 ghc-version: ${{ matrix.ghc }}
29 cabal-version: ${{ matrix.cabal }}
31 cabal-version: ${{ matrix.cabal }}
30 - run: cabal update
32 - run: cabal update
31− - run: cabal freeze
33+ - run: cabal freeze $CONFIG
32− - uses: actions/cache@v4.2.3
34+ - uses: actions/cache@v2.1.3
33 with:
35 with:
34 path: |
36 path: |
35 ${{ steps.setup-haskell-cabal.outputs.cabal-store }}
37 ${{ steps.setup-haskell-cabal.outputs.cabal-store }}
@@ -38,10 +40,7 @@ jobs:
38 restore-keys: |
40 restore-keys: |
39 ${{ runner.os }}-${{ matrix.ghc }}-
41 ${{ runner.os }}-${{ matrix.ghc }}-
40 - run: cabal format && git diff --exit-code --color=always
42 - run: cabal format && git diff --exit-code --color=always
41− - run: cabal build
43+ - run: cabal build $CONFIG
42− - run: |
43− docker pull kennethreitz/httpbin
44− docker run -p 1234:80 kennethreitz/httpbin &
45− cabal test
44+ - run: cabal test $CONFIG
46− - run: cabal haddock
45+ - run: cabal haddock $CONFIG
47 - run: cabal sdist
46 - run: cabal sdist
.gitignore−1
@@ -25,6 +25,5 @@ cabal.project.local
25cabal.sandbox.config
25cabal.sandbox.config
26dist-*/
26dist-*/
27dist/
27dist/
28−hie.yaml
29stack.yaml
28stack.yaml
30stack.yaml.lock
29stack.yaml.lock
CHANGELOG.md−31
@@ -1,34 +1,3 @@
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
1## Req 3.12.0
33
2
34* Add `isStatusCodeException` function.
3* Add `isStatusCodeException` function.
Network/HTTP/Req.hs+82−76
@@ -1,9 +1,20 @@
1+{-# LANGUAGE BangPatterns #-}
2+{-# LANGUAGE CPP #-}
1{-# LANGUAGE DataKinds #-}
3{-# LANGUAGE DataKinds #-}
4+{-# LANGUAGE DeriveDataTypeable #-}
5+{-# LANGUAGE DeriveGeneric #-}
6+{-# LANGUAGE DeriveLift #-}
7+{-# LANGUAGE FlexibleInstances #-}
8+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
2{-# LANGUAGE LambdaCase #-}
9{-# LANGUAGE LambdaCase #-}
10+{-# LANGUAGE MultiParamTypeClasses #-}
3{-# LANGUAGE OverloadedStrings #-}
11{-# LANGUAGE OverloadedStrings #-}
4{-# LANGUAGE QuasiQuotes #-}
12{-# LANGUAGE QuasiQuotes #-}
13+{-# LANGUAGE RankNTypes #-}
5{-# LANGUAGE RecordWildCards #-}
14{-# LANGUAGE RecordWildCards #-}
6{-# LANGUAGE RoleAnnotations #-}
15{-# LANGUAGE RoleAnnotations #-}
16+{-# LANGUAGE ScopedTypeVariables #-}
17+{-# LANGUAGE StandaloneDeriving #-}
7{-# LANGUAGE TemplateHaskellQuotes #-}
18{-# LANGUAGE TemplateHaskellQuotes #-}
8{-# LANGUAGE TypeFamilies #-}
19{-# LANGUAGE TypeFamilies #-}
9{-# LANGUAGE UndecidableInstances #-}
20{-# LANGUAGE UndecidableInstances #-}
@@ -150,7 +161,6 @@ module Network.HTTP.Req
150 -- *** Headers
161 -- *** Headers
151 header,
162 header,
152 attachHeader,
163 attachHeader,
153− headerRedacted,
154
164
155 -- *** Cookies
165 -- *** Cookies
156 -- $cookies
166 -- $cookies
@@ -203,7 +213,7 @@ module Network.HTTP.Req
203 )
213 )
204where
214where
205
215
206−import Blaze.ByteString.Builder qualified as BB
216+import qualified Blaze.ByteString.Builder as BB
207import Control.Applicative
217import Control.Applicative
208import Control.Arrow (first, second)
218import Control.Arrow (first, second)
209import Control.Exception hiding (Handler (..), TypeError)
219import Control.Exception hiding (Handler (..), TypeError)
@@ -219,56 +229,54 @@ import Control.Monad.Trans.Control
219import Control.Monad.Trans.Except (ExceptT)
229import Control.Monad.Trans.Except (ExceptT)
220import Control.Monad.Trans.Identity (IdentityT)
230import Control.Monad.Trans.Identity (IdentityT)
221import Control.Monad.Trans.Maybe (MaybeT)
231import Control.Monad.Trans.Maybe (MaybeT)
222−import Control.Monad.Trans.RWS.CPS qualified as RWS.CPS
232+import qualified Control.Monad.Trans.RWS.CPS as RWS.CPS
223−import Control.Monad.Trans.RWS.Lazy qualified as RWS.Lazy
233+import qualified Control.Monad.Trans.RWS.Lazy as RWS.Lazy
224−import Control.Monad.Trans.RWS.Strict qualified as RWS.Strict
234+import qualified Control.Monad.Trans.RWS.Strict as RWS.Strict
225import Control.Monad.Trans.Select (SelectT)
235import Control.Monad.Trans.Select (SelectT)
226−import Control.Monad.Trans.State.Lazy qualified as State.Lazy
236+import qualified Control.Monad.Trans.State.Lazy as State.Lazy
227−import Control.Monad.Trans.State.Strict qualified as State.Strict
237+import qualified Control.Monad.Trans.State.Strict as State.Strict
228−import Control.Monad.Trans.Writer.CPS qualified as Writer.CPS
238+import qualified Control.Monad.Trans.Writer.CPS as Writer.CPS
229−import Control.Monad.Trans.Writer.Lazy qualified as Writer.Lazy
239+import qualified Control.Monad.Trans.Writer.Lazy as Writer.Lazy
230−import Control.Monad.Trans.Writer.Strict qualified as Writer.Strict
240+import qualified Control.Monad.Trans.Writer.Strict as Writer.Strict
231import Control.Retry
241import Control.Retry
232import Data.Aeson (FromJSON (..), ToJSON (..))
242import Data.Aeson (FromJSON (..), ToJSON (..))
233−import Data.Aeson qualified as A
243+import qualified Data.Aeson as A
234import Data.ByteString (ByteString)
244import Data.ByteString (ByteString)
235−import Data.ByteString qualified as B
245+import qualified Data.ByteString as B
236−import Data.ByteString.Lazy qualified as BL
246+import qualified Data.ByteString.Lazy as BL
237−import Data.CaseInsensitive qualified as CI
247+import qualified Data.CaseInsensitive as CI
238import Data.Data (Data)
248import Data.Data (Data)
239−import Data.Default.Class (def)
240import Data.Function (on)
249import Data.Function (on)
241import Data.IORef
250import Data.IORef
242import Data.Kind (Constraint, Type)
251import Data.Kind (Constraint, Type)
243import Data.List (foldl', nubBy)
252import Data.List (foldl', nubBy)
244import Data.List.NonEmpty (NonEmpty (..))
253import Data.List.NonEmpty (NonEmpty (..))
245−import Data.List.NonEmpty qualified as NE
254+import qualified Data.List.NonEmpty as NE
246import Data.Maybe (fromMaybe)
255import Data.Maybe (fromMaybe)
247import Data.Proxy
256import Data.Proxy
248import Data.Semigroup (Endo (..))
257import Data.Semigroup (Endo (..))
249−import Data.Set qualified as S
250import Data.Text (Text)
258import Data.Text (Text)
251−import Data.Text qualified as T
259+import qualified Data.Text as T
252−import Data.Text.Encoding qualified as T
260+import qualified Data.Text.Encoding as T
253import Data.Typeable (Typeable, cast)
261import Data.Typeable (Typeable, cast)
254import GHC.Generics
262import GHC.Generics
255import GHC.TypeLits
263import GHC.TypeLits
256−import Language.Haskell.TH qualified as TH
264+import qualified Language.Haskell.TH as TH
257−import Language.Haskell.TH.Quote qualified as TH
265+import qualified Language.Haskell.TH.Quote as TH
258−import Language.Haskell.TH.Syntax qualified as TH
266+import qualified Language.Haskell.TH.Syntax as TH
259−import Network.Connection qualified as NC
267+import qualified Network.Connection as NC
260−import Network.HTTP.Client qualified as L
268+import qualified Network.HTTP.Client as L
261−import Network.HTTP.Client.Internal qualified as LI
269+import qualified Network.HTTP.Client.Internal as LI
262−import Network.HTTP.Client.MultipartFormData qualified as LM
270+import qualified Network.HTTP.Client.MultipartFormData as LM
263−import Network.HTTP.Client.TLS qualified as L
271+import qualified Network.HTTP.Client.TLS as L
264−import Network.HTTP.Types qualified as Y
272+import qualified Network.HTTP.Types as Y
265import System.IO.Unsafe (unsafePerformIO)
273import System.IO.Unsafe (unsafePerformIO)
266import Text.URI (URI)
274import Text.URI (URI)
267−import Text.URI qualified as URI
275+import qualified Text.URI as URI
268−import Text.URI.QQ qualified as QQ
276+import qualified Text.URI.QQ as QQ
269−import Web.Authenticate.OAuth qualified as OAuth
277+import qualified Web.Authenticate.OAuth as OAuth
270import Web.FormUrlEncoded (FromForm (..), ToForm (..))
278import Web.FormUrlEncoded (FromForm (..), ToForm (..))
271−import Web.FormUrlEncoded qualified as Form
279+import qualified Web.FormUrlEncoded as Form
272import Web.HttpApiData (ToHttpApiData (..))
280import Web.HttpApiData (ToHttpApiData (..))
273
281
274----------------------------------------------------------------------------
282----------------------------------------------------------------------------
@@ -489,7 +497,7 @@ reqCb method url body responseProxy options adjustRequest =
489--
497--
490-- @since 3.7.0
498-- @since 3.7.0
491reqHandler ::
499reqHandler ::
492− (MonadHttp m) =>
500+ MonadHttp m =>
493 -- | How to get final result from a 'L.Response'
501 -- | How to get final result from a 'L.Response'
494 (L.Response L.BodyReader -> IO b) ->
502 (L.Response L.BodyReader -> IO b) ->
495 -- | 'L.Request' to perform
503 -- | 'L.Request' to perform
@@ -585,10 +593,10 @@ req' method url body options m = do
585 withReqManager (m request)
593 withReqManager (m request)
586
594
587-- | Perform an action using the global implicit 'L.Manager' that the rest
595-- | 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
596+-- of the library uses. This allows to reuse connections that the
589-- 'L.Manager' controls.
597-- 'L.Manager' controls.
590−withReqManager :: (MonadIO m) => (L.Manager -> m a) -> m a
598+withReqManager :: MonadIO m => (L.Manager -> m a) -> m a
591−withReqManager m = m globalManager
599+withReqManager m = liftIO (readIORef globalManager) >>= m
592
600
593-- | The global 'L.Manager' that 'req' uses. Here we just go with the
601-- | The global 'L.Manager' that 'req' uses. Here we just go with the
594-- default settings, so users don't need to deal with this manager stuff at
602-- default settings, so users don't need to deal with this manager stuff at
@@ -601,16 +609,16 @@ withReqManager m = m globalManager
601-- manager. From that moment on the 'IORef' will be just reused—exactly the
609-- manager. From that moment on the 'IORef' will be just reused—exactly the
602-- behavior we want here in order to maximize connection sharing. GHC could
610-- behavior we want here in order to maximize connection sharing. GHC could
603-- spoil the plan by inlining the definition, hence the @NOINLINE@ pragma.
611-- spoil the plan by inlining the definition, hence the @NOINLINE@ pragma.
604−globalManager :: L.Manager
612+globalManager :: IORef L.Manager
605globalManager = unsafePerformIO $ do
613globalManager = unsafePerformIO $ do
606 context <- NC.initConnectionContext
614 context <- NC.initConnectionContext
607 let settings =
615 let settings =
608 L.mkManagerSettingsContext
616 L.mkManagerSettingsContext
609 (Just context)
617 (Just context)
610− def
618+ (NC.TLSSettingsSimple False False False)
611 Nothing
619 Nothing
612 manager <- L.newManager settings
620 manager <- L.newManager settings
613− return manager
621+ newIORef manager
614{-# NOINLINE globalManager #-}
622{-# NOINLINE globalManager #-}
615
623
616----------------------------------------------------------------------------
624----------------------------------------------------------------------------
@@ -630,7 +638,7 @@ globalManager = unsafePerformIO $ do
630-- | A type class for monads that support performing HTTP requests.
638-- | A type class for monads that support performing HTTP requests.
631-- Typically, you only need to define the 'handleHttpException' method
639-- Typically, you only need to define the 'handleHttpException' method
632-- unless you want to tweak 'HttpConfig'.
640-- unless you want to tweak 'HttpConfig'.
633−class (MonadIO m) => MonadHttp m where
641+class MonadIO m => MonadHttp m where
634 -- | This method describes how to deal with 'HttpException' that was
642 -- | This method describes how to deal with 'HttpException' that was
635 -- caught by the library. One option is to re-throw it if you are OK with
643 -- caught by the library. One option is to re-throw it if you are OK with
636 -- exceptions, but if you prefer working with something like
644 -- exceptions, but if you prefer working with something like
@@ -714,8 +722,9 @@ data HttpConfig = HttpConfig
714 -- | Max length of preview fragment of response body.
722 -- | Max length of preview fragment of response body.
715 --
723 --
716 -- @since 3.6.0
724 -- @since 3.6.0
717− httpConfigBodyPreviewLength :: forall a. (Num a) => a
725+ httpConfigBodyPreviewLength :: forall a. Num a => a
718 }
726 }
727+ deriving (Typeable)
719
728
720-- | The default value of 'HttpConfig'.
729-- | The default value of 'HttpConfig'.
721--
730--
@@ -803,27 +812,27 @@ instance (MonadHttp m, Monoid w) => MonadHttp (AccumT w m) where
803 getHttpConfig = lift getHttpConfig
812 getHttpConfig = lift getHttpConfig
804
813
805-- | @since 3.10.0
814-- | @since 3.10.0
806−instance (MonadHttp m) => MonadHttp (ContT r m) where
815+instance MonadHttp m => MonadHttp (ContT r m) where
807 handleHttpException = lift . handleHttpException
816 handleHttpException = lift . handleHttpException
808 getHttpConfig = lift getHttpConfig
817 getHttpConfig = lift getHttpConfig
809
818
810-- | @since 3.10.0
819-- | @since 3.10.0
811−instance (MonadHttp m) => MonadHttp (ExceptT e m) where
820+instance MonadHttp m => MonadHttp (ExceptT e m) where
812 handleHttpException = lift . handleHttpException
821 handleHttpException = lift . handleHttpException
813 getHttpConfig = lift getHttpConfig
822 getHttpConfig = lift getHttpConfig
814
823
815-- | @since 3.10.0
824-- | @since 3.10.0
816−instance (MonadHttp m) => MonadHttp (IdentityT m) where
825+instance MonadHttp m => MonadHttp (IdentityT m) where
817 handleHttpException = lift . handleHttpException
826 handleHttpException = lift . handleHttpException
818 getHttpConfig = lift getHttpConfig
827 getHttpConfig = lift getHttpConfig
819
828
820-- | @since 3.10.0
829-- | @since 3.10.0
821−instance (MonadHttp m) => MonadHttp (MaybeT m) where
830+instance MonadHttp m => MonadHttp (MaybeT m) where
822 handleHttpException = lift . handleHttpException
831 handleHttpException = lift . handleHttpException
823 getHttpConfig = lift getHttpConfig
832 getHttpConfig = lift getHttpConfig
824
833
825-- | @since 3.10.0
834-- | @since 3.10.0
826−instance (MonadHttp m) => MonadHttp (ReaderT r m) where
835+instance MonadHttp m => MonadHttp (ReaderT r m) where
827 handleHttpException = lift . handleHttpException
836 handleHttpException = lift . handleHttpException
828 getHttpConfig = lift getHttpConfig
837 getHttpConfig = lift getHttpConfig
829
838
@@ -843,17 +852,17 @@ instance (MonadHttp m, Monoid w) => MonadHttp (RWS.Strict.RWST r w s m) where
843 getHttpConfig = lift getHttpConfig
852 getHttpConfig = lift getHttpConfig
844
853
845-- | @since 3.10.0
854-- | @since 3.10.0
846−instance (MonadHttp m) => MonadHttp (SelectT r m) where
855+instance MonadHttp m => MonadHttp (SelectT r m) where
847 handleHttpException = lift . handleHttpException
856 handleHttpException = lift . handleHttpException
848 getHttpConfig = lift getHttpConfig
857 getHttpConfig = lift getHttpConfig
849
858
850-- | @since 3.10.0
859-- | @since 3.10.0
851−instance (MonadHttp m) => MonadHttp (State.Lazy.StateT s m) where
860+instance MonadHttp m => MonadHttp (State.Lazy.StateT s m) where
852 handleHttpException = lift . handleHttpException
861 handleHttpException = lift . handleHttpException
853 getHttpConfig = lift getHttpConfig
862 getHttpConfig = lift getHttpConfig
854
863
855-- | @since 3.10.0
864-- | @since 3.10.0
856−instance (MonadHttp m) => MonadHttp (State.Strict.StateT s m) where
865+instance MonadHttp m => MonadHttp (State.Strict.StateT s m) where
857 handleHttpException = lift . handleHttpException
866 handleHttpException = lift . handleHttpException
858 getHttpConfig = lift getHttpConfig
867 getHttpConfig = lift getHttpConfig
859
868
@@ -877,7 +886,7 @@ instance (MonadHttp m, Monoid w) => MonadHttp (Writer.Strict.WriterT w m) where
877--
886--
878-- @since 0.4.0
887-- @since 0.4.0
879runReq ::
888runReq ::
880− (MonadIO m) =>
889+ MonadIO m =>
881 -- | 'HttpConfig' to use
890 -- | 'HttpConfig' to use
882 HttpConfig ->
891 HttpConfig ->
883 -- | Computation to run
892 -- | Computation to run
@@ -982,7 +991,7 @@ class HttpMethod a where
982 -- | Return name of the method as a 'ByteString'.
991 -- | Return name of the method as a 'ByteString'.
983 httpMethodName :: Proxy a -> ByteString
992 httpMethodName :: Proxy a -> ByteString
984
993
985−instance (HttpMethod method) => RequestComponent (Tagged "method" method) where
994+instance HttpMethod method => RequestComponent (Tagged "method" method) where
986 getRequestMod _ = Endo $ \x ->
995 getRequestMod _ = Endo $ \x ->
987 x {L.method = httpMethodName (Proxy :: Proxy method)}
996 x {L.method = httpMethodName (Proxy :: Proxy method)}
988
997
@@ -1024,20 +1033,25 @@ instance (HttpMethod method) => RequestComponent (Tagged "method" method) where
1024-- > -- https://%D1%8E%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4.%D1%80%D1%84
1033-- > -- https://%D1%8E%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4.%D1%80%D1%84
1025data Url (scheme :: Scheme) = Url Scheme (NonEmpty Text)
1034data Url (scheme :: Scheme) = Url Scheme (NonEmpty Text)
1026 -- NOTE The second value is the path segments in reversed order.
1035 -- NOTE The second value is the path segments in reversed order.
1027− deriving (Eq, Ord, Show, Data, Generic)
1036+ deriving (Eq, Ord, Show, Data, Typeable, Generic)
1028
1037
1029type role Url nominal
1038type role Url nominal
1030
1039
1031-- With template-haskell >=2.15 and text >=1.2.4 Lift can be derived, however
1040-- With template-haskell >=2.15 and text >=1.2.4 Lift can be derived, however
1032-- the derived lift forgets the type of the scheme.
1041-- the derived lift forgets the type of the scheme.
1033−instance (Typeable scheme) => TH.Lift (Url scheme) where
1042+instance Typeable scheme => TH.Lift (Url scheme) where
1034 lift url =
1043 lift url =
1035 TH.dataToExpQ (fmap liftText . cast) url `TH.sigE` case url of
1044 TH.dataToExpQ (fmap liftText . cast) url `TH.sigE` case url of
1036 Url Http _ -> [t|Url 'Http|]
1045 Url Http _ -> [t|Url 'Http|]
1037 Url Https _ -> [t|Url 'Https|]
1046 Url Https _ -> [t|Url 'Https|]
1038 where
1047 where
1039 liftText t = TH.AppE (TH.VarE 'T.pack) <$> TH.lift (T.unpack t)
1048 liftText t = TH.AppE (TH.VarE 'T.pack) <$> TH.lift (T.unpack t)
1049+
1050+#if MIN_VERSION_template_haskell(2,17,0)
1040 liftTyped = TH.Code . TH.unsafeTExpCoerce . TH.lift
1051 liftTyped = TH.Code . TH.unsafeTExpCoerce . TH.lift
1052+#elif MIN_VERSION_template_haskell(2,16,0)
1053+ liftTyped = TH.unsafeTExpCoerce . TH.lift
1054+#endif
1041
1055
1042-- | Given host name, produce a 'Url' which has “http” as its scheme and
1056-- | Given host name, produce a 'Url' which has “http” as its scheme and
1043-- empty path. This also sets port to @80@.
1057-- empty path. This also sets port to @80@.
@@ -1053,7 +1067,7 @@ https = Url Https . pure
1053-- path segment can be of any type that is an instance of 'ToHttpApiData'.
1067-- path segment can be of any type that is an instance of 'ToHttpApiData'.
1054infixl 5 /~
1068infixl 5 /~
1055
1069
1056−(/~) :: (ToHttpApiData a) => Url scheme -> a -> Url scheme
1070+(/~) :: ToHttpApiData a => Url scheme -> a -> Url scheme
1057Url secure path /~ segment = Url secure (NE.cons (toUrlPiece segment) path)
1071Url secure path /~ segment = Url secure (NE.cons (toUrlPiece segment) path)
1058
1072
1059-- | A type-constrained version of @('/~')@ to remove ambiguity in the cases
1073-- | A type-constrained version of @('/~')@ to remove ambiguity in the cases
@@ -1241,7 +1255,7 @@ instance HttpBody NoReqBody where
1241-- charset=utf-8\"@ value.
1255-- charset=utf-8\"@ value.
1242newtype ReqBodyJson a = ReqBodyJson a
1256newtype ReqBodyJson a = ReqBodyJson a
1243
1257
1244−instance (ToJSON a) => HttpBody (ReqBodyJson a) where
1258+instance ToJSON a => HttpBody (ReqBodyJson a) where
1245 getRequestBody (ReqBodyJson a) = L.RequestBodyLBS (A.encode a)
1259 getRequestBody (ReqBodyJson a) = L.RequestBodyLBS (A.encode a)
1246 getRequestContentType _ = pure "application/json; charset=utf-8"
1260 getRequestContentType _ = pure "application/json; charset=utf-8"
1247
1261
@@ -1340,7 +1354,7 @@ instance HttpBody ReqBodyMultipart where
1340-- | Create 'ReqBodyMultipart' request body from a collection of 'LM.Part's.
1354-- | Create 'ReqBodyMultipart' request body from a collection of 'LM.Part's.
1341--
1355--
1342-- @since 0.2.0
1356-- @since 0.2.0
1343−reqBodyMultipart :: (MonadIO m) => [LM.Part] -> m ReqBodyMultipart
1357+reqBodyMultipart :: MonadIO m => [LM.Part] -> m ReqBodyMultipart
1344reqBodyMultipart parts = liftIO $ do
1358reqBodyMultipart parts = liftIO $ do
1345 boundary <- LM.webkitBoundary
1359 boundary <- LM.webkitBoundary
1346 body <- LM.renderParts boundary parts
1360 body <- LM.renderParts boundary parts
@@ -1380,7 +1394,7 @@ type family
1380 TypeError
1394 TypeError
1381 ('Text "This HTTP method does not allow attaching a request body.")
1395 ('Text "This HTTP method does not allow attaching a request body.")
1382
1396
1383−instance (HttpBody body) => RequestComponent (Tagged "body" body) where
1397+instance HttpBody body => RequestComponent (Tagged "body" body) where
1384 getRequestMod (Tagged body) = Endo $ \x ->
1398 getRequestMod (Tagged body) = Endo $ \x ->
1385 x
1399 x
1386 { L.requestBody = getRequestBody body,
1400 { L.requestBody = getRequestBody body,
@@ -1450,7 +1464,7 @@ instance RequestComponent (Option scheme) where
1450
1464
1451-- | Finalize given 'L.Request' by applying a finalizer from the given
1465-- | Finalize given 'L.Request' by applying a finalizer from the given
1452-- 'Option' (if it has any).
1466-- 'Option' (if it has any).
1453−finalizeRequest :: (MonadIO m) => Option scheme -> L.Request -> m L.Request
1467+finalizeRequest :: MonadIO m => Option scheme -> L.Request -> m L.Request
1454finalizeRequest (Option _ mfinalizer) = liftIO . fromMaybe pure mfinalizer
1468finalizeRequest (Option _ mfinalizer) = liftIO . fromMaybe pure mfinalizer
1455
1469
1456----------------------------------------------------------------------------
1470----------------------------------------------------------------------------
@@ -1483,7 +1497,7 @@ name =: value = queryParam name (pure value)
1483-- This operator is defined in terms of 'queryParam':
1497-- This operator is defined in terms of 'queryParam':
1484--
1498--
1485-- > queryFlag name = queryParam name (Nothing :: Maybe ())
1499-- > queryFlag name = queryParam name (Nothing :: Maybe ())
1486−queryFlag :: (QueryParam param) => Text -> param
1500+queryFlag :: QueryParam param => Text -> param
1487queryFlag name = queryParam name (Nothing :: Maybe ())
1501queryFlag name = queryParam name (Nothing :: Maybe ())
1488
1502
1489-- | Construct query parameters from a 'ToForm' instance. This function
1503-- | Construct query parameters from a 'ToForm' instance. This function
@@ -1513,7 +1527,7 @@ class QueryParam param where
1513 -- 'Nothing', it won't be included at all (i.e. you create a flag this
1527 -- 'Nothing', it won't be included at all (i.e. you create a flag this
1514 -- way). It's recommended to use @('=:')@ and 'queryFlag' instead of this
1528 -- way). It's recommended to use @('=:')@ and 'queryFlag' instead of this
1515 -- method, because they are easier to read.
1529 -- method, because they are easier to read.
1516− queryParam :: (ToHttpApiData a) => Text -> Maybe a -> param
1530+ queryParam :: ToHttpApiData a => Text -> Maybe a -> param
1517
1531
1518 -- | Get the query parameter names and values set by 'queryParam'.
1532 -- | Get the query parameter names and values set by 'queryParam'.
1519 --
1533 --
@@ -1547,14 +1561,6 @@ attachHeader :: ByteString -> ByteString -> L.Request -> L.Request
1547attachHeader name value x =
1561attachHeader name value x =
1548 x {L.requestHeaders = (CI.mk name, value) : L.requestHeaders x}
1562 x {L.requestHeaders = (CI.mk name, value) : L.requestHeaders x}
1549
1563
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−
1558----------------------------------------------------------------------------
1564----------------------------------------------------------------------------
1559-- Request—Optional parameters—Cookies
1565-- Request—Optional parameters—Cookies
1560
1566
@@ -1762,7 +1768,7 @@ ignoreResponse = Proxy
1762newtype JsonResponse a = JsonResponse (L.Response a)
1768newtype JsonResponse a = JsonResponse (L.Response a)
1763 deriving (Show)
1769 deriving (Show)
1764
1770
1765−instance (FromJSON a) => HttpResponse (JsonResponse a) where
1771+instance FromJSON a => HttpResponse (JsonResponse a) where
1766 type HttpResponseBody (JsonResponse a) = a
1772 type HttpResponseBody (JsonResponse a) = a
1767 toVanillaResponse (JsonResponse r) = r
1773 toVanillaResponse (JsonResponse r) = r
1768 getHttpResponse r = do
1774 getHttpResponse r = do
@@ -1878,14 +1884,14 @@ brReadN br n = go 0 id id
1878
1884
1879-- | Get the response body.
1885-- | Get the response body.
1880responseBody ::
1886responseBody ::
1881− (HttpResponse response) =>
1887+ HttpResponse response =>
1882 response ->
1888 response ->
1883 HttpResponseBody response
1889 HttpResponseBody response
1884responseBody = L.responseBody . toVanillaResponse
1890responseBody = L.responseBody . toVanillaResponse
1885
1891
1886-- | Get the response status code.
1892-- | Get the response status code.
1887responseStatusCode ::
1893responseStatusCode ::
1888− (HttpResponse response) =>
1894+ HttpResponse response =>
1889 response ->
1895 response ->
1890 Int
1896 Int
1891responseStatusCode =
1897responseStatusCode =
@@ -1893,7 +1899,7 @@ responseStatusCode =
1893
1899
1894-- | Get the response status message.
1900-- | Get the response status message.
1895responseStatusMessage ::
1901responseStatusMessage ::
1896− (HttpResponse response) =>
1902+ HttpResponse response =>
1897 response ->
1903 response ->
1898 ByteString
1904 ByteString
1899responseStatusMessage =
1905responseStatusMessage =
@@ -1901,7 +1907,7 @@ responseStatusMessage =
1901
1907
1902-- | Lookup a particular header from a response.
1908-- | Lookup a particular header from a response.
1903responseHeader ::
1909responseHeader ::
1904− (HttpResponse response) =>
1910+ HttpResponse response =>
1905 -- | Response interpretation
1911 -- | Response interpretation
1906 response ->
1912 response ->
1907 -- | Header to lookup
1913 -- | Header to lookup
@@ -1913,7 +1919,7 @@ responseHeader r h =
1913
1919
1914-- | Get the response 'L.CookieJar'.
1920-- | Get the response 'L.CookieJar'.
1915responseCookieJar ::
1921responseCookieJar ::
1916− (HttpResponse response) =>
1922+ HttpResponse response =>
1917 response ->
1923 response ->
1918 L.CookieJar
1924 L.CookieJar
1919responseCookieJar = L.responseCookieJar . toVanillaResponse
1925responseCookieJar = L.responseCookieJar . toVanillaResponse
@@ -2011,7 +2017,7 @@ data HttpException
2011 | -- | A wrapper with Aeson-produced 'String' describing why decoding
2017 | -- | A wrapper with Aeson-produced 'String' describing why decoding
2012 -- failed
2018 -- failed
2013 JsonHttpException String
2019 JsonHttpException String
2014− deriving (Show, Generic)
2020+ deriving (Show, Typeable, Generic)
2015
2021
2016instance Exception HttpException
2022instance Exception HttpException
2017
2023
@@ -2048,4 +2054,4 @@ data Scheme
2048 Http
2054 Http
2049 | -- | HTTPS
2055 | -- | HTTPS
2050 Https
2056 Https
2051− deriving (Eq, Ord, Show, Data, Generic, TH.Lift)
2057+ deriving (Eq, Ord, Show, Data, Typeable, Generic, TH.Lift)
README.md+1−1
@@ -4,7 +4,7 @@
4[![Hackage](https://img.shields.io/hackage/v/req.svg?style=flat)](https://hackage.haskell.org/package/req)
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)
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)
6[![Stackage LTS](http://stackage.org/package/req/badge/lts)](http://stackage.org/lts/package/req)
7−[![CI](https://github.com/mrkkrp/req/actions/workflows/ci.yaml/badge.svg)](https://github.com/mrkkrp/req/actions/workflows/ci.yaml)
7+![CI](https://github.com/mrkkrp/req/workflows/CI/badge.svg?branch=master)
8
8
9* [Related packages](#related-packages)
9* [Related packages](#related-packages)
10* [Blog posts](#blog-posts)
10* [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-tests/Network/HTTP/ReqSpec.hs+41−73
@@ -11,22 +11,21 @@ import Control.Exception
11import Control.Monad (forM_)
11import Control.Monad (forM_)
12import Control.Monad.Trans.Control
12import Control.Monad.Trans.Control
13import Data.Aeson (ToJSON (..), Value (..), object, (.=))
13import Data.Aeson (ToJSON (..), Value (..), object, (.=))
14−import Data.Aeson qualified as A
14+import qualified Data.Aeson as A
15−import Data.Aeson.KeyMap qualified as Aeson.KeyMap
15+import qualified Data.Aeson.KeyMap as Aeson.KeyMap
16−import Data.ByteString qualified as B
16+import qualified Data.ByteString as B
17−import Data.ByteString.Lazy qualified as BL
17+import qualified Data.ByteString.Lazy as BL
18import Data.Functor.Identity (runIdentity)
18import Data.Functor.Identity (runIdentity)
19import Data.Maybe (fromJust)
19import Data.Maybe (fromJust)
20import Data.Proxy
20import Data.Proxy
21import Data.Text (Text)
21import Data.Text (Text)
22−import Data.Text qualified as T
22+import qualified Data.Text as T
23−import Data.Text.Encoding qualified as T
23+import qualified Data.Text.Encoding as T
24−import Data.Text.IO qualified as TIO
24+import qualified Data.Text.IO as TIO
25−import Network.HTTP.Client qualified as L
25+import qualified Network.HTTP.Client as L
26−import Network.HTTP.Client.MultipartFormData qualified as LM
26+import qualified Network.HTTP.Client.MultipartFormData as LM
27−import Network.HTTP.Req hiding (req)
27+import Network.HTTP.Req
28−import Network.HTTP.Req qualified as Req
29−import Network.HTTP.Types qualified as Y
28+import qualified Network.HTTP.Types as Y
30import Test.Hspec
29import Test.Hspec
31import Test.QuickCheck
30import Test.QuickCheck
32
31
@@ -85,7 +84,8 @@ spec = do
85 .= object
84 .= object
86 [ "Accept-Encoding" .= ("gzip" :: Text),
85 [ "Accept-Encoding" .= ("gzip" :: Text),
87 "Foo" .= ("bar" :: Text),
86 "Foo" .= ("bar" :: Text),
88− "Baz" .= ("quux" :: Text)
87+ "Baz" .= ("quux" :: Text),
88+ "Host" .= ("httpbin.org" :: Text)
89 ]
89 ]
90 ]
90 ]
91 responseStatusCode r `shouldBe` 200
91 responseStatusCode r `shouldBe` 200
@@ -97,10 +97,11 @@ spec = do
97 (stripFunnyHeaders . stripOrigin) (responseBody r)
97 (stripFunnyHeaders . stripOrigin) (responseBody r)
98 `shouldBe` object
98 `shouldBe` object
99 [ "args" .= emptyObject,
99 [ "args" .= emptyObject,
100− "url" .= ("http://localhost:1234/get" :: Text),
100+ "url" .= ("https://httpbin.org/get" :: Text),
101 "headers"
101 "headers"
102 .= object
102 .= object
103− [ "Accept-Encoding" .= ("gzip" :: Text)
103+ [ "Accept-Encoding" .= ("gzip" :: Text),
104+ "Host" .= ("httpbin.org" :: Text)
104 ]
105 ]
105 ]
106 ]
106 responseHeader r "Content-Type" `shouldBe` return "application/json"
107 responseHeader r "Content-Type" `shouldBe` return "application/json"
@@ -117,11 +118,12 @@ spec = do
117 [ "args" .= emptyObject,
118 [ "args" .= emptyObject,
118 "json" .= text,
119 "json" .= text,
119 "data" .= reflected,
120 "data" .= reflected,
120− "url" .= ("http://localhost:1234/post" :: Text),
121+ "url" .= ("https://httpbin.org/post" :: Text),
121 "headers"
122 "headers"
122 .= object
123 .= object
123 [ "Content-Type" .= ("application/json; charset=utf-8" :: Text),
124 [ "Content-Type" .= ("application/json; charset=utf-8" :: Text),
124 "Accept-Encoding" .= ("gzip" :: Text),
125 "Accept-Encoding" .= ("gzip" :: Text),
126+ "Host" .= ("httpbin.org" :: Text),
125 "Content-Length" .= show (T.length reflected)
127 "Content-Length" .= show (T.length reflected)
126 ],
128 ],
127 "files" .= emptyObject,
129 "files" .= emptyObject,
@@ -145,11 +147,12 @@ spec = do
145 [ "args" .= emptyObject,
147 [ "args" .= emptyObject,
146 "json" .= Null,
148 "json" .= Null,
147 "data" .= ("" :: Text),
149 "data" .= ("" :: Text),
148− "url" .= ("http://localhost:1234/post" :: Text),
150+ "url" .= ("https://httpbin.org/post" :: Text),
149 "headers"
151 "headers"
150 .= object
152 .= object
151 [ "Content-Type" .= T.decodeUtf8 contentType,
153 [ "Content-Type" .= T.decodeUtf8 contentType,
152 "Accept-Encoding" .= ("gzip" :: Text),
154 "Accept-Encoding" .= ("gzip" :: Text),
155+ "Host" .= ("httpbin.org" :: Text),
153 "Content-Length" .= ("242" :: Text)
156 "Content-Length" .= ("242" :: Text)
154 ],
157 ],
155 "files" .= emptyObject,
158 "files" .= emptyObject,
@@ -174,10 +177,11 @@ spec = do
174 [ "args" .= emptyObject,
177 [ "args" .= emptyObject,
175 "json" .= Null,
178 "json" .= Null,
176 "data" .= contents,
179 "data" .= contents,
177− "url" .= ("http://localhost:1234/patch" :: Text),
180+ "url" .= ("https://httpbin.org/patch" :: Text),
178 "headers"
181 "headers"
179 .= object
182 .= object
180 [ "Accept-Encoding" .= ("gzip" :: Text),
183 [ "Accept-Encoding" .= ("gzip" :: Text),
184+ "Host" .= ("httpbin.org" :: Text),
181 "Content-Length" .= show (T.length contents)
185 "Content-Length" .= show (T.length contents)
182 ],
186 ],
183 "files" .= emptyObject,
187 "files" .= emptyObject,
@@ -199,11 +203,12 @@ spec = do
199 [ "args" .= emptyObject,
203 [ "args" .= emptyObject,
200 "json" .= Null,
204 "json" .= Null,
201 "data" .= ("" :: Text),
205 "data" .= ("" :: Text),
202− "url" .= ("http://localhost:1234/put" :: Text),
206+ "url" .= ("https://httpbin.org/put" :: Text),
203 "headers"
207 "headers"
204 .= object
208 .= object
205 [ "Content-Type" .= ("application/x-www-form-urlencoded" :: Text),
209 [ "Content-Type" .= ("application/x-www-form-urlencoded" :: Text),
206 "Accept-Encoding" .= ("gzip" :: Text),
210 "Accept-Encoding" .= ("gzip" :: Text),
211+ "Host" .= ("httpbin.org" :: Text),
207 "Content-Length" .= ("18" :: Text)
212 "Content-Length" .= ("18" :: Text)
208 ],
213 ],
209 "files" .= emptyObject,
214 "files" .= emptyObject,
@@ -301,7 +306,7 @@ spec = do
301 (httpbin /: "basic-auth" /~ user /~ password)
306 (httpbin /: "basic-auth" /~ user /~ password)
302 NoReqBody
307 NoReqBody
303 ignoreResponse
308 ignoreResponse
304− (basicAuthUnsafe (T.encodeUtf8 user) (T.encodeUtf8 password))
309+ (basicAuth (T.encodeUtf8 user) (T.encodeUtf8 password))
305 responseStatusCode r `shouldBe` 200
310 responseStatusCode r `shouldBe` 200
306 responseStatusMessage r `shouldBe` "OK"
311 responseStatusMessage r `shouldBe` "OK"
307
312
@@ -401,28 +406,8 @@ blindlyThrowing = runReq defaultHttpConfig {httpConfigCheckResponse = doit}
401 doit _ _ = error "Oops!"
406 doit _ _ = error "Oops!"
402
407
403-- | 'Url' representing <https://httpbin.org>.
408-- | 'Url' representing <https://httpbin.org>.
404−httpbin :: Url 'Http
409+httpbin :: Url 'Https
405−httpbin = http "localhost"
410+httpbin = https "httpbin.org"
406−
407−req ::
408− ( MonadHttp m,
409− HttpMethod method,
410− HttpBody body,
411− HttpResponse response,
412− HttpBodyAllowed (AllowsBody method) (ProvidesBody body)
413− ) =>
414− method ->
415− Url scheme ->
416− body ->
417− Proxy response ->
418− Option scheme ->
419− m response
420−req method url body responseProxy options =
421− Req.req method url body responseProxy (options <> defaultOptions)
422−
423−-- | Options to apply by default.
424−defaultOptions :: Option scheme
425−defaultOptions = port 1234
426
411
427-- | Remove “origin” field from JSON value. Origin may change, we don't want
412-- | Remove “origin” field from JSON value. Origin may change, we don't want
428-- to depend on that.
413-- to depend on that.
@@ -432,36 +417,19 @@ stripOrigin value = value
432
417
433-- | Remove funny headers that might break the tests.
418-- | Remove funny headers that might break the tests.
434stripFunnyHeaders :: Value -> Value
419stripFunnyHeaders :: Value -> Value
435−stripFunnyHeaders = \case
420+stripFunnyHeaders (Object m) =
436− Object m ->
437− Object
438− ( runIdentity
439− ( Aeson.KeyMap.alterF
440− (pure . fmap stripFunnyHeaders')
441− "headers"
442− m
443− )
444− )
445− value -> value
446−
447−-- | Similar to 'stripFunnyHeaders', but acts directly on the argument
448−-- without trying to access its "headers" field.
449−stripFunnyHeaders' :: Value -> Value
450−stripFunnyHeaders' = \case
451− Object p ->
452− Object $
453− Aeson.KeyMap.filterWithKey
421+ let f (Object p) = Object $ Aeson.KeyMap.filterWithKey (\k _ -> k `elem` hs) p
454− (\k _ -> k `elem` whitelistedHeaders)
455− p
456− value -> value
422+ f value = value
457− where
423+ hs =
458− whitelistedHeaders =
459− [ "Content-Type",
424+ [ "Content-Type",
460− "Accept-Encoding",
425+ "Accept-Encoding",
426+ "Host",
461− "Content-Length",
427+ "Content-Length",
462− "Foo",
428+ "Foo",
463− "Baz"
429+ "Baz"
464− ]
430+ ]
431+ in Object (runIdentity (Aeson.KeyMap.alterF (pure . fmap f) "headers" m))
432+stripFunnyHeaders value = value
465
433
466-- | This is a complete test case that makes use of <https://httpbin.org> to
434-- | This is a complete test case that makes use of <https://httpbin.org> to
467-- get various response status codes.
435-- get various response status codes.
@@ -503,7 +471,7 @@ emptyObject :: Value
503emptyObject = Object Aeson.KeyMap.empty
471emptyObject = Object Aeson.KeyMap.empty
504
472
505-- | Get a rendered JSON value as 'Text'.
473-- | Get a rendered JSON value as 'Text'.
506−reflectJSON :: (ToJSON a) => a -> Text
474+reflectJSON :: ToJSON a => a -> Text
507reflectJSON = T.decodeUtf8 . BL.toStrict . A.encode
475reflectJSON = T.decodeUtf8 . BL.toStrict . A.encode
508
476
509-- | Clarify to the type checker that the inner computation is in the 'IO'
477-- | Clarify to the type checker that the inner computation is in the 'IO'
pure-tests/Network/HTTP/ReqSpec.hs+18−18
@@ -13,41 +13,41 @@
13
13
14module Network.HTTP.ReqSpec (spec) where
14module Network.HTTP.ReqSpec (spec) where
15
15
16−import Blaze.ByteString.Builder qualified as BB
16+import qualified Blaze.ByteString.Builder as BB
17import Control.Exception (throwIO)
17import Control.Exception (throwIO)
18import Control.Monad
18import Control.Monad
19import Control.Retry
19import Control.Retry
20import Data.Aeson (ToJSON (..))
20import Data.Aeson (ToJSON (..))
21−import Data.Aeson qualified as A
21+import qualified Data.Aeson as A
22import Data.ByteString (ByteString)
22import Data.ByteString (ByteString)
23−import Data.ByteString qualified as B
23+import qualified Data.ByteString as B
24−import Data.ByteString.Char8 qualified as B8
24+import qualified Data.ByteString.Char8 as B8
25−import Data.ByteString.Lazy qualified as BL
25+import qualified Data.ByteString.Lazy as BL
26−import Data.CaseInsensitive qualified as CI
26+import qualified Data.CaseInsensitive as CI
27import Data.Either (isRight)
27import Data.Either (isRight)
28−import Data.List.NonEmpty qualified as NE
28+import qualified Data.List.NonEmpty as NE
29import Data.Maybe (fromJust, fromMaybe, isJust, isNothing)
29import Data.Maybe (fromJust, fromMaybe, isJust, isNothing)
30import Data.Proxy
30import Data.Proxy
31import Data.Text (Text)
31import Data.Text (Text)
32−import Data.Text qualified as T
32+import qualified Data.Text as T
33−import Data.Text.Encoding qualified as T
33+import qualified Data.Text.Encoding as T
34import Data.Time
34import Data.Time
35import Data.Typeable (Typeable, eqT)
35import Data.Typeable (Typeable, eqT)
36import GHC.Exts (IsList (..))
36import GHC.Exts (IsList (..))
37import GHC.Generics
37import GHC.Generics
38−import Language.Haskell.TH qualified as TH
38+import qualified Language.Haskell.TH as TH
39−import Language.Haskell.TH.Quote qualified as TH
39+import qualified Language.Haskell.TH.Quote as TH
40−import Network.HTTP.Client qualified as L
40+import qualified Network.HTTP.Client as L
41import Network.HTTP.Req
41import Network.HTTP.Req
42−import Network.HTTP.Types qualified as Y
42+import qualified Network.HTTP.Types as Y
43−import Network.HTTP.Types.Header qualified as Y
43+import qualified Network.HTTP.Types.Header as Y
44import Test.Hspec
44import Test.Hspec
45import Test.Hspec.Core.Spec (SpecM)
45import Test.Hspec.Core.Spec (SpecM)
46import Test.QuickCheck
46import Test.QuickCheck
47import Text.URI (URI)
47import Text.URI (URI)
48−import Text.URI qualified as URI
48+import qualified Text.URI as URI
49−import Text.URI.QQ qualified as QQ
49+import qualified Text.URI.QQ as QQ
50−import Web.FormUrlEncoded qualified as F
50+import qualified Web.FormUrlEncoded as F
51
51
52spec :: Spec
52spec :: Spec
53spec = do
53spec = do
@@ -413,7 +413,7 @@ spec = do
413 -- 'Https, Option _) type checks, so we can catch if the type of scheme
413 -- 'Https, Option _) type checks, so we can catch if the type of scheme
414 -- is unspecified.
414 -- is unspecified.
415 let testTypeOfQuoterResult ::
415 let testTypeOfQuoterResult ::
416− forall a s. (Typeable a) => (a, Option s) -> Bool
416+ forall a s. Typeable a => (a, Option s) -> Bool
417 testTypeOfQuoterResult _ = isJust $ eqT @a @(Url 'Https)
417 testTypeOfQuoterResult _ = isJust $ eqT @a @(Url 'Https)
418 in property $ testTypeOfQuoterResult [urlQ|https://example.org/|]
418 in property $ testTypeOfQuoterResult [urlQ|https://example.org/|]
419 it "doesn't work for invalid urls" $
419 it "doesn't work for invalid urls" $
req.cabal+42−42
@@ -1,11 +1,11 @@
1cabal-version: 2.4
1cabal-version: 2.4
2name: req
2name: req
3−version: 3.13.4
3+version: 3.12.0
4license: BSD-3-Clause
4license: BSD-3-Clause
5license-file: LICENSE.md
5license-file: LICENSE.md
6maintainer: Mark Karpov <markkarpov92@gmail.com>
6maintainer: Mark Karpov <markkarpov92@gmail.com>
7author: Mark Karpov <markkarpov92@gmail.com>
7author: Mark Karpov <markkarpov92@gmail.com>
8−tested-with: ghc ==9.6.3 ghc ==9.8.2 ghc ==9.10.1
8+tested-with: ghc ==8.10.7 ghc ==9.0.2 ghc ==9.2.1
9homepage: https://github.com/mrkkrp/req
9homepage: https://github.com/mrkkrp/req
10bug-reports: https://github.com/mrkkrp/req/issues
10bug-reports: https://github.com/mrkkrp/req/issues
11synopsis: HTTP client library
11synopsis: HTTP client library
@@ -31,70 +31,71 @@ flag dev
31
31
32library
32library
33 exposed-modules: Network.HTTP.Req
33 exposed-modules: Network.HTTP.Req
34− default-language: GHC2021
34+ default-language: Haskell2010
35 build-depends:
35 build-depends:
36 aeson >=0.9 && <3,
36 aeson >=0.9 && <3,
37 authenticate-oauth >=1.5 && <1.8,
37 authenticate-oauth >=1.5 && <1.8,
38− base >=4.15 && <5,
38+ base >=4.13 && <5.0,
39 blaze-builder >=0.3 && <0.5,
39 blaze-builder >=0.3 && <0.5,
40− bytestring >=0.10.8 && <0.13,
40+ bytestring >=0.10.8 && <0.12,
41 case-insensitive >=0.2 && <1.3,
41 case-insensitive >=0.2 && <1.3,
42− containers >=0.5 && <0.8,
43− crypton-connection >=0.4.2 && <0.5,
42+ connection >=0.2.2 && <0.4,
44− data-default-class >=0.2.0.0,
45 exceptions >=0.6 && <0.11,
43 exceptions >=0.6 && <0.11,
46− http-api-data >=0.2 && <0.7,
44+ http-api-data >=0.2 && <0.6,
47− http-client >=0.7.13.1 && <0.8,
45+ http-client >=0.7 && <0.8,
48 http-client-tls >=0.3.2 && <0.4,
46 http-client-tls >=0.3.2 && <0.4,
49− http-types >=0.8 && <10,
47+ http-types >=0.8 && <10.0,
50 modern-uri >=0.3 && <0.4,
48 modern-uri >=0.3 && <0.4,
51 monad-control >=1.0 && <1.1,
49 monad-control >=1.0 && <1.1,
52 mtl >=2.0 && <3.0,
50 mtl >=2.0 && <3.0,
53 retry >=0.8 && <0.10,
51 retry >=0.8 && <0.10,
54− template-haskell >=2.19 && <2.23,
52+ template-haskell >=2.14 && <2.19,
55− text >=0.2 && <2.2,
53+ text >=0.2 && <2.1,
54+ time >=1.2 && <1.13,
56 transformers >=0.5.3.0 && <0.7,
55 transformers >=0.5.3.0 && <0.7,
57 transformers-base,
56 transformers-base,
58 unliftio-core >=0.1.1 && <0.3
57 unliftio-core >=0.1.1 && <0.3
59
58
60 if flag(dev)
59 if flag(dev)
61− ghc-options:
60+ ghc-options: -O0 -Wall -Werror
62− -Wall -Werror -Wpartial-fields -Wunused-packages
63− -Wno-unused-imports
64
61
65 else
62 else
66 ghc-options: -O2 -Wall
63 ghc-options: -O2 -Wall
67
64
65+ if flag(dev)
66+ ghc-options:
67+ -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns
68+ -Wnoncanonical-monad-instances
69+
68test-suite pure-tests
70test-suite pure-tests
69 type: exitcode-stdio-1.0
71 type: exitcode-stdio-1.0
70 main-is: Spec.hs
72 main-is: Spec.hs
71− build-tool-depends: hspec-discover:hspec-discover >=2 && <3
73+ build-tool-depends: hspec-discover:hspec-discover >=2.0 && <3.0
72 hs-source-dirs: pure-tests
74 hs-source-dirs: pure-tests
73 other-modules: Network.HTTP.ReqSpec
75 other-modules: Network.HTTP.ReqSpec
74− default-language: GHC2021
76+ default-language: Haskell2010
75 build-depends:
77 build-depends:
76− QuickCheck >=2.7 && <3,
78+ QuickCheck >=2.7 && <3.0,
77 aeson >=0.9 && <3,
79 aeson >=0.9 && <3,
78− base >=4.15 && <5.0,
80+ base >=4.13 && <5.0,
79 blaze-builder >=0.3 && <0.5,
81 blaze-builder >=0.3 && <0.5,
80− bytestring >=0.10.8 && <0.13,
82+ bytestring >=0.10.8 && <0.12,
81 case-insensitive >=0.2 && <1.3,
83 case-insensitive >=0.2 && <1.3,
82− hspec >=2.0 && <3,
84+ hspec >=2.0 && <3.0,
83− hspec-core >=2.0 && <3,
85+ hspec-core >=2.0 && <3.0,
84− http-api-data >=0.2 && <0.7,
86+ http-api-data >=0.2 && <0.6,
85 http-client >=0.7 && <0.8,
87 http-client >=0.7 && <0.8,
86− http-types >=0.8 && <10,
88+ http-types >=0.8 && <10.0,
87 modern-uri >=0.3 && <0.4,
89 modern-uri >=0.3 && <0.4,
90+ mtl >=2.0 && <3.0,
88 req,
91 req,
89 retry >=0.8 && <0.10,
92 retry >=0.8 && <0.10,
90− template-haskell >=2.19 && <2.23,
93+ template-haskell >=2.14 && <2.19,
91− text >=0.2 && <2.2,
94+ text >=0.2 && <2.1,
92− time >=1.2 && <1.15
95+ time >=1.2 && <1.13
93
96
94 if flag(dev)
97 if flag(dev)
95− ghc-options:
98+ ghc-options: -O0 -Wall -Werror
96− -Wall -Werror -Wredundant-constraints -Wpartial-fields
97− -Wunused-packages
98
99
99 else
100 else
100 ghc-options: -O2 -Wall
101 ghc-options: -O2 -Wall
@@ -102,26 +103,25 @@ test-suite pure-tests
102test-suite httpbin-tests
103test-suite httpbin-tests
103 type: exitcode-stdio-1.0
104 type: exitcode-stdio-1.0
104 main-is: Spec.hs
105 main-is: Spec.hs
105− build-tool-depends: hspec-discover:hspec-discover >=2 && <3
106+ build-tool-depends: hspec-discover:hspec-discover >=2.0 && <3.0
106 hs-source-dirs: httpbin-tests
107 hs-source-dirs: httpbin-tests
107 other-modules: Network.HTTP.ReqSpec
108 other-modules: Network.HTTP.ReqSpec
108− default-language: GHC2021
109+ default-language: Haskell2010
109 build-depends:
110 build-depends:
110− QuickCheck >=2.7 && <3,
111+ QuickCheck >=2.7 && <3.0,
111 aeson >=2 && <3,
112 aeson >=2 && <3,
112− base >=4.15 && <5,
113+ base >=4.13 && <5.0,
113− bytestring >=0.10.8 && <0.13,
114+ bytestring >=0.10.8 && <0.12,
114 hspec >=2.0 && <3.0,
115 hspec >=2.0 && <3.0,
115 http-client >=0.7 && <0.8,
116 http-client >=0.7 && <0.8,
116− http-types >=0.8 && <10,
117+ http-types >=0.8 && <10.0,
117 monad-control >=1.0 && <1.1,
118 monad-control >=1.0 && <1.1,
119+ mtl >=2.0 && <3.0,
118 req,
120 req,
119− text >=0.2 && <2.2
121+ text >=0.2 && <2.1
120
122
121 if flag(dev)
123 if flag(dev)
122− ghc-options:
124+ ghc-options: -O0 -Wall -Werror
123− -Wall -Werror -Wredundant-constraints -Wpartial-fields
124− -Wunused-packages
125
125
126 else
126 else
127− buildable: False
127+ ghc-options: -O2 -Wall