Implement reqwest-blocking feature and convert examples

Author: tomhoule

examples/github/Cargo.toml

@@ -6,11 +6,10 @@ edition = "2018"
 
 [dev-dependencies]
 anyhow = "1.0"
-graphql_client = { path = "../../graphql_client" }
+graphql_client = { path = "../../graphql_client", features = ["reqwest-blocking"] }
 serde = "^1.0"
 reqwest = { version = "^0.11", features = ["json", "blocking"] }
 prettytable-rs = "^0.7"
 structopt = "^0.3"
-envy = "^0.3"
 log = "^0.4"
 env_logger = "^0.5"

examples/github/examples/github.rs

@@ -1,9 +1,8 @@
 use ::reqwest::blocking::Client;
 use anyhow::*;
-use graphql_client::*;
+use graphql_client::{reqwest::post_graphql_blocking as post_graphql, GraphQLQuery};
 use log::*;
 use prettytable::*;
-use serde::*;
 use structopt::StructOpt;
 
 #[allow(clippy::upper_case_acronyms)]
@@ -24,11 +23,6 @@ struct Command {
     repo: String,
 }
 
-#[derive(Deserialize, Debug)]
-struct Env {
-    github_api_token: String,
-}
-
 fn parse_repo_name(repo_name: &str) -> Result<(&str, &str), anyhow::Error> {
     let mut parts = repo_name.split('/');
     match (parts.next(), parts.next()) {
@@ -40,29 +34,34 @@ fn parse_repo_name(repo_name: &str) -> Result<(&str, &str), anyhow::Error> {
 fn main() -> Result<(), anyhow::Error> {
     env_logger::init();
 
-    let config: Env = envy::from_env().context("while reading from environment")?;
+    let github_api_token =
+        std::env::var("GITHUB_API_TOKEN").expect("Missing GITHUB_API_TOKEN env var");
 
     let args = Command::from_args();
 
     let repo = args.repo;
     let (owner, name) = parse_repo_name(&repo).unwrap_or(("tomhoule", "graphql-client"));
 
-    let q = RepoView::build_query(repo_view::Variables {
+    let variables = repo_view::Variables {
         owner: owner.to_string(),
         name: name.to_string(),
-    });
-
-    let client = Client::builder().user_agent("graphql-rust/0.9.0").build()?;
-
-    let res = client
-        .post("https://api.github.com/graphql")
-        .bearer_auth(config.github_api_token)
-        .json(&q)
-        .send()?;
-
-    res.error_for_status_ref()?;
+    };
+
+    let client = Client::builder()
+        .user_agent("graphql-rust/0.9.0")
+        .default_headers(
+            std::iter::once((
+                reqwest::header::AUTHORIZATION,
+                reqwest::header::HeaderValue::from_str(&format!("Bearer {}", github_api_token))
+                    .unwrap(),
+            ))
+            .collect(),
+        )
+        .build()?;
+
+    let response_body =
+        post_graphql::<RepoView, _>(&client, "https://api.github.com/graphql", variables).unwrap();
 
-    let response_body: Response<repo_view::ResponseData> = res.json()?;
     info!("{:?}", response_body);
 
     let response_data: repo_view::ResponseData = response_body.data.expect("missing response data");

examples/hasura/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2018"
 
 [dev-dependencies]
 anyhow = "1.0"
-graphql_client = { path = "../../graphql_client", features = ["reqwest"] }
+graphql_client = { path = "../../graphql_client", features = ["reqwest-blocking"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 reqwest = { version = "^0.11", features = ["json", "blocking"] }

examples/hasura/examples/hasura.rs

@@ -1,5 +1,5 @@
 use ::reqwest::blocking::Client;
-use graphql_client::*;
+use graphql_client::{reqwest::post_graphql_blocking as post_graphql, GraphQLQuery};
 use log::*;
 use prettytable::*;
 
@@ -19,24 +19,20 @@ fn main() -> Result<(), anyhow::Error> {
     use upsert_issue::{IssuesUpdateColumn::*, *};
     env_logger::init();
 
-    let q = UpsertIssue::build_query(Variables {
+    let v = Variables {
         issues: vec![IssuesInsertInput {
             id: Some("001000000000000".to_string()),
             name: Some("Name".to_string()),
             status: Some("Draft".to_string()),
             salesforce_updated_at: Some("2019-06-11T08:14:28Z".to_string()),
         }],
         update_columns: vec![Name, Status, SalesforceUpdatedAt],
-    });
+    };
 
     let client = Client::new();
 
-    let res = client
-        .post("https://localhost:8080/v1/graphql")
-        .json(&q)
-        .send()?;
-
-    let response_body: Response<ResponseData> = res.json()?;
+    let response_body =
+        post_graphql::<UpsertIssue, _>(&client, "https://localhost:8080/v1/graphql", v)?;
     info!("{:?}", response_body);
 
     if let Some(errors) = response_body.errors {

graphql_client/Cargo.toml

@@ -17,3 +17,4 @@ serde_json = "1.0"
 
 [features]
 default = ["graphql_query_derive"]
+reqwest-blocking = ["reqwest/blocking"]

graphql_client/src/lib.rs

@@ -14,7 +14,7 @@ extern crate graphql_query_derive;
 #[doc(hidden)]
 pub use graphql_query_derive::*;
 
-#[cfg(feature = "reqwest")]
+#[cfg(any(feature = "reqwest", feature = "reqwest-blocking"))]
 pub mod reqwest;
 
 use serde::*;

graphql_client/src/reqwest.rs

@@ -3,6 +3,7 @@
 use crate::GraphQLQuery;
 
 /// Use the provided reqwest::Client to post a GraphQL request.
+#[cfg(feature = "reqwest")]
 pub async fn post_graphql<Q: GraphQLQuery, U: reqwest::IntoUrl>(
     client: &reqwest::Client,
     url: U,
@@ -13,3 +14,16 @@ pub async fn post_graphql<Q: GraphQLQuery, U: reqwest::IntoUrl>(
 
     Ok(reqwest_response.json().await?)
 }
+
+/// Use the provided reqwest::Client to post a GraphQL request.
+#[cfg(feature = "reqwest-blocking")]
+pub fn post_graphql_blocking<Q: GraphQLQuery, U: reqwest::IntoUrl>(
+    client: &reqwest::blocking::Client,
+    url: U,
+    variables: Q::Variables,
+) -> Result<crate::Response<Q::ResponseData>, reqwest::Error> {
+    let body = Q::build_query(variables);
+    let reqwest_response = client.post(url).json(&body).send()?;
+
+    reqwest_response.json()
+}