From 9101f32f7d258984fb8f8247de8bc661acd69d47 Mon Sep 17 00:00:00 2001
From: Guillaume Pasquet <dev@etenil.net>
Date: Thu, 10 Feb 2022 23:49:58 +0000
Subject: Working requests
---
src/barbfile.rs | 17 +++++++++++++++--
src/main.rs | 58 +++++++++++++++++++++++++++++++++------------------------
2 files changed, 49 insertions(+), 26 deletions(-)
(limited to 'src')
diff --git a/src/barbfile.rs b/src/barbfile.rs
index 26ab583..4d304e2 100644
--- a/src/barbfile.rs
+++ b/src/barbfile.rs
@@ -1,4 +1,3 @@
-use std::matches;
use std::str::FromStr;
use std::string::ToString;
use std::{error::Error, fmt};
@@ -14,7 +13,7 @@ impl fmt::Display for BarbParseError {
}
}
-enum Method {
+pub enum Method {
GET,
PUT,
POST,
@@ -49,6 +48,16 @@ impl ToString for Method {
}
}
+impl Method {
+ pub fn takes_body(&self) -> bool {
+ match self {
+ Method::GET => false,
+ Method::DELETE => false,
+ _ => true
+ }
+ }
+}
+
#[derive(Debug)]
struct Header {
name: String,
@@ -100,6 +109,10 @@ impl BarbFile {
pub fn url(&self) -> &String {
&self.header.url
}
+
+ pub fn body(&self) -> &Option<String> {
+ &self.body
+ }
}
fn decode_url_line(line: &str) -> Result<(Method, String), BarbParseError> {
diff --git a/src/main.rs b/src/main.rs
index 693567d..182376c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,44 +2,54 @@ mod barbfile;
use jsonformat::{format_json, Indentation};
-use std::collections::HashMap;
-use std::env;
+// use std::collections::HashMap;
+// use std::env;
use std::fs;
use std::str::FromStr;
use ureq;
-struct Context {
- vars: HashMap<String, String>,
-}
+// struct Context {
+// vars: HashMap<String, String>,
+// }
-impl Context {
- pub fn new() -> Context {
- Context {
- vars: HashMap::new(),
- }
- }
-
- pub fn get_var(&self, name: String) -> Option<String> {
- self.vars
- .get(&name)
- .map(|val| val.clone())
- .or_else(|| env::var(name).ok())
- }
-}
+// impl Context {
+// pub fn new() -> Context {
+// Context {
+// vars: HashMap::new(),
+// }
+// }
+
+// pub fn get_var(&self, name: String) -> Option<String> {
+// self.vars
+// .get(&name)
+// .map(|val| val.clone())
+// .or_else(|| env::var(name).ok())
+// }
+// }
fn main() {
- let mut context = Context::new();
+ // let mut context = Context::new();
let bfile = barbfile::BarbFile::from_str(
- fs::read_to_string("test.barb")
+ fs::read_to_string("test-post.barb")
.expect("Failed to read file")
.as_str(),
)
.expect("Failed to parse file");
- let result = ureq::request(bfile.method_as_string().as_str(), &bfile.url())
- .call()
- .unwrap()
+
+ let req = ureq::request(bfile.method_as_string().as_str(), &bfile.url());
+
+ let resp = match bfile.method().takes_body() {
+ true => match bfile.body() {
+ Some(body) => req.send_string(body.as_str()),
+ None => req.call()
+ },
+ false => req.call(),
+ };
+
+ let result = resp.unwrap()
.into_string()
.unwrap();
+
println!("{}", format_json(result.as_str(), Indentation::Default));
}
--
cgit v1.2.3