From 022a5231fbf62bf8256a6f21157d6ac79f20f587 Mon Sep 17 00:00:00 2001 From: brian Date: Wed, 15 Dec 2021 20:29:57 +0300 Subject: [PATCH 1/4] Tests now work --- .gitignore | 3 +++ Cargo.toml | 3 +-- src/lib.rs | 37 +++++++++++++++++-------------------- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 555c10dd..24a802e7 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,6 @@ **/*.rs.bk Cargo.lock .idea + +#vim files +*swp diff --git a/Cargo.toml b/Cargo.toml index e51646aa..d75c86a7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,8 +16,7 @@ license = "MIT" travis-ci = { repository = "rust-nairobi/africastalking-rust"} [dependencies] -reqwest = "0.8.1" -hyper = "0.11.6" +reqwest = { version = "0.11", features = ["json","blocking"] } serde = "1.0.37" serde_derive = "1.0.37" serde_json = "1.0" diff --git a/src/lib.rs b/src/lib.rs index f3107b0e..bda603e9 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -5,8 +5,6 @@ #[macro_use] extern crate error_chain; -#[macro_use] -extern crate hyper; extern crate reqwest; extern crate serde; #[macro_use] @@ -14,14 +12,13 @@ extern crate serde_derive; #[macro_use] extern crate serde_json as json; +use reqwest::header::{HeaderMap,ACCEPT}; + use std::collections::HashMap; use std::io::Read; -use hyper::header::{Accept, Headers}; use serde::ser::Serialize; -header! { (Apikey, "apikey") => [String] } - #[allow(unused_variables)] trait HttpAccessMethods { fn send_request(&self, url: &str, data: Option>) {} @@ -277,11 +274,11 @@ impl AfricasTalkingGateway { &self, url: &str, data: Option>, - ) -> Result { - let mut headers = Headers::new(); - headers.set(Accept::json()); - headers.set(Apikey(self.api_key.clone())); - let client = reqwest::Client::new(); + ) -> Result { + let mut headers = HeaderMap::new(); + headers.insert(ACCEPT,"application/json".parse().unwrap()); + headers.insert("Apikey",self.api_key.clone().parse().unwrap()); + let client = reqwest::blocking::Client::new(); let resp = match data { Some(map) => client.post(url).json(&map).send()?, None => client.get(url).headers(headers).send()?, @@ -290,21 +287,21 @@ impl AfricasTalkingGateway { Ok(resp) } - fn send_form_data(&self, url: &str, data: T) -> Result { - let mut headers = Headers::new(); - headers.set(Accept::json()); - headers.set(Apikey(self.api_key.clone())); - let client = reqwest::Client::new(); + fn send_form_data(&self, url: &str, data: T) -> Result { + let mut headers = HeaderMap::new(); + headers.insert(ACCEPT, "application/json".parse().unwrap()); + headers.insert("Apikey",self.api_key.clone().parse().unwrap()); + let client = reqwest::blocking::Client::new(); let resp = client.post(url).form(&data).headers(headers).send()?; Ok(resp) } - fn send_json_request(&self, url: &str, data: T) -> Result { - let mut headers = Headers::new(); - headers.set(Accept::json()); - headers.set(Apikey(self.api_key.clone())); - let client = reqwest::Client::new(); + fn send_json_request(&self, url: &str, data: T) -> Result { + let mut headers = HeaderMap::new(); + headers.insert(ACCEPT, "application/json".parse().unwrap()); + headers.insert("Apikey",self.api_key.clone().parse().unwrap()); + let client = reqwest::blocking::Client::new(); let resp = client.post(url).json(&data).headers(headers).send()?; Ok(resp) From 3c6032bfd46e4cbbb010df4cedd5100e91515290 Mon Sep 17 00:00:00 2001 From: "brian.orwe" Date: Wed, 15 Dec 2021 20:50:33 +0300 Subject: [PATCH 2/4] Update README.md --- README.md | 17 +++++++++++++++++ src/lib.rs | 1 - 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 59f53f09..9ab46145 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,23 @@ A Rust library for communicating with the Africa's Talking REST API. +### Requirements + +OpenSSL. +*Ubuntu:* + +``` +sudo apt-get install libssl-dev +``` + +*Fedora:* + +``` +sudo dnf install openssl-devel +``` + + + ### installation diff --git a/src/lib.rs b/src/lib.rs index bda603e9..e0bbd413 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -37,7 +37,6 @@ error_chain! { } } } - /// SMS Message Struct #[derive(Serialize, Deserialize, Debug, Default)] #[allow(non_snake_case)] From 1c8593746cc2248a36203f39b65eb7a4570e6199 Mon Sep 17 00:00:00 2001 From: "brian.orwe" Date: Wed, 15 Dec 2021 20:52:34 +0300 Subject: [PATCH 3/4] Add name to authors, and increment version --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index d75c86a7..1da8dd7e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "africastalking_gateway" version = "0.1.0" -authors = ["Matt Gathu "] +authors = ["Matt Gathu ", "Brian Orwe "] description = "A Rust library for communicating with the Africa's Talking REST API." documentation = "https://docs.rs/africastalking_gateway" From 8e5f80bf278f46a5eb3f10b77c418bd19daebdf6 Mon Sep 17 00:00:00 2001 From: "brian.orwe" Date: Wed, 15 Dec 2021 20:52:46 +0300 Subject: [PATCH 4/4] Add name to authors, and increment version --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 1da8dd7e..fcb697cf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "africastalking_gateway" -version = "0.1.0" +version = "0.1.1" authors = ["Matt Gathu ", "Brian Orwe "] description = "A Rust library for communicating with the Africa's Talking REST API."