Cargo.lock

@@ -815,7 +815,7 @@ checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
 
 [[package]]
 name = "postwoman"
-version = "0.4.0"
+version = "0.3.2"
 dependencies = [
  "base64",
  "chrono",

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "postwoman"
 description = "API tester and debugger for your CLI "
-version = "0.4.0"
+version = "0.3.2"
 repository = "https://moonlit.technology/alemi/postwoman"
 authors = [ "alemi <me@alemi.dev>" ]
 license = "GPL-3.0-only"

postwoman.toml

@@ -1,19 +1,18 @@
 [client] # HTTP client configuration
-user_agent = "postwoman@sample/0.4.0"
+user_agent = "postwoman@sample/0.3.1"
 timeout = 60 # max time for each request to complete, in seconds
 redirects = 5 # allow up to five redirects, defaults to none
-base = "https://api.alemi.dev" # all route urls will be appended to this base
 
 [env] # these will be replaced in routes options. environment vars overrule these
 PW_TOKEN = "set-me-as-and-environment-variable!"
 
 
 
-[route.healthcheck] # the simplest possible route: just name and path
-path = "/"
+[route.healthcheck] # the simplest possible route: just name and url
+url = "https://api.alemi.dev/"
 
 [route.debug]
-path = "/debug"
+url = "https://api.alemi.dev/debug"
 method = "PUT" # specify request method
 query = [ # specify query parameters in a more friendly way
 	"body=json",
@@ -24,20 +23,20 @@ headers = [ # add custom headers to request
 	"Authorization: Bearer ${PW_TOKEN}",
 ]
 body = { hello = "world!", success = true } # body can be a bare string, or an inline table (will be converted to json)
-extract = { type = "body" } # get the whole response body, this is the default extractor
+extract = ".path" # extract from json responses with JQ syntax
+# note that a bare extractor string is equivalent to `{ type = "jq", query = ".path" }`
 
 [route.benchmark]
-path = "/look/into/the/void"
+url = "https://api.alemi.dev/look/into/the/void"
 extract = { type = "discard" } # if you don't care about the output, discard it!
 
 [route.notfound]
-path = "https://cdn.alemi.dev/does-not-exist"
-absolute = true # mark as absolute to avoid composing with client base url
-status = 404 # it's possible to specify expected status code, will fail if doesn't match
+url = "https://api.alemi.dev/not-found"
+expect = 404 # it's possible to specify expected status code, will fail if doesn't match
 extract = { type = "regex", pattern = 'nginx/[0-9\.]+' } # extract from response with regex
 
 [route.payload]
-path = "/debug"
+url = "https://api.alemi.dev/debug"
 method = "POST"
 body = '''{
 	"complex": {
@@ -47,10 +46,9 @@ body = '''{
 		"way": true
 	}
 }'''
-extract = ".path" # extract from json responses with JQ syntax (default extractor), equivalent to `{ type = "jq", query = ".path" }`
-expect = "/debug" # if extracted result doesn't match, this route will return an error
+extract = { type = "body" } # get the whole response body, this is the default extractor
 
 [route.cookie]
-path = "/getcookie"
+url = "https://api.alemi.dev/getcookie"
 method = "GET"
 extract = { type = "header", key = "Set-Cookie" } # get a specific response header, ignoring body

src/errors.rs

@@ -34,9 +34,6 @@ pub enum PostWomanError {
 	#[error("request didn't match expected status code: {0:?}")]
 	UnexpectedStatusCode(reqwest::Response),
 
-	#[error("request didn't match expected result: got '{0}' expected '{1}'")]
-	UnexpectedResult(String, String),
-
 	#[error("invalid Json Query: {0}")]
 	JQError(String),
 

src/fmt.rs

@@ -19,7 +19,7 @@ impl PrintableResult for RunResult {
 	fn print(self) {
 		let (result, _namespace, _name, _elapsed) = self;
 		match result {
-			Ok(x) => println!("{x}"),
+			Ok(x) => print!("{x}"),
 			Err(e) => eprintln!(" ! {e}"),
 		}
 	}
@@ -63,10 +63,8 @@ impl PrintableResult for ListResult {
 				println!(" + {key}={}", crate::ext::stringify_toml(&value));
 			}
 
-			for (name, endpoint) in collection.route {
-				let url = endpoint.url(collection.client.as_ref().and_then(|x| x.base.as_deref()));
-				let method = endpoint.method.as_deref().unwrap_or("GET");
-				println!(" - {name} \t{method} \t{url}");
+			for (name, mut endpoint) in collection.route {
+				println!(" - {name} \t{} \t{}", endpoint.method.as_deref().unwrap_or("GET"), endpoint.url);
 				if ! compact {
 					if let Some(ref query) = endpoint.query {
 						for query in query {

src/model/client.rs

@@ -1,8 +1,6 @@
 
 #[derive(Debug, Default, Clone, serde::Serialize, serde::Deserialize)]
 pub struct ClientConfig {
-	/// base url for composing endpoints
-	pub base: Option<String>,
 	/// user agent for requests, defaults to 'postwoman/<version>'
 	pub user_agent: Option<String>,
 	/// max total duration of each request, in seconds. defaults to 30

src/model/endpoint.rs

@@ -14,10 +14,8 @@ use super::{ExtractorConfig, ClientConfig};
 
 #[derive(Debug, Default, Clone, serde::Serialize, serde::Deserialize)]
 pub struct EndpointConfig {
-	/// endpoint path, composed from client base and query params
-	pub path: String,
-	/// absolute url, don't compose with client base url
-	pub absolute: Option<bool>,
+	/// endpoint url, required
+	pub url: String,
 	/// http method for request, default GET
 	pub method: Option<String>,
 	/// query parameters, appended to base url
@@ -26,33 +24,31 @@ pub struct EndpointConfig {
 	pub headers: Option<Vec<String>>,
 	/// body, optional string
 	pub body: Option<StringOr<toml::Table>>,
-	/// expected error code, will fail if different, defaults to 200
-	pub status: Option<u16>,
+	/// expected error code, will fail if different
+	pub expect: Option<u16>,
 	/// response extractor
 	pub extract: Option<StringOr<ExtractorConfig>>,
-	/// expected result, will fail if different when provided
-	pub expect: Option<String>,
 }
 
 impl EndpointConfig {
-	pub fn body(&self) -> Result<String, serde_json::Error> {
-		match &self.body {
+	pub fn body(&mut self) -> Result<String, serde_json::Error> {
+		match self.body.take() {
 			None => Ok("".to_string()),
 			Some(StringOr::Str(x)) => Ok(x.clone()),
 			Some(StringOr::T(json)) => Ok(serde_json::to_string(&json)?),
 		}
 	}
 
-	pub fn method(&self) -> Result<reqwest::Method, InvalidMethod> {
+	pub fn method(&mut self) -> Result<reqwest::Method, InvalidMethod> {
 		match self.method {
 			Some(ref m) => Ok(reqwest::Method::from_str(m)?),
 			None => Ok(reqwest::Method::GET),
 		}
 	}
 
-	pub fn headers(&self) -> Result<HeaderMap, InvalidHeaderError> {
+	pub fn headers(&mut self) -> Result<HeaderMap, InvalidHeaderError> {
 		let mut headers = HeaderMap::default();
-		for header in self.headers.as_deref().unwrap_or(&[]) {
+		for header in self.headers.take().unwrap_or_default() {
 			let (k, v) = header.split_once(':')
 				.ok_or_else(|| InvalidHeaderError::Format(header.clone()))?;
 			headers.insert(
@@ -63,13 +59,9 @@ impl EndpointConfig {
 		Ok(headers)
 	}
 
-	pub fn url(&self, base: Option<&str>) -> String {
-		let mut url = if self.absolute.unwrap_or(false) {
-			self.path.clone()
-		} else {
-			format!("{}{}", base.unwrap_or_default(), self.path)
-		};
-		if let Some(ref query) = self.query {
+	pub fn url(&mut self) -> String {
+		let mut url = self.url.clone();
+		if let Some(query) = self.query.take() {
 			url = format!("{url}?{}", query.join("&"));
 		}
 		url
@@ -90,7 +82,7 @@ impl EndpointConfig {
 
 		for (k, v) in vars {
 			let k_var = format!("${{{k}}}");
-			self.path = self.path.replace(&k_var, &v);
+			self.url = self.url.replace(&k_var, &v);
 			if let Some(method) = self.method {
 				self.method = Some(method.replace(&k_var, &v));
 			}
@@ -126,11 +118,11 @@ impl EndpointConfig {
 		self
 	}
 
-	pub async fn execute(self, opts: &ClientConfig) -> Result<String, PostWomanError> {
+	pub async fn execute(mut self, opts: &ClientConfig) -> Result<String, PostWomanError> {
+		let url = self.url();
 		let body = self.body()?;
 		let method = self.method()?;
 		let headers = self.headers()?;
-		let url = self.url(opts.base.as_deref());
 
 		let client = reqwest::Client::builder()
 			.user_agent(opts.user_agent.as_deref().unwrap_or(APP_USER_AGENT))
@@ -147,25 +139,26 @@ impl EndpointConfig {
 			.send()
 			.await?;
 
-		if res.status().as_u16() != self.status.unwrap_or(200) {
+		if res.status().as_u16() != self.expect.unwrap_or(200) {
 			return Err(PostWomanError::UnexpectedStatusCode(res));
 		}
 
-		let res = match self.extract.unwrap_or_default() {
+		Ok(match self.extract.unwrap_or_default() {
 			StringOr::T(ExtractorConfig::Discard) => "".to_string(),
 			StringOr::T(ExtractorConfig::Body) => format_body(res).await?,
 			StringOr::T(ExtractorConfig::Debug) => {
 				// TODO needless double format
 				let res_dbg = format!("{res:#?}");
 				let body = format_body(res).await?; 
-				format!("{res_dbg}\nBody: {body}")
+				format!("{res_dbg}\nBody: {body}\n")
 			},
 			StringOr::T(ExtractorConfig::Header { key }) => res
 				.headers()
 				.get(&key)
 				.ok_or(PostWomanError::HeaderNotFound(key))?
 				.to_str()?
-				.to_string(),
+				.to_string()
+				+ "\n",
 			StringOr::T(ExtractorConfig::Regex { pattern }) => {
 				let pattern = regex::Regex::new(&pattern)?;
 				let body = format_body(res).await?;
@@ -173,26 +166,19 @@ impl EndpointConfig {
 					.ok_or_else(|| PostWomanError::NoMatch(body.clone()))?
 					.as_str()
 					.to_string()
+					+ "\n"
 			},
 			// bare string defaults to JQL query
 			StringOr::T(ExtractorConfig::JQ { query }) | StringOr::Str(query) => {
 				let json: serde_json::Value = res.json().await?;
 				let selection = jq(&query, json)?;
 				if selection.len() == 1 {
-					stringify_json(&selection[0])
+					stringify_json(&selection[0]) + "\n"
 				} else {
-					serde_json::to_string_pretty(&selection)?
+					serde_json::to_string_pretty(&selection)? + "\n"
 				}
 			},
-		};
-
-		if let Some(expected) = self.expect {
-			if expected != res {
-				return Err(PostWomanError::UnexpectedResult(res, expected));
-			}
-		}
-
-		Ok(res)
+		})
 	}
 }