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
2 changes: 2 additions & 0 deletions docs/commands.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ Beyond standard HTTP methods (`GET`, `POST`, `PUT`, `PATCH`, `DELETE`, `HEAD`, `
| `unset` | `unset <name>` | Remove a variable. |
| `unset header` | `unset header <key>` | Remove a global header. |
| `save` | `save <name>` | Save the last executed request to memory. |
| `remove` | `remove <name>` | Delete a saved request by name. |
| `rename` | `rename <old> <new>` | Rename a saved request |
| `run` | `run <name>` | Execute a saved request. |
| `vars` | `vars` | List all session variables. |
| `headers` | `headers` | List all global headers. |
Expand Down
10 changes: 10 additions & 0 deletions src/builtin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ pub enum Builtin {
Headers,
Vars,
Requests,
Remove(String),
Rename(String, String),
Clear,
Timeout(u64),
}
Expand Down Expand Up @@ -66,6 +68,14 @@ pub fn handle(
}
}

Builtin::Remove(name) => {
ctx.remove_request(&name)?;
}

Builtin::Rename(existing_name, new_name) => {
ctx.rename_request(&existing_name, new_name)?;
}

Builtin::Save(name) => {
ctx.save_request(name)?;
}
Expand Down
2 changes: 2 additions & 0 deletions src/help.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ pub fn help_text() -> String {
unset <name>
unset header <key>
save <name>
remove <name>
rename <old> <new>
run <name>
requests
vars
Expand Down
4 changes: 2 additions & 2 deletions src/helper.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use crate::state::ShellState;
const BUILTINS: &[&str] = &[
"GET", "POST", "PUT", "PATCH", "DELETE", "HEAD", "OPTIONS", "base", "header", "exit", "help",
"history", "rerun", "set", "timeout", "unset", "save", "run", "vars", "headers", "requests",
"clear",
"clear", "remove", "rename",
];

pub struct ShellHelper {
Expand Down Expand Up @@ -56,7 +56,7 @@ impl Completer for ShellHelper {
let parts: Vec<&str> = before_cursor.split_whitespace().collect();

match parts[0] {
"run" => {
"run" | "remove" | "rename" if parts.len() == 1 => {
let state = self.state.borrow();
let matches: Vec<Pair> = state
.get_all_requests()
Expand Down
48 changes: 47 additions & 1 deletion src/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ pub fn parse(input: String) -> Result<Parsed, String> {
}

"base" | "set" | "unset" | "header" | "headers" | "vars" | "requests" | "save" | "run"
| "help" | "history" | "rerun" | "clear" | "timeout" => {
| "help" | "history" | "rerun" | "clear" | "timeout" | "remove" | "rename" => {
let result = parse_builtin(input)?;
Ok(Parsed::Builtin(result))
}
Expand Down Expand Up @@ -185,6 +185,23 @@ fn parse_builtin(line: String) -> Result<Builtin, String> {
Ok(Builtin::Timeout(secs))
}
}
"remove" => {
if tokens.len() != 2 {
Err("usage: remove <name>".to_string())
} else {
Ok(Builtin::Remove(tokens[1].to_string()))
}
}
"rename" => {
if tokens.len() != 3 {
Err("usage: rename <old> <new>".to_string())
} else {
Ok(Builtin::Rename(
tokens[1].to_string(),
tokens[2].to_string(),
))
}
}
"history" => Ok(Builtin::History),
"rerun" => {
if tokens.len() != 2 {
Expand Down Expand Up @@ -269,6 +286,19 @@ mod tests {
));
}

#[test]
fn parse_remove_builtin() {
let result = parse("remove my-req".to_string());
assert!(result.is_ok());
assert!(matches!(
result.unwrap(),
Parsed::Builtin(Builtin::Remove(name)) if name == "my-req"
));

let result = parse("remove".to_string());
assert!(result.is_err());
}

#[test]
fn parse_unset_variable() {
let result = parse("unset foo".to_string());
Expand Down Expand Up @@ -317,4 +347,20 @@ mod tests {
let result = parse("header key".to_string());
assert!(result.is_err());
}

#[test]
fn parse_rename_builtin() {
let result = parse("rename old-name new-name".to_string());
assert!(result.is_ok());
assert!(matches!(
result.unwrap(),
Parsed::Builtin(Builtin::Rename(old, new)) if old == "old-name" && new == "new-name"
));

let result = parse("rename".to_string());
assert!(result.is_err());

let result = parse("rename only-one".to_string());
assert!(result.is_err());
}
}
51 changes: 51 additions & 0 deletions src/state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,22 @@ impl ShellState {
&self.saved_requests
}

pub fn remove_request(&mut self, name: &str) -> Result<(), String> {
self.saved_requests
.remove(name)
.ok_or_else(|| format!("no saved request: {name}"))?;
Ok(())
}

pub fn rename_request(&mut self, existing_name: &str, new_name: String) -> Result<(), String> {
if let Some(value) = self.saved_requests.remove(existing_name) {
self.saved_requests.insert(new_name, value);
Ok(())
} else {
Err(format!("no saved request: {existing_name}"))
}
}

pub fn get_base_url(&self) -> Option<&str> {
self.base_url.as_deref()
}
Expand Down Expand Up @@ -217,6 +233,41 @@ mod test {
assert_eq!(saved.unwrap().path, "/test");
}

#[test]
fn remove_request_deletes_it() {
use crate::request::Method;
let mut state = ShellState::new();
let req = crate::request::Request::new(Method::GET, "/test".to_string());
state.set_last_request(req);
state.save_request("myreq".to_string()).unwrap();
assert!(state.remove_request("myreq").is_ok());
assert!(state.get_request("myreq").is_none());
}

#[test]
fn remove_request_missing_returns_error() {
let mut state = ShellState::new();
assert!(state.remove_request("nonexistent").is_err());
}

#[test]
fn rename_request_renames_it() {
use crate::request::Method;
let mut state = ShellState::new();
let req = crate::request::Request::new(Method::GET, "/test".to_string());
state.set_last_request(req);
state.save_request("old-name".to_string()).unwrap();
assert!(state.rename_request("old-name", "new-name".to_string()).is_ok());
assert!(state.get_request("old-name").is_none());
assert!(state.get_request("new-name").is_some());
}

#[test]
fn rename_request_missing_returns_error() {
let mut state = ShellState::new();
assert!(state.rename_request("nonexistent", "new".to_string()).is_err());
}

#[test]
fn save_and_load_state_roundtrip() {
use crate::request::Method;
Expand Down
Loading