diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2018 Richard Cook +Copyright (c) 2018-2019 Richard Cook Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -1,9 +1,12 @@ -# `req-url-extra` - -[![Travis branch](https://img.shields.io/travis/rcook/req-url-extra/master.svg)](https://travis-ci.org/rcook/req-url-extra) +[![Travis CI](https://img.shields.io/travis/rcook/req-url-extra/master.svg)](https://travis-ci.org/rcook/req-url-extra) [![Hackage](https://img.shields.io/hackage/v/req-url-extra.svg)](http://hackage.haskell.org/package/req-url-extra) -[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/rcook/req-url-extra/master/LICENSE) +[![Hackage dependencies](https://img.shields.io/hackage-deps/v/req-url-extra.svg)](http://hackage.haskell.org/package/req-url-extra) +[![Stackage Nightly](http://stackage.org/package/req-url-extra/badge/nightly)](http://stackage.org/nightly/package/req-url-extra) +[![Stackage LTS](http://stackage.org/package/req-url-extra/badge/lts)](http://stackage.org/lts/package/req-url-extra) +[![Licence](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/rcook/req-url-extra/master/LICENSE) +# req-url-extra + This package provides helper functions to make working with `Url` from [Req][req] easier. ## Dev guide @@ -51,7 +54,7 @@ [MIT License][licence] -Copyright © 2018, Richard Cook. +Copyright © 2018-2019, Richard Cook. [change-log]: CHANGELOG.md [licence]: LICENSE diff --git a/Setup.hs b/Setup.hs --- a/Setup.hs +++ b/Setup.hs @@ -1,5 +1,5 @@ -------------------------------------------------- --- Copyright (C) 2018, All rights reserved. +-- Copyright (C) 2018-2019, All rights reserved. -------------------------------------------------- module Main (main) where diff --git a/lib/Network/HTTP/Req/Url/Extra.hs b/lib/Network/HTTP/Req/Url/Extra.hs --- a/lib/Network/HTTP/Req/Url/Extra.hs +++ b/lib/Network/HTTP/Req/Url/Extra.hs @@ -1,7 +1,7 @@ {-| Module : Network.HTTP.Req.Url.Extra Description : Functions for working with Req 'Url' -Copyright : (C) Richard Cook, 2018 +Copyright : (C) Richard Cook, 2018-2019 Licence : MIT Maintainer : rcook@rcook.org Stability : stable diff --git a/lib/Network/HTTP/Req/Url/Extra/URI.hs b/lib/Network/HTTP/Req/Url/Extra/URI.hs --- a/lib/Network/HTTP/Req/Url/Extra/URI.hs +++ b/lib/Network/HTTP/Req/Url/Extra/URI.hs @@ -1,7 +1,7 @@ {-| Module : Network.HTTP.Req.Url.Extra.URI Description : Functions for converting 'URI' to 'Url' -Copyright : (C) Richard Cook, 2018 +Copyright : (C) Richard Cook, 2018-2019 Licence : MIT Maintainer : rcook@rcook.org Stability : stable diff --git a/req-url-extra.cabal b/req-url-extra.cabal --- a/req-url-extra.cabal +++ b/req-url-extra.cabal @@ -1,6 +1,5 @@ - name: req-url-extra -version: 0.1.0.0 +version: 0.1.1.0 synopsis: Provides URI/URL helper functions for use with Req description: This package provides helper functions for use with URIs and URLs in Req. homepage: https://github.com/rcook/req-url-extra#readme @@ -9,7 +8,7 @@ license-file: LICENSE author: Richard Cook maintainer: rcook@rcook.org -copyright: 2018 Richard Cook +copyright: 2018-2019 Richard Cook category: Network, Web build-type: Simple cabal-version: >= 1.18 @@ -23,14 +22,9 @@ library default-language: Haskell2010 hs-source-dirs: lib - ghc-options: -W - -Wall - -Werror=incomplete-patterns - -Werror=missing-methods - -fwarn-unused-imports - build-depends: base >= 4.7 && < 5 - , modern-uri - , req + build-depends: base >= 4.9 && < 4.13 + , modern-uri >= 0.1 && < 0.4 + , req >= 2.0.0 && < 2.1.0 exposed-modules: Network.HTTP.Req.Url.Extra other-modules: Network.HTTP.Req.Url.Extra.URI @@ -41,18 +35,12 @@ ghc-options: -threaded -rtsopts -with-rtsopts=-N - -W - -Wall - -Werror=incomplete-patterns - -Werror=missing-methods - -fwarn-unused-imports - build-depends: aeson - , base >= 4.7 && < 5 - , data-default-class - , modern-uri - , req + build-depends: aeson >= 1.2 && < 1.5 + , base >= 4.9 && < 4.13 + , modern-uri >= 0.1 && < 0.4 + , req >= 2.0.0 && < 2.1.0 , req-url-extra - , text + , text >= 1.2 && < 1.3 test-suite req-url-extra-test type: exitcode-stdio-1.0 @@ -62,15 +50,9 @@ ghc-options: -threaded -rtsopts -with-rtsopts=-N - -W - -Wall - -Werror=incomplete-patterns - -Werror=missing-methods - -fwarn-unused-imports other-modules: URISpec - build-depends: base >= 4.7 && < 5 - , hspec - , modern-uri - , req + build-depends: base >= 4.9 && < 4.13 + , hspec >= 2.2 && < 2.8 + , modern-uri >= 0.1 && < 0.4 + , req >= 2.0.0 && < 2.1.0 , req-url-extra - diff --git a/sample/Main.hs b/sample/Main.hs --- a/sample/Main.hs +++ b/sample/Main.hs @@ -3,13 +3,20 @@ module Main (main) where import Data.Aeson (Value) -import Data.Default.Class (def) -import Network.HTTP.Req (GET(..), NoReqBody(..), jsonResponse, req, responseBody, runReq) +import Network.HTTP.Req + ( GET(..) + , NoReqBody(..) + , defaultHttpConfig + , jsonResponse + , req + , responseBody + , runReq + ) import Network.HTTP.Req.Url.Extra (toUrlHttps) import Text.URI.QQ (uri) main :: IO () main = do let Just (url, opts) = toUrlHttps [uri|https://httpbin.org/get?a=value0&a=value1&b=value3#fragment|] - v <- runReq def $ req GET url NoReqBody jsonResponse opts + v <- runReq defaultHttpConfig $ req GET url NoReqBody jsonResponse opts print (responseBody v :: Value) diff --git a/test/Spec.hs b/test/Spec.hs --- a/test/Spec.hs +++ b/test/Spec.hs @@ -1,7 +1,7 @@ {-| Module : Main Description : Main entrypoint for @req-url-extra@ tests -Copyright : (C) Richard Cook, 2018 +Copyright : (C) Richard Cook, 2018-2019 Licence : MIT Maintainer : rcook@rcook.org Stability : stable diff --git a/test/URISpec.hs b/test/URISpec.hs --- a/test/URISpec.hs +++ b/test/URISpec.hs @@ -1,7 +1,7 @@ {-| Module : URISpec Description : Tests for 'URI' module -Copyright : (C) Richard Cook, 2018 +Copyright : (C) Richard Cook, 2018-2019 Licence : MIT Maintainer : rcook@rcook.org Stability : stable