From 3128a370db75f6294b45491ccd6d0c2a9194ca36 Mon Sep 17 00:00:00 2001 From: Sean McArthur Date: Fri, 5 Jan 2018 15:20:40 -0800 Subject: [PATCH 1/5] remove deprecated no_proto usage of hyper --- src/async_impl/client.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/async_impl/client.rs b/src/async_impl/client.rs index 16204f7..9d1d57c 100644 --- a/src/async_impl/client.rs +++ b/src/async_impl/client.rs @@ -133,7 +133,6 @@ impl ClientBuilder { let hyper_client = ::hyper::Client::configure() .connector(connector) - .no_proto() .build(handle); Ok(Client { From d6762d4877b0f17d4228d31c6e1705041623f891 Mon Sep 17 00:00:00 2001 From: Sean McArthur Date: Fri, 19 Jan 2018 17:46:55 -0800 Subject: [PATCH 2/5] update to log 0.4 --- Cargo.toml | 4 ++-- examples/simple.rs | 2 +- tests/multipart.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 53504d9..7927454 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ futures = "0.1.15" hyper = "0.11.9" hyper-tls = "0.1.2" libflate = "0.1.11" -log = "0.3" +log = "0.4" mime_guess = "2.0.0-alpha.2" native-tls = "0.1.3" serde = "1.0" @@ -28,7 +28,7 @@ url = "1.2" uuid = { version = "0.5", features = ["v4"] } [dev-dependencies] -env_logger = "0.4" +env_logger = "0.5" error-chain = "0.10" serde_derive = "1.0" diff --git a/examples/simple.rs b/examples/simple.rs index e9f228a..16384f7 100644 --- a/examples/simple.rs +++ b/examples/simple.rs @@ -15,7 +15,7 @@ error_chain! { } fn run() -> Result<()> { - env_logger::init().expect("Failed to initialize logger"); + env_logger::init(); println!("GET https://www.rust-lang.org"); diff --git a/tests/multipart.rs b/tests/multipart.rs index 16c6207..8399249 100644 --- a/tests/multipart.rs +++ b/tests/multipart.rs @@ -6,7 +6,7 @@ mod support; #[test] fn test_multipart() { - let _ = env_logger::init(); + let _ = env_logger::try_init(); let form = reqwest::multipart::Form::new() .text("foo", "bar"); From 911ddd9f1e241085d3d1cf877f68fa616b6b4d87 Mon Sep 17 00:00:00 2001 From: Sean McArthur Date: Fri, 19 Jan 2018 17:48:49 -0800 Subject: [PATCH 3/5] v0.8.3 --- CHANGELOG.md | 6 ++++++ Cargo.toml | 2 +- src/lib.rs | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e58950..0f8800f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## v0.8.3 + +### Features + +- Upgrades internal log crate usage to v0.4 + ## v0.8.2 ### Fixes diff --git a/Cargo.toml b/Cargo.toml index 7927454..b7f6f02 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "reqwest" -version = "0.8.2" # remember to update html_root_url +version = "0.8.3" # remember to update html_root_url description = "higher level HTTP client library" keywords = ["http", "request", "client"] repository = "https://github.com/seanmonstar/reqwest" diff --git a/src/lib.rs b/src/lib.rs index 32a00eb..750cd38 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,7 +1,7 @@ #![deny(warnings)] #![deny(missing_docs)] #![deny(missing_debug_implementations)] -#![doc(html_root_url = "https://docs.rs/reqwest/0.8.2")] +#![doc(html_root_url = "https://docs.rs/reqwest/0.8.3")] //! # reqwest //! From 8554a6335d9ce91d923c795fd9af3e4b451201a2 Mon Sep 17 00:00:00 2001 From: Simon Bernier St-Pierre Date: Sun, 31 Dec 2017 17:03:44 -0500 Subject: [PATCH 4/5] add query string support to RequestBuilder --- src/lib.rs | 3 ++ src/request.rs | 108 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 109 insertions(+), 2 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 750cd38..9b6215d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -139,6 +139,9 @@ extern crate libflate; extern crate mime_guess; extern crate native_tls; extern crate serde; +#[cfg(test)] +#[macro_use] +extern crate serde_derive; extern crate serde_json; extern crate serde_urlencoded; extern crate tokio_core; diff --git a/src/request.rs b/src/request.rs index 6a43be5..355a0fc 100644 --- a/src/request.rs +++ b/src/request.rs @@ -210,6 +210,49 @@ impl RequestBuilder { self } + /// Modify the query string of the URL. + /// + /// Modifies the URL of this request, adding the parameters provided. + /// This method appends and does not overwrite. This means that it can + /// be called multiple times and that existing query parameters are not + /// overwritten if the same key is used. The key will simply show up + /// twice in the query string. + /// Calling `.query([("foo", "a"), ("foo", "b")])` gives `"foo=a&boo=b"`. + /// + /// ```rust + /// # use reqwest::Error; + /// # + /// # fn run() -> Result<(), Error> { + /// let client = reqwest::Client::new(); + /// let res = client.get("http://httpbin.org") + /// .query(&[("lang", "rust")]) + /// .send()?; + /// # Ok(()) + /// # } + /// ``` + /// + /// # Note + /// This method does not support serializing a single key-value + /// pair. Instead of using `.query(("key", "val"))`, use a sequence, such + /// as `.query(&[("key", "val")])`. It's also possible to serialize structs + /// and maps into a key-value pair. + /// + /// # Errors + /// This method will fail if the object you provide cannot be serialized + /// into a query string. + pub fn query(&mut self, query: &T) -> &mut RequestBuilder { + if let Some(req) = request_mut(&mut self.request, &self.err) { + let url = req.url_mut(); + let mut pairs = url.query_pairs_mut(); + let serializer = serde_urlencoded::Serializer::new(&mut pairs); + + if let Err(err) = query.serialize(serializer) { + self.err = Some(::error::from(err)); + } + } + self + } + /// Send a form body. /// /// Sets the body to the url encoded serialization of the passed value, @@ -425,9 +468,9 @@ pub fn async(req: Request) -> (async_impl::Request, Option) { mod tests { use {body, Client, Method}; use header::{Host, Headers, ContentType}; - use std::collections::HashMap; - use serde_urlencoded; + use std::collections::{BTreeMap, HashMap}; use serde_json; + use serde_urlencoded; #[test] fn basic_get_request() { @@ -537,6 +580,67 @@ mod tests { assert_eq!(buf, body); } + #[test] + fn add_query_append() { + let client = Client::new(); + let some_url = "https://google.com/"; + let mut r = client.get(some_url); + + r.query(&[("foo", "bar")]); + r.query(&[("qux", 3)]); + + let req = r.build().expect("request is valid"); + assert_eq!(req.url().query(), Some("foo=bar&qux=3")); + } + + #[test] + fn add_query_append_same() { + let client = Client::new(); + let some_url = "https://google.com/"; + let mut r = client.get(some_url); + + r.query(&[("foo", "a"), ("foo", "b")]); + + let req = r.build().expect("request is valid"); + assert_eq!(req.url().query(), Some("foo=a&foo=b")); + } + + #[test] + fn add_query_struct() { + #[derive(Serialize)] + struct Params { + foo: String, + qux: i32, + } + + let client = Client::new(); + let some_url = "https://google.com/"; + let mut r = client.get(some_url); + + let params = Params { foo: "bar".into(), qux: 3 }; + + r.query(¶ms); + + let req = r.build().expect("request is valid"); + assert_eq!(req.url().query(), Some("foo=bar&qux=3")); + } + + #[test] + fn add_query_map() { + let mut params = BTreeMap::new(); + params.insert("foo", "bar"); + params.insert("qux", "three"); + + let client = Client::new(); + let some_url = "https://google.com/"; + let mut r = client.get(some_url); + + r.query(¶ms); + + let req = r.build().expect("request is valid"); + assert_eq!(req.url().query(), Some("foo=bar&qux=three")); + } + #[test] fn add_form() { let client = Client::new(); From 7412932e471685e1cdd8312502f72fb8fccd30b8 Mon Sep 17 00:00:00 2001 From: Sean McArthur Date: Mon, 22 Jan 2018 09:40:13 -0800 Subject: [PATCH 5/5] v0.8.4 --- CHANGELOG.md | 6 ++++++ Cargo.toml | 2 +- src/lib.rs | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f8800f..7fd57ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## v0.8.4 + +### Features + +- Add `RequestBuilder::query` to easily adjust query parameters of requests. + ## v0.8.3 ### Features diff --git a/Cargo.toml b/Cargo.toml index b7f6f02..0ed9c00 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "reqwest" -version = "0.8.3" # remember to update html_root_url +version = "0.8.4" # remember to update html_root_url description = "higher level HTTP client library" keywords = ["http", "request", "client"] repository = "https://github.com/seanmonstar/reqwest" diff --git a/src/lib.rs b/src/lib.rs index 9b6215d..474e99e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,7 +1,7 @@ #![deny(warnings)] #![deny(missing_docs)] #![deny(missing_debug_implementations)] -#![doc(html_root_url = "https://docs.rs/reqwest/0.8.3")] +#![doc(html_root_url = "https://docs.rs/reqwest/0.8.4")] //! # reqwest //!