From 9f4fec0dce1e931356c567fa11d9435f44fbbf50 Mon Sep 17 00:00:00 2001 From: Guillaume Pasquet Date: Thu, 10 Feb 2022 23:13:11 +0000 Subject: Working barbfile parsing --- README.md | 2 +- TODO | 24 ++++++++++++++++++++++++ TODO.org | 24 ------------------------ doc/logo-128.png | Bin 0 -> 15312 bytes doc/logo-64.png | Bin 0 -> 8380 bytes doc/logo-readme.png | Bin 0 -> 11322 bytes doc/logo.png | Bin 9255 -> 27643 bytes src/barbfile.rs | 30 +++++++++++++++++++++--------- 8 files changed, 46 insertions(+), 34 deletions(-) create mode 100644 TODO delete mode 100644 TODO.org create mode 100644 doc/logo-128.png create mode 100644 doc/logo-64.png create mode 100644 doc/logo-readme.png diff --git a/README.md b/README.md index c46bbd5..f8663f4 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ BARB ==== -![Barb logo](doc/logo.png) +![Barb logo](doc/logo-readme.png) Barb is a file-based API query tool written in Rust that works nicely with version control and fits into unix terminal usage. diff --git a/TODO b/TODO new file mode 100644 index 0000000..c307705 --- /dev/null +++ b/TODO @@ -0,0 +1,24 @@ +* Context [25%] +** DONE Introduce context structure +** TODO Populate from env variables +** TODO Implement variable substitution in barbfiles +** TODO Carry over context across requests + +* JQ filtering [0%] +** TODO Find a JQ-like library in rust +** TODO Use library to extract data from requests +** TODO Allow multiple named filters +** TODO Store filter output in context + +* Support binary files [0%] +** TODO Have binary filepath as body +** TODO Output binary files to file system +** TODO Coerce filetype (to display seemingly binary files normally) + +* Command line options [0%] +** TODO Multiple files on the command line +** TODO Filter override +** TODO Disable filtering altogether +** TODO Override header + +* Add curses-based manager diff --git a/TODO.org b/TODO.org deleted file mode 100644 index c307705..0000000 --- a/TODO.org +++ /dev/null @@ -1,24 +0,0 @@ -* Context [25%] -** DONE Introduce context structure -** TODO Populate from env variables -** TODO Implement variable substitution in barbfiles -** TODO Carry over context across requests - -* JQ filtering [0%] -** TODO Find a JQ-like library in rust -** TODO Use library to extract data from requests -** TODO Allow multiple named filters -** TODO Store filter output in context - -* Support binary files [0%] -** TODO Have binary filepath as body -** TODO Output binary files to file system -** TODO Coerce filetype (to display seemingly binary files normally) - -* Command line options [0%] -** TODO Multiple files on the command line -** TODO Filter override -** TODO Disable filtering altogether -** TODO Override header - -* Add curses-based manager diff --git a/doc/logo-128.png b/doc/logo-128.png new file mode 100644 index 0000000..07943bf Binary files /dev/null and b/doc/logo-128.png differ diff --git a/doc/logo-64.png b/doc/logo-64.png new file mode 100644 index 0000000..d5ff9f4 Binary files /dev/null and b/doc/logo-64.png differ diff --git a/doc/logo-readme.png b/doc/logo-readme.png new file mode 100644 index 0000000..b8a482b Binary files /dev/null and b/doc/logo-readme.png differ diff --git a/doc/logo.png b/doc/logo.png index bbb343e..dd83daa 100644 Binary files a/doc/logo.png and b/doc/logo.png differ diff --git a/src/barbfile.rs b/src/barbfile.rs index f203c84..26ab583 100644 --- a/src/barbfile.rs +++ b/src/barbfile.rs @@ -127,9 +127,11 @@ impl FromStr for BarbFile { let (method, url) = decode_url_line(lines.next().ok_or(BarbParseError {})?)?; let mut headers: Vec
= vec![]; let mut filter = None; - for line in lines { - if !matches!(line.chars().nth(0), Some('#')) { - break; // Reached the end of the header. + + for line in &mut lines { + if line == "" { + // End of header. + break; } if let Some(_) = line.find(':') { @@ -144,9 +146,11 @@ impl FromStr for BarbFile { } } + let body = lines.fold(String::from(""), |acc, x| acc + x); + Ok(BarbFile { header: BarbHeader::new(method, url, headers, filter), - body: None, + body: if body == "" {None} else {Some(body)}, }) } } @@ -183,22 +187,30 @@ mod tests { } #[test] - fn test_parse_barbfile() { + fn test_parse_barbfile_no_body() { let barbfile = BarbFile::from_str("#GET^https://blah.com/api/blah\n#Authorization: BLAH\n#|filtr\n") .unwrap(); - assert_eq!(barbfile.body, None); assert!(matches!(barbfile.header.method, Method::GET)); assert_eq!(barbfile.header.url, "https://blah.com/api/blah"); assert_eq!(barbfile.header.filter, Some(String::from("filtr"))); - println!("{:?}", barbfile.header.headers); assert_eq!(barbfile.header.headers.len(), 1); assert_eq!(barbfile.header.headers[0].name, "Authorization"); assert_eq!(barbfile.header.headers[0].value, "BLAH"); + assert_eq!(barbfile.body, None); } #[test] - fn test_toto() { - assert!(true); + fn test_parse_barbfile_body() { + let barbfile = + BarbFile::from_str("#POST^https://blah.com/api/blah\n#Authorization: BLAH\n#|filtr\n\n{\"key\":\"value\"}\n") + .unwrap(); + assert!(matches!(barbfile.header.method, Method::POST)); + assert_eq!(barbfile.header.url, "https://blah.com/api/blah"); + assert_eq!(barbfile.header.filter, Some(String::from("filtr"))); + assert_eq!(barbfile.header.headers.len(), 1); + assert_eq!(barbfile.header.headers[0].name, "Authorization"); + assert_eq!(barbfile.header.headers[0].value, "BLAH"); + assert_eq!(barbfile.body, Some(String::from("{\"key\":\"value\"}"))) } } -- cgit v1.2.3