Skip to content

Make search API of github library work again #321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 1, 2018
Merged

Make search API of github library work again #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d2eca37
function to explicitly escape part of a query
tkvogt Jan 30, 2018
1279888
name of type adjusted
tkvogt Jan 31, 2018
1684a20
function name change
tkvogt Jan 31, 2018
6c44d57
version bump and log entry
tkvogt Feb 1, 2018
ccc9e1a
lower bound reverted
tkvogt Feb 1, 2018
0ab0a4e
new functions only when http-types is recent enough
tkvogt Feb 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions http-client/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.5.10

* New function to partial escape query strings

## 0.5.9

* Add `Semigroup` instances for GHC 8.4 [#320](https://github.com/snoyberg/http-client/pull/320)
Expand Down
4 changes: 4 additions & 0 deletions http-client/Network/HTTP/Client.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
{-# LANGUAGE DeriveFoldable #-}
{-# LANGUAGE DeriveDataTypeable #-}
{-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE CPP #-}
-- |
--
-- = Simpler API
Expand Down Expand Up @@ -141,6 +142,9 @@ module Network.HTTP.Client
, getUri
, setRequestIgnoreStatus
, setQueryString
#if MIN_VERSION_http_types(0,12,1)
, setQueryStringPartialEscape
#endif
-- ** Request type and fields
, Request
, method
Expand Down
11 changes: 11 additions & 0 deletions http-client/Network/HTTP/Client/Request.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ module Network.HTTP.Client.Request
, requestBuilder
, setRequestIgnoreStatus
, setQueryString
#if MIN_VERSION_http_types(0,12,1)
, setQueryStringPartialEscape
#endif
, streamFile
, observedStreamFile
, extractBasicAuthInfo
Expand Down Expand Up @@ -476,6 +479,14 @@ setRequestIgnoreStatus req = req { checkResponse = \_ _ -> return () }
setQueryString :: [(S.ByteString, Maybe S.ByteString)] -> Request -> Request
setQueryString qs req = req { queryString = W.renderQuery True qs }

#if MIN_VERSION_http_types(0,12,1)
-- | Set the query string to the given key/value pairs.
--
-- Since > 0.5.9
setQueryStringPartialEscape :: [(S.ByteString, [W.EscapeItem])] -> Request -> Request
setQueryStringPartialEscape qs req = req { queryString = W.renderQueryPartialEscape True qs }
#endif

-- | Send a file as the request body.
--
-- It is expected that the file size does not change between calling
Expand Down
2 changes: 1 addition & 1 deletion http-client/http-client.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: http-client
version: 0.5.9
version: 0.5.10
synopsis: An HTTP client engine
description: Hackage documentation generation is not reliable. For up to date documentation, please see: <http://www.stackage.org/package/http-client>.
homepage: https://github.com/snoyberg/http-client
Expand Down