Merge pull request #8 from Teajey/v0.6.0

v0.6.0

Author: Teajey

Cargo.lock

@@ -1,3 +1,6 @@
 [workspace]
 resolver = "2"
 members = ["crates/*"]
+
+[workspace.package]
+version = "0.6.0"

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "custard"
-version = "0.5.1"
+version = { workspace = true }
 edition = "2021"
 license = "MIT"
 description = "A frontmatter-querying server"
@@ -10,7 +10,7 @@ repository = "https://github.com/Teajey/custard"
 anyhow = "1.0.75"
 camino = "1.1.6"
 axum = "0.6.20"
-custard_lib = { version = "0.2.1", path = "../lib" }
+custard_lib = { path = "../lib" }
 notify = "5.2.0"
 serde = { version = "1.0.188", features = ["serde_derive"] }
 serde_json = "1.0.107"

crates/json_http/Cargo.toml crates/http/Cargo.tomlcrates/json_http/Cargo.toml renamed to crates/http/Cargo.toml

@@ -9,15 +9,21 @@ use axum::{
 
 use super::lock_keeper;
 
-use custard_lib::{frontmatter_file, frontmatter_query::FrontmatterQuery};
+use custard_lib::{frontmatter_file, frontmatter_query::FrontmatterQueryMap};
 
 pub async fn get(
     State(markdown_files): State<frontmatter_file::keeper::ArcMutex>,
     Path(key): Path<String>,
 ) -> Result<Json<Vec<String>>, StatusCode> {
     let keeper = &*lock_keeper(&markdown_files)?;
 
-    let values = custard_lib::collate::get(keeper, custard_lib::collate::Get::new(&key));
+    let values = custard_lib::collate::collate(
+        keeper,
+        custard_lib::collate::Args {
+            key: key.as_str(),
+            query: None,
+        },
+    );
 
     Ok(Json(values))
 }
@@ -26,7 +32,7 @@ pub async fn post(
     State(markdown_files): State<frontmatter_file::keeper::ArcMutex>,
     params: Query<HashMap<String, String>>,
     Path(key): Path<String>,
-    Json(query): Json<FrontmatterQuery>,
+    Json(query_map): Json<FrontmatterQueryMap>,
 ) -> Result<Json<Vec<String>>, StatusCode> {
     let keeper = &*lock_keeper(&markdown_files)?;
 
@@ -37,9 +43,15 @@ pub async fn post(
         .map_err(|_| StatusCode::BAD_REQUEST)?
         .unwrap_or_default();
 
-    let values = custard_lib::collate::query(
+    let values = custard_lib::collate::collate(
         keeper,
-        custard_lib::collate::Query::new(&key, query, intersect),
+        custard_lib::collate::Args {
+            key: key.as_str(),
+            query: Some(custard_lib::frontmatter_query::FrontmatterQuery {
+                map: query_map,
+                intersect,
+            }),
+        },
     );
 
     Ok(Json(values))

crates/json_http/src/main.rs crates/http/src/main.rscrates/json_http/src/main.rs renamed to crates/http/src/main.rs

@@ -8,7 +8,7 @@ use axum::{
 };
 use custard_lib::{
     frontmatter_file::{self, FrontmatterFile},
-    frontmatter_query::FrontmatterQuery,
+    frontmatter_query::{FrontmatterQuery, FrontmatterQueryMap},
 };
 
 use super::lock_keeper;
@@ -69,7 +69,7 @@ fn post_inner(
     files: &frontmatter_file::keeper::ArcMutex,
     params: &HashMap<String, String>,
     name: &str,
-    query: FrontmatterQuery,
+    query_map: FrontmatterQueryMap,
 ) -> Result<(HeaderMap, String), StatusCode> {
     let keeper = &*lock_keeper(files)?;
 
@@ -82,9 +82,17 @@ fn post_inner(
         .map_err(|_| StatusCode::BAD_REQUEST)?
         .unwrap_or_default();
 
-    let response = custard_lib::single::query(
+    let response = custard_lib::single::single(
         keeper,
-        custard_lib::single::Query::new(name, query, sort_key, order_desc, intersect),
+        custard_lib::single::Args {
+            name,
+            query: Some(FrontmatterQuery {
+                map: query_map,
+                intersect,
+            }),
+            sort_key,
+            order_desc,
+        },
     )
     .ok_or(StatusCode::NOT_FOUND)?;
 
@@ -101,7 +109,7 @@ pub async fn post(
     State(markdown_files): State<frontmatter_file::keeper::ArcMutex>,
     params: Query<HashMap<String, String>>,
     Path(name): Path<String>,
-    Json(query): Json<FrontmatterQuery>,
+    Json(query): Json<FrontmatterQueryMap>,
 ) -> Result<(HeaderMap, String), StatusCode> {
     let result = post_inner(&markdown_files, &params, &name, query)?;
 
@@ -118,9 +126,14 @@ fn get_inner(
     let order_desc = "desc" == params.get("order").map_or("desc", Deref::deref);
     let sort_key = params.get("sort").map(Deref::deref);
 
-    let response = custard_lib::single::get(
+    let response = custard_lib::single::single(
         keeper,
-        custard_lib::single::Get::new(name, sort_key, order_desc),
+        custard_lib::single::Args {
+            name,
+            query: None,
+            sort_key,
+            order_desc,
+        },
     )
     .ok_or(StatusCode::NOT_FOUND)?;
 

…s/json_http/src/route/collate_strings.rs crates/http/src/route/collate_strings.rscrates/json_http/src/route/collate_strings.rs renamed to crates/http/src/route/collate_strings.rs crates/json_http/src/route/collate_strings.rs renamed to crates/http/src/route/collate_strings.rs

@@ -5,7 +5,7 @@ use axum::{
     http::{HeaderMap, StatusCode},
     Json,
 };
-use custard_lib::{frontmatter_file, frontmatter_query::FrontmatterQuery};
+use custard_lib::{frontmatter_file, frontmatter_query::FrontmatterQueryMap};
 
 use super::lock_keeper;
 
@@ -58,7 +58,7 @@ pub async fn get(
 fn post_inner(
     params: &HashMap<String, String>,
     files: &frontmatter_file::keeper::ArcMutex,
-    query: FrontmatterQuery,
+    query: FrontmatterQueryMap,
 ) -> Result<(HeaderMap, Vec<frontmatter_file::Short>), StatusCode> {
     let keeper = &*lock_keeper(files)?;
 
@@ -83,7 +83,7 @@ fn post_inner(
 
     let response = custard_lib::list::query(
         keeper,
-        custard_lib::list::Query::new(query, sort_key, order_desc, offset, limit, intersect),
+        custard_lib::list::Args::query(query, sort_key, order_desc, offset, limit, intersect),
     );
 
     let headers = assign_headers(response.total);
@@ -94,7 +94,7 @@ fn post_inner(
 pub async fn post(
     State(markdown_files): State<frontmatter_file::keeper::ArcMutex>,
     params: Query<HashMap<String, String>>,
-    Json(query): Json<FrontmatterQuery>,
+    Json(query): Json<FrontmatterQueryMap>,
 ) -> Result<(HeaderMap, Json<Vec<frontmatter_file::Short>>), StatusCode> {
     let (headers, files) = post_inner(&params, &markdown_files, query)?;
 

…/json_http/src/route/frontmatter_file.rs crates/http/src/route/frontmatter_file.rscrates/json_http/src/route/frontmatter_file.rs renamed to crates/http/src/route/frontmatter_file.rs crates/json_http/src/route/frontmatter_file.rs renamed to crates/http/src/route/frontmatter_file.rs

@@ -1,6 +1,6 @@
 [package]
 name = "custard_lib"
-version = "0.2.1"
+version = { workspace = true }
 edition = "2021"
 license = "MIT"
 description = "A core library for Custard"

…/json_http/src/route/frontmatter_list.rs crates/http/src/route/frontmatter_list.rscrates/json_http/src/route/frontmatter_list.rs renamed to crates/http/src/route/frontmatter_list.rs crates/json_http/src/route/frontmatter_list.rs renamed to crates/http/src/route/frontmatter_list.rs

@@ -31,63 +31,21 @@ fn collate_strings_from_files<'a>(
 }
 
 #[derive(Debug, Deserialize)]
-pub struct Get<'a> {
+pub struct Args<'a> {
     pub key: &'a str,
-}
-
-impl<'a> Get<'a> {
-    #[must_use]
-    pub fn new(key: &'a str) -> Self {
-        Self { key }
-    }
-}
-
-#[allow(clippy::needless_pass_by_value)]
-fn inner_get(keeper: &Keeper, args: Get<'_>) -> Vec<String> {
-    let files = keeper.files();
-
-    let mut values = collate_strings_from_files(files, args.key);
-
-    values.sort();
-    values.dedup();
-
-    values
-}
-
-#[must_use]
-#[allow(clippy::needless_pass_by_value)]
-pub fn get(keeper: &Keeper, args: Get<'_>) -> Vec<String> {
-    debug!("Received get request: {args:?}");
-    let response = inner_get(keeper, args);
-    debug!("Sending get response: {response:?}");
-    response
-}
-
-#[derive(Debug, Deserialize)]
-pub struct Query<'a> {
-    pub key: &'a str,
-    pub query: FrontmatterQuery,
     #[serde(default)]
-    pub intersect: bool,
+    pub query: Option<FrontmatterQuery>,
 }
 
-impl<'a> Query<'a> {
-    #[must_use]
-    pub fn new(key: &'a str, query: FrontmatterQuery, intersect: bool) -> Self {
-        Self {
-            key,
-            query,
-            intersect,
-        }
-    }
-}
-
-fn inner_query(keeper: &Keeper, args: Query<'_>) -> Vec<String> {
+fn inner(keeper: &Keeper, args: Args<'_>) -> Vec<String> {
     let files = keeper.files();
 
-    let files = query_files(files, args.query, None, args.intersect);
-
-    let mut values = collate_strings_from_files(files, args.key);
+    let mut values = if let Some(query) = args.query {
+        let files = query_files(files, query, None);
+        collate_strings_from_files(files, args.key)
+    } else {
+        collate_strings_from_files(files, args.key)
+    };
 
     values.sort();
     values.dedup();
@@ -96,9 +54,9 @@ fn inner_query(keeper: &Keeper, args: Query<'_>) -> Vec<String> {
 }
 
 #[must_use]
-pub fn query(keeper: &Keeper, args: Query<'_>) -> Vec<String> {
-    debug!("Received query request: {args:?}");
-    let response = inner_query(keeper, args);
-    debug!("Sending query response: {response:?}");
+pub fn collate(keeper: &Keeper, args: Args<'_>) -> Vec<String> {
+    debug!("Received collate request: {args:?}");
+    let response = inner(keeper, args);
+    debug!("Sending collate response: {response:?}");
     response
 }