Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 2 deletions src/helper.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ use rustyline::validate::Validator;
use rustyline::{Context, Helper, Result};

const BUILTINS: &[&str] = &[
"GET", "POST", "PUT", "DELETE", "base", "header", "exit", "help", "history", "rerun", "set",
"unset", "save", "run", "vars", "headers", "requests",
"GET", "POST", "PUT", "PATCH", "DELETE", "base", "header", "exit", "help", "history", "rerun",
"set", "unset", "save", "run", "vars", "headers", "requests",
];

pub struct ShellHelper;
Expand Down
4 changes: 2 additions & 2 deletions src/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ pub fn parse(input: String) -> Result<Parsed, String> {

let token_match = tokens[0].to_lowercase();
match token_match.as_str() {
"get" | "post" | "put" | "delete" => {
"get" | "post" | "put" | "patch" | "delete" => {
let result = parse_request(input)?;
Ok(Parsed::Request(result))
}
Expand All @@ -32,7 +32,7 @@ pub fn parse(input: String) -> Result<Parsed, String> {

"exit" => Ok(Parsed::Exit),

_ => Err(format!("Reference Error: {} not defined", tokens[0])),
_ => Err(format!("Unknown command: {} not defined", tokens[0])),
}
}

Expand Down
2 changes: 2 additions & 0 deletions src/request.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ pub enum Method {
GET,
POST,
PUT,
PATCH,
DELETE,
}

Expand All @@ -47,6 +48,7 @@ impl Method {
Method::GET => "GET",
Method::POST => "POST",
Method::PUT => "PUT",
Method::PATCH => "PATCH",
Method::DELETE => "DELETE",
}
}
Expand Down
21 changes: 12 additions & 9 deletions src/runner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,27 +39,30 @@ pub fn fetch(
Method::GET => client.get(full_url),
Method::POST => client.post(full_url),
Method::PUT => client.put(full_url),
Method::PATCH => client.patch(full_url),
Method::DELETE => client.delete(full_url),
};

//Global Headers
let mut headers = HeaderMap::new();
for (key, value) in global_headers {
headers.insert(
HeaderName::from_bytes(key.to_ascii_lowercase().as_bytes()).unwrap(),
HeaderValue::from_bytes(value.as_bytes()).unwrap(),
);
let name = HeaderName::from_bytes(key.to_ascii_lowercase().as_bytes())
.map_err(|_| format!("Invalid header name: {key}"))?;
let val = HeaderValue::from_bytes(value.as_bytes())
.map_err(|_| format!("Invalid header value for '{key}': {value}"))?;
headers.insert(name, val);
}

// Request Headers
for (key, value) in &request.headers {
headers.insert(
HeaderName::from_bytes(key.to_ascii_lowercase().as_bytes()).unwrap(),
HeaderValue::from_bytes(value.as_bytes()).unwrap(),
);
let name = HeaderName::from_bytes(key.to_ascii_lowercase().as_bytes())
.map_err(|_| format!("Invalid header name: {key}"))?;
let val = HeaderValue::from_bytes(value.as_bytes())
.map_err(|_| format!("Invalid header value for '{key}': {value}"))?;
headers.insert(name, val);
}
if !headers.contains_key(CONTENT_TYPE) {
headers.insert(CONTENT_TYPE, "application/json".parse().unwrap());
headers.insert(CONTENT_TYPE, HeaderValue::from_static("application/json"));
}
req_builder = req_builder.headers(headers);

Expand Down
Loading