Hello community,
here is the log from the commit of package ghc-wreq for openSUSE:Factory
checked in at 2017-03-21 22:48:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-wreq (Old)
and /work/SRC/openSUSE:Factory/.ghc-wreq.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-wreq"
Tue Mar 21 22:48:22 2017 rev:4 rq:462022 version:0.5.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-wreq/ghc-wreq.changes 2016-07-26
13:12:59.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-wreq.new/ghc-wreq.changes 2017-03-21
22:48:24.136510604 +0100
@@ -1,0 +2,5 @@
+Thu Feb 23 23:31:28 UTC 2017 - psim...@suse.com
+
+- Update to version 0.5.0.0 with cabal2obs.
+
+-------------------------------------------------------------------
Old:
----
1.cabal
wreq-0.4.1.0.tar.gz
New:
----
wreq-0.5.0.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-wreq.spec ++++++
--- /var/tmp/diff_new_pack.I4zaMQ/_old 2017-03-21 22:48:25.320343241 +0100
+++ /var/tmp/diff_new_pack.I4zaMQ/_new 2017-03-21 22:48:25.324342675 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ghc-wreq
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,16 +19,14 @@
%global pkg_name wreq
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 0.4.1.0
+Version: 0.5.0.0
Release: 0
Summary: An easy-to-use HTTP client library
License: BSD-3-Clause
-Group: System/Libraries
+Group: Development/Languages/Other
Url: https://hackage.haskell.org/package/%{pkg_name}
Source0:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
-Source1:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal
BuildRequires: ghc-Cabal-devel
-# Begin cabal-rpm deps:
BuildRequires: ghc-aeson-devel
BuildRequires: ghc-attoparsec-devel
BuildRequires: ghc-authenticate-oauth-devel
@@ -74,7 +72,6 @@
BuildRequires: ghc-uuid-devel
BuildRequires: ghc-vector-devel
%endif
-# End cabal-rpm deps
%description
A web client library that is designed for ease of use.
@@ -114,22 +111,15 @@
%prep
%setup -q -n %{pkg_name}-%{version}
-cp -p %{SOURCE1} %{pkg_name}.cabal
-
%build
%ghc_lib_build
-
%install
%ghc_lib_install
-
%check
-%if %{with tests}
-%{cabal} test
-%endif
-
+%cabal_test
%post devel
%ghc_pkg_recache
++++++ wreq-0.4.1.0.tar.gz -> wreq-0.5.0.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wreq-0.4.1.0/Network/Wreq/Internal/Lens.hs
new/wreq-0.5.0.0/Network/Wreq/Internal/Lens.hs
--- old/wreq-0.4.1.0/Network/Wreq/Internal/Lens.hs 2015-12-22
22:56:49.000000000 +0100
+++ new/wreq-0.5.0.0/Network/Wreq/Internal/Lens.hs 2017-02-14
17:03:34.000000000 +0100
@@ -20,8 +20,7 @@
, decompress
, redirectCount
, responseTimeout
- , checkStatus
- , getConnectionWrapper
+ , checkResponse
, cookieJar
, seshCookies
, seshManager
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wreq-0.4.1.0/Network/Wreq/Internal/Types.hs
new/wreq-0.5.0.0/Network/Wreq/Internal/Types.hs
--- old/wreq-0.4.1.0/Network/Wreq/Internal/Types.hs 2015-12-22
22:56:49.000000000 +0100
+++ new/wreq-0.5.0.0/Network/Wreq/Internal/Types.hs 2017-02-14
17:03:34.000000000 +0100
@@ -19,7 +19,7 @@
, Mgr
, Auth(..)
, AWSAuthVersion(..)
- , StatusChecker
+ , ResponseChecker
-- * Request payloads
, Payload(..)
, Postable(..)
@@ -43,16 +43,16 @@
, CacheEntry(..)
) where
-import Control.Exception (Exception, SomeException)
+import Control.Exception (Exception)
import Data.IORef (IORef)
-import Data.Monoid ((<>), mconcat)
+import Data.Monoid ((<>))
import Data.Text (Text)
import Data.Time.Clock (UTCTime)
import Data.Typeable (Typeable)
import Network.HTTP.Client (CookieJar, Manager, ManagerSettings, Request,
RequestBody)
import Network.HTTP.Client.Internal (Response, Proxy)
-import Network.HTTP.Types (Header, Status, ResponseHeaders)
+import Network.HTTP.Types (Header)
import Prelude hiding (head)
import qualified Data.ByteString.Char8 as S
import qualified Data.ByteString.Lazy as L
@@ -150,7 +150,7 @@
-- etc.), this field will be used only for the /first/ HTTP request
-- to be issued during a 'Network.Wreq.Session.Session'. Any changes
-- changes made for subsequent requests will be ignored.
- , checkStatus :: Maybe StatusChecker
+ , checkResponse :: Maybe ResponseChecker
-- ^ Function that checks the status code and potentially returns an
-- exception.
--
@@ -161,8 +161,7 @@
-- | A function that checks the result of a HTTP request and
-- potentially returns an exception.
-type StatusChecker = Status -> ResponseHeaders -> CookieJar
- -> Maybe SomeException
+type ResponseChecker = Request -> Response HTTP.BodyReader -> IO ()
-- | Supported authentication types.
--
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wreq-0.4.1.0/Network/Wreq/Internal.hs
new/wreq-0.5.0.0/Network/Wreq/Internal.hs
--- old/wreq-0.4.1.0/Network/Wreq/Internal.hs 2015-12-22 22:56:49.000000000
+0100
+++ new/wreq-0.5.0.0/Network/Wreq/Internal.hs 2017-02-14 17:03:34.000000000
+0100
@@ -24,6 +24,7 @@
import Control.Applicative ((<$>))
import Control.Arrow ((***))
import Control.Lens ((&), (.~), (%~))
+import Control.Monad ((>=>))
import Data.Monoid ((<>))
import Data.Text.Encoding (encodeUtf8)
import Data.Version (showVersion)
@@ -42,7 +43,7 @@
import qualified Network.Wreq.Internal.Lens as Lens
import qualified Network.Wreq.Internal.AWS as AWS (signRequest)
import qualified Network.Wreq.Internal.OAuth1 as OAuth1 (signRequest)
-import qualified Network.Wreq.Lens as Lens hiding (checkStatus)
+import qualified Network.Wreq.Lens as Lens hiding (checkResponse)
-- This mess allows this module to continue to load during interactive
-- development in ghci :-(
@@ -66,7 +67,7 @@
, params = []
, redirects = 10
, cookies = Just (HTTP.createCookieJar [])
- , checkStatus = Nothing
+ , checkResponse = Nothing
}
where userAgent = "haskell wreq-" <> Char8.pack (showVersion version)
@@ -101,18 +102,18 @@
request modify opts url act = run (manager opts) act =<< prepare modify opts
url
run :: Mgr -> (Response BodyReader -> IO a) -> Request -> IO a
-run emgr act req = either (flip HTTP.withManager go) go emgr
+run emgr act req = either (HTTP.newManager >=> go) go emgr
where go mgr = HTTP.withResponse req mgr act
prepare :: (Request -> IO Request) -> Options -> String -> IO Request
prepare modify opts url = do
- signRequest =<< modify =<< frob <$> HTTP.parseUrl url
+ signRequest =<< modify =<< frob <$> HTTP.parseUrlThrow url
where
frob req = req & Lens.requestHeaders %~ (headers opts ++)
& setQuery opts
& setAuth opts
& setProxy opts
- & setCheckStatus opts
+ & setCheckResponse opts
& setRedirects opts
& Lens.cookieJar .~ cookies opts
signRequest :: Request -> IO Request
@@ -146,9 +147,9 @@
setProxy = maybe id f . proxy
where f (Proxy host port) = addProxy host port
-setCheckStatus :: Options -> Request -> Request
-setCheckStatus = maybe id f . checkStatus
- where f cs = ( & Lens.checkStatus .~ cs)
+setCheckResponse :: Options -> Request -> Request
+setCheckResponse = maybe id f . checkResponse
+ where f cs = ( & Lens.checkResponse .~ cs)
prepareGet :: Options -> String -> IO Req
prepareGet opts url = Req (manager opts) <$> prepare return opts url
@@ -166,7 +167,6 @@
preparePayloadMethod :: Postable a => HTTP.Method -> Options -> String -> a
-> IO Req
-
preparePayloadMethod method opts url payload = Req (manager opts) <$>
prepare (postPayload payload . (Lens.method .~ method)) opts url
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wreq-0.4.1.0/Network/Wreq/Lens/TH.hs
new/wreq-0.5.0.0/Network/Wreq/Lens/TH.hs
--- old/wreq-0.4.1.0/Network/Wreq/Lens/TH.hs 2015-12-22 22:56:49.000000000
+0100
+++ new/wreq-0.5.0.0/Network/Wreq/Lens/TH.hs 2017-02-14 17:03:34.000000000
+0100
@@ -15,7 +15,7 @@
, redirects
, cookie
, cookies
- , checkStatus
+ , checkResponse
, HTTP.Cookie
, cookieName
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wreq-0.4.1.0/Network/Wreq/Lens.hs
new/wreq-0.5.0.0/Network/Wreq/Lens.hs
--- old/wreq-0.4.1.0/Network/Wreq/Lens.hs 2015-12-22 22:56:49.000000000
+0100
+++ new/wreq-0.5.0.0/Network/Wreq/Lens.hs 2017-02-14 17:03:34.000000000
+0100
@@ -45,8 +45,8 @@
, params
, cookie
, cookies
- , StatusChecker
- , checkStatus
+ , ResponseChecker
+ , checkResponse
-- ** Proxy setup
, Proxy
@@ -113,7 +113,7 @@
import Network.HTTP.Types.Status (Status)
import Network.HTTP.Types.Version (HttpVersion)
import Network.Mime (MimeType)
-import Network.Wreq.Types (Auth, Link, Options, StatusChecker)
+import Network.Wreq.Types (Auth, Link, Options, ResponseChecker)
import qualified Network.Wreq.Lens.TH as TH
-- | A lens onto configuration of the connection manager provided by
@@ -228,8 +228,8 @@
redirects = TH.redirects
-- | A lens to get the optional status check function
-checkStatus :: Lens' Options (Maybe StatusChecker)
-checkStatus = TH.checkStatus
+checkResponse :: Lens' Options (Maybe ResponseChecker)
+checkResponse = TH.checkResponse
-- | A traversal onto the cookie with the given name, if one exists.
--
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wreq-0.4.1.0/Network/Wreq/Session.hs
new/wreq-0.5.0.0/Network/Wreq/Session.hs
--- old/wreq-0.4.1.0/Network/Wreq/Session.hs 2015-12-22 22:56:49.000000000
+0100
+++ new/wreq-0.5.0.0/Network/Wreq/Session.hs 2017-02-14 17:03:34.000000000
+0100
@@ -56,6 +56,7 @@
, options
, put
, delete
+ , customMethod
-- ** Configurable verbs
, getWith
, postWith
@@ -63,6 +64,7 @@
, optionsWith
, putWith
, deleteWith
+ , customMethodWith
-- * Extending a session
, Lens.seshRun
) where
@@ -75,9 +77,11 @@
import Network.Wreq.Internal.Types (Body(..), Req(..), Session(..))
import Network.Wreq.Types (Postable, Putable, Run)
import Prelude hiding (head)
+import qualified Data.ByteString.Char8 as BC8
import qualified Data.ByteString.Lazy as L
import qualified Network.HTTP.Client as HTTP
import qualified Network.Wreq.Internal.Lens as Lens
+import qualified Network.Wreq.Lens as Lens
-- | Create a 'Session', passing it to the given function. The
-- 'Session' will no longer be valid after that function returns.
@@ -109,11 +113,11 @@
-> (Session -> IO a) -> IO a
withSessionControl mj settings act = do
mref <- maybe (return Nothing) (fmap Just . newIORef) mj
- HTTP.withManager settings $ \mgr ->
- act Session { seshCookies = mref
- , seshManager = mgr
- , seshRun = runWith
- }
+ mgr <- HTTP.newManager settings
+ act Session { seshCookies = mref
+ , seshManager = mgr
+ , seshRun = runWith
+ }
-- | 'Session'-specific version of 'Network.Wreq.get'.
get :: Session -> String -> IO (Response L.ByteString)
@@ -125,7 +129,7 @@
-- | 'Session'-specific version of 'Network.Wreq.head_'.
head_ :: Session -> String -> IO (Response ())
-head_ = headWith defaults
+head_ = headWith (defaults & Lens.redirects .~ 0)
-- | 'Session'-specific version of 'Network.Wreq.options'.
options :: Session -> String -> IO (Response ())
@@ -139,6 +143,10 @@
delete :: Session -> String -> IO (Response L.ByteString)
delete = deleteWith defaults
+-- | 'Session'-specific version of 'Network.Wreq.customMethod'.
+customMethod :: String -> Session -> String -> IO (Response L.ByteString)
+customMethod = flip customMethodWith defaults
+
-- | 'Session'-specific version of 'Network.Wreq.getWith'.
getWith :: Options -> Session -> String -> IO (Response L.ByteString)
getWith opts sesh url = run string sesh =<< prepareGet opts url
@@ -166,6 +174,12 @@
deleteWith :: Options -> Session -> String -> IO (Response L.ByteString)
deleteWith opts sesh url = run string sesh =<< prepareDelete opts url
+-- | 'Session'-specific version of 'Network.Wreq.customMethodWith'.
+customMethodWith :: String -> Options -> Session -> String -> IO (Response
L.ByteString)
+customMethodWith method opts sesh url = run string sesh =<< prepareMethod
methodBS opts url
+ where
+ methodBS = BC8.pack method
+
runWith :: Session -> Run Body -> Run Body
runWith Session{..} act (Req _ req) = do
req' <- case seshCookies of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wreq-0.4.1.0/Network/Wreq/Types.hs
new/wreq-0.5.0.0/Network/Wreq/Types.hs
--- old/wreq-0.4.1.0/Network/Wreq/Types.hs 2015-12-22 22:56:49.000000000
+0100
+++ new/wreq-0.5.0.0/Network/Wreq/Types.hs 2017-02-14 17:03:34.000000000
+0100
@@ -18,7 +18,7 @@
Options(..)
, Auth(..)
, AWSAuthVersion(..)
- , StatusChecker
+ , ResponseChecker
-- * Request payloads
, Payload(..)
, Postable(..)
@@ -40,7 +40,7 @@
import Control.Lens ((&), (.~))
import Data.Aeson (Value, encode)
import Data.Int (Int8, Int16, Int32, Int64)
-import Data.Word (Word, Word8, Word16, Word32, Word64)
+import Data.Word (Word8, Word16, Word32, Word64)
import Network.HTTP.Client (Request)
import Network.HTTP.Client.MultipartFormData (Part, formDataBody)
import Network.Wreq.Internal.Types
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wreq-0.4.1.0/Network/Wreq.hs
new/wreq-0.5.0.0/Network/Wreq.hs
--- old/wreq-0.4.1.0/Network/Wreq.hs 2015-12-22 22:56:49.000000000 +0100
+++ new/wreq-0.5.0.0/Network/Wreq.hs 2017-02-14 17:03:34.000000000 +0100
@@ -82,7 +82,7 @@
, Lens.params
, Lens.cookie
, Lens.cookies
- , Lens.checkStatus
+ , Lens.checkResponse
-- ** Authentication
-- $auth
@@ -192,7 +192,8 @@
get url = getWith defaults url
withManager :: (Options -> IO a) -> IO a
-withManager act = HTTP.withManager defaultManagerSettings $ \mgr ->
+withManager act = do
+ mgr <- HTTP.newManager defaultManagerSettings
act defaults { Wreq.manager = Right mgr }
-- | Issue a GET request, using the supplied 'Options'.
@@ -373,7 +374,7 @@
-- | Issue a custom-method request with a payload, using the supplied
'Options'.
customPayloadMethodWith :: Postable a => String -> Options -> String -> a
-> IO (Response L.ByteString)
-
+
customPayloadMethodWith method opts url payload =
runRead =<< preparePayloadMethod methodBS opts url payload
where
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wreq-0.4.1.0/changelog.md
new/wreq-0.5.0.0/changelog.md
--- old/wreq-0.4.1.0/changelog.md 2015-12-22 22:56:49.000000000 +0100
+++ new/wreq-0.5.0.0/changelog.md 2017-02-14 17:03:34.000000000 +0100
@@ -1,5 +1,13 @@
-*- markdown -*-
+2017-01-09 0.5.0.0
+
+* Compatible with `http-client` >= 0.5
+
+* This compatibility change required a small API change: `checkStatus`
+ is now named `checkResponse` for compatibility with the
+ `http-client` package
+
2015-05-10 0.4.0.0
* Compatible with GHC 7.10.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wreq-0.4.1.0/httpbin/HttpBin/Server.hs
new/wreq-0.5.0.0/httpbin/HttpBin/Server.hs
--- old/wreq-0.4.1.0/httpbin/HttpBin/Server.hs 2015-12-22 22:56:49.000000000
+0100
+++ new/wreq-0.5.0.0/httpbin/HttpBin/Server.hs 2017-02-14 17:03:34.000000000
+0100
@@ -8,7 +8,7 @@
import Control.Applicative ((<$>))
import Control.Monad.IO.Class (liftIO)
import Data.Aeson (Value(..), eitherDecode, object, toJSON)
-import Data.Aeson.Encode.Pretty (Config(..), encodePretty')
+import Data.Aeson.Encode.Pretty (Config(..), Indent(Spaces), defConfig,
encodePretty')
import Data.ByteString.Char8 (pack)
import Data.CaseInsensitive (original)
import Data.Maybe (catMaybes, fromMaybe)
@@ -133,7 +133,7 @@
writeJSON obj = do
modifyResponse $ setContentType "application/json"
- writeLBS . (<> "\n") . encodePretty' (Config 2 compare) . object $ obj
+ writeLBS . (<> "\n") . encodePretty' defConfig { confIndent = Spaces 2,
confCompare = compare } . object $ obj
respond act = do
req <- getRequest
@@ -149,7 +149,7 @@
"http://"; <> host <> rqURI req)]
writeJSON =<< act ([ ("args", toJSON params)
, ("headers", toJSON hdrs)
- , ("origin", toJSON . decodeUtf8 . rqRemoteAddr $ req)
+ , ("origin", toJSON . decodeUtf8 . rqClientAddr $ req)
] <> url)
meths ms h = methods ms (path "" h)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wreq-0.4.1.0/tests/UnitTests.hs
new/wreq-0.5.0.0/tests/UnitTests.hs
--- old/wreq-0.4.1.0/tests/UnitTests.hs 2015-12-22 22:56:49.000000000 +0100
+++ new/wreq-0.5.0.0/tests/UnitTests.hs 2017-02-14 17:03:34.000000000 +0100
@@ -5,21 +5,22 @@
module UnitTests (testWith) where
+import Control.Arrow (first)
import Control.Applicative ((<$>))
import Control.Concurrent (forkIO, killThread)
import Control.Concurrent.MVar (newEmptyMVar, putMVar, takeMVar)
-import Control.Exception (Exception, toException)
-import Control.Lens ((^.), (^?), (.~), (?~), (&))
+import Control.Exception (Exception, throwIO)
+import Control.Lens ((^.), (^?), (.~), (?~), (&), iso, ix, Traversal')
import Control.Monad (unless, void)
import Data.Aeson
-import Data.Aeson.Lens (key)
+import Data.Aeson.Lens (key, AsValue, _Object)
import Data.ByteString (ByteString)
import Data.Char (toUpper)
import Data.Maybe (isJust)
import Data.Monoid ((<>))
import HttpBin.Server (serve)
-import Network.HTTP.Client (HttpException(..))
-import Network.HTTP.Types.Status (Status(Status), status200, status401)
+import Network.HTTP.Client (HttpException(..), HttpExceptionContent(..))
+import Network.HTTP.Types.Status (status200, status401)
import Network.HTTP.Types.Version (http11)
import Network.Wreq hiding
(get, post, head_, put, options, delete,
@@ -33,6 +34,8 @@
import Test.Framework.Providers.HUnit (testCase)
import Test.HUnit (assertBool, assertEqual, assertFailure)
import qualified Control.Exception as E
+import qualified Data.CaseInsensitive as CI
+import qualified Data.HashMap.Strict as HMap
import qualified Data.Text as T
import qualified Network.Wreq.Session as Session
import qualified Data.ByteString.Lazy as L
@@ -41,13 +44,13 @@
data Verb = Verb {
get :: String -> IO (Response L.ByteString)
, getWith :: Options -> String -> IO (Response L.ByteString)
- , post :: Postable a => String -> a -> IO (Response L.ByteString)
- , postWith :: Postable a => Options -> String -> a
+ , post :: forall a. Postable a => String -> a -> IO (Response L.ByteString)
+ , postWith :: forall a. Postable a => Options -> String -> a
-> IO (Response L.ByteString)
, head_ :: String -> IO (Response ())
, headWith :: Options -> String -> IO (Response ())
- , put :: Putable a => String -> a -> IO (Response L.ByteString)
- , putWith :: Putable a => Options -> String -> a -> IO (Response
L.ByteString)
+ , put :: forall a. Putable a => String -> a -> IO (Response L.ByteString)
+ , putWith :: forall a. Putable a => Options -> String -> a -> IO (Response
L.ByteString)
, options :: String -> IO (Response ())
, optionsWith :: Options -> String -> IO (Response ())
, delete :: String -> IO (Response L.ByteString)
@@ -76,10 +79,20 @@
, delete = Session.delete s
, deleteWith = flip Session.deleteWith s }
+-- Helper aeson lens for case insensitive keys
+-- The test 'snap' server unfortunately lowercases all headers, we have to be
case-insensitive
+-- when checking the returned header list.
+cikey :: AsValue t => T.Text -> Traversal' t Value
+cikey i = _Object . toInsensitive . ix (CI.mk i)
+ where
+ toInsensitive = iso toCi fromCi
+ toCi = HMap.fromList . map (first CI.mk) . HMap.toList
+ fromCi = HMap.fromList . map (first CI.original) . HMap.toList
+
basicGet Verb{..} site = do
r <- get (site "/get")
assertBool "GET request has User-Agent header" $
- isJust (r ^. responseBody ^? key "headers" . key "User-Agent")
+ isJust (r ^. responseBody ^? key "headers" . cikey "User-Agent")
-- test the various lenses
assertEqual "GET succeeds" status200 (r ^. responseStatus)
assertEqual "GET succeeds 200" 200 (r ^. responseStatus . statusCode)
@@ -96,7 +109,7 @@
assertEqual "POST succeeds" status200 (r ^. responseStatus)
assertEqual "POST echoes input" (Just "wibble") (body ^? key "data")
assertEqual "POST is binary" (Just "application/octet-stream")
- (body ^? key "headers" . key "Content-Type")
+ (body ^? key "headers" . cikey "Content-Type")
multipartPost Verb{..} site =
withSystemTempFile "foo.html" $ \name handle -> do
@@ -139,14 +152,14 @@
r <- put (site "/put") $ toJSON solrAdd
assertEqual "toJSON PUT request has correct Content-Type header"
(Just "application/json")
- (r ^. responseBody ^? key "headers" . key "Content-Type")
+ (r ^. responseBody ^? key "headers" . cikey "Content-Type")
byteStringPut Verb{..} site = do
let opts = defaults & header "Content-Type" .~ ["application/json"]
r <- putWith opts (site "/put") $ encode solrAdd
assertEqual "ByteString PUT request has correct Content-Type header"
(Just "application/json")
- (r ^. responseBody ^? key "headers" . key "Content-Type")
+ (r ^. responseBody ^? key "headers" . cikey "Content-Type")
basicDelete Verb{..} site = do
r <- delete (site "/delete")
@@ -155,18 +168,21 @@
throwsStatusCode Verb{..} site =
assertThrows "404 causes exception to be thrown" inspect $
head_ (site "/status/404")
- where inspect e = case e of
- StatusCodeException _ _ _ -> return ()
+ where inspect (HttpExceptionRequest _ e) = case e of
+ StatusCodeException _ _ -> return ()
_ -> assertFailure "unexpected exception thrown"
+ inspect _ = assertFailure "unexpected exception thrown"
getBasicAuth Verb{..} site = do
let opts = defaults & auth ?~ basicAuth "user" "passwd"
r <- getWith opts (site "/basic-auth/user/passwd")
assertEqual "basic auth GET succeeds" status200 (r ^. responseStatus)
- let inspect e = case e of
- StatusCodeException status _ _ ->
+ let inspect (HttpExceptionRequest _ e) = case e of
+ StatusCodeException resp _ ->
assertEqual "basic auth failed GET gives 401"
- status401 status
+ status401 (resp ^. responseStatus)
+ inspect _ = assertFailure "unexpected exception thrown"
+
assertThrows "basic auth GET fails if password is bad" inspect $
getWith opts (site "/basic-auth/user/asswd")
@@ -175,10 +191,11 @@
r <- getWith opts (site $ "/oauth2/" <> kind <> "/token1234")
assertEqual ("oauth2 " <> kind <> " GET succeeds")
status200 (r ^. responseStatus)
- let inspect e = case e of
- StatusCodeException status _ _ ->
+ let inspect (HttpExceptionRequest _ e) = case e of
+ StatusCodeException resp _ ->
assertEqual ("oauth2 " <> kind <> " failed GET gives
401")
- status401 status
+ status401 (resp ^. responseStatus)
+ inspect _ = assertFailure "unexpected exception thrown"
assertThrows ("oauth2 " <> kind <> " GET fails if token is bad") inspect $
getWith opts (site $ "/oauth2/" <> kind <> "/token123")
@@ -209,10 +226,10 @@
r <- getWith opts (site "/get")
assertEqual "extra header set correctly"
(Just "bar")
- (r ^. responseBody ^? key "headers" . key "X-Wibble")
+ (r ^. responseBody ^? key "headers" . cikey "X-Wibble")
getCheckStatus Verb {..} site = do
- let opts = defaults & checkStatus .~ (Just customCs)
+ let opts = defaults & checkResponse .~ Just customRc
r <- getWith opts (site "/status/404")
assertThrows "Non 404 throws error" inspect $
getWith opts (site "/get")
@@ -220,36 +237,43 @@
404
(r ^. responseStatus . statusCode)
where
- customCs (Status 404 _) _ _ = Nothing
- customCs s h cj = Just . toException . StatusCodeException s h
$ cj
+ customRc :: ResponseChecker
+ customRc _ resp
+ | resp ^. responseStatus . statusCode == 404 = return ()
+ customRc req resp = throwIO $ HttpExceptionRequest req
(StatusCodeException (void resp) "")
+
+ inspect (HttpExceptionRequest _ e) = case e of
+ (StatusCodeException resp _) ->
+ assertEqual "200 Status Error" (resp ^. responseStatus) status200
+ inspect _ = assertFailure "unexpected exception thrown"
- inspect e = case e of
- (StatusCodeException (Status sc _) _ _) ->
- assertEqual "200 Status Error" sc 200
getGzip Verb{..} site = do
r <- get (site "/gzip")
assertEqual "gzip decoded for us" (Just (Bool True))
(r ^. responseBody ^? key "gzipped")
-headRedirect Verb{..} site =
+headRedirect Verb{..} site = do
assertThrows "HEAD of redirect throws exception" inspect $
head_ (site "/redirect/3")
- where inspect e = case e of
- StatusCodeException status _ _ ->
- let code = status ^. statusCode
+ where inspect (HttpExceptionRequest _ e) = case e of
+ StatusCodeException resp _ ->
+ let code = resp ^. responseStatus . statusCode
in assertBool "code is redirect"
(code >= 300 && code < 400)
+ inspect _ = assertFailure "unexpected exception thrown"
+
redirectOverflow Verb{..} site =
assertThrows "GET with too many redirects throws exception" inspect $
getWith (defaults & redirects .~ 3) (site "/redirect/5")
- where inspect e = case e of TooManyRedirects _ -> return ()
+ where inspect (HttpExceptionRequest _ e) = case e of TooManyRedirects _ ->
return ()
+ inspect _ = assertFailure "unexpected exception thrown"
invalidURL Verb{..} _site = do
let noProto (InvalidUrlException _ _) = return ()
assertThrows "exception if no protocol" noProto (get "wheeee")
- let noHost (InvalidDestinationHost _) = return ()
+ let noHost (HttpExceptionRequest _ (InvalidDestinationHost _)) = return ()
assertThrows "exception if no host" noHost (get "http://";)
funkyScheme Verb{..} site = do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wreq-0.4.1.0/wreq.cabal new/wreq-0.5.0.0/wreq.cabal
--- old/wreq-0.4.1.0/wreq.cabal 2015-12-22 22:56:49.000000000 +0100
+++ new/wreq-0.5.0.0/wreq.cabal 2017-02-14 17:03:34.000000000 +0100
@@ -1,5 +1,5 @@
name: wreq
-version: 0.4.1.0
+version: 0.5.0.0
synopsis: An easy-to-use HTTP client library.
description:
.
@@ -97,7 +97,7 @@
psqueues >= 0.2,
aeson >= 0.7.0.3,
attoparsec >= 0.11.1.0,
- authenticate-oauth == 1.5.*,
+ authenticate-oauth >= 1.5,
base >= 4.5 && < 5,
base16-bytestring,
byteable,
@@ -108,8 +108,8 @@
exceptions >= 0.5,
ghc-prim,
hashable,
- http-client >= 0.4.6,
- http-client-tls >= 0.2,
+ http-client >= 0.5.3.2,
+ http-client-tls >= 0.3.3,
http-types >= 0.8,
lens >= 4.5,
lens-aeson,
@@ -135,13 +135,13 @@
else
build-depends:
aeson >= 0.7,
- aeson-pretty >= 0.7.1,
+ aeson-pretty >= 0.8.0,
base >= 4.5 && < 5,
base64-bytestring,
bytestring,
case-insensitive,
containers,
- snap-core,
+ snap-core >= 1.0.0.0,
snap-server >= 0.9.4.4,
text,
time,
@@ -160,6 +160,7 @@
other-modules:
Properties.Store
UnitTests
+ HttpBin.Server
if flag(aws)
cpp-options: -DAWS_TESTS
@@ -178,7 +179,7 @@
HUnit,
QuickCheck >= 2.7,
aeson,
- aeson-pretty >= 0.7.1,
+ aeson-pretty >= 0.8.0,
base >= 4.5 && < 5,
base64-bytestring,
bytestring,
@@ -190,7 +191,7 @@
lens,
lens-aeson,
network-info,
- snap-core,
+ snap-core >= 1.0.0.0,
snap-server >= 0.9.4.4,
temporary,
test-framework,
@@ -199,6 +200,7 @@
text,
time,
transformers,
+ unordered-containers,
unix-compat,
uuid,
vector,
