chore: minor

Author: apskhem

rust/catalyst-signed-doc-macro/src/field.rs

@@ -31,12 +31,12 @@ impl TryInto<TokenStream> for IsRequired {
 /// Document's metadata fields definition
 #[derive(serde::Deserialize)]
 #[allow(clippy::missing_docs_in_private_items)]
-pub(crate) struct Metadata {
+pub(crate) struct Headers {
     #[serde(rename = "content type")]
-    pub(crate) content_type: ContentType,
+    pub(crate) content_type: ContentType,    
 }
 
-/// `signed_doc.json` "ref" field JSON object
+/// `signed_doc.json` "content type" field JSON object
 #[derive(serde::Deserialize)]
 #[allow(clippy::missing_docs_in_private_items)]
 pub(crate) struct ContentType {
@@ -50,30 +50,30 @@ impl TryInto<TokenStream> for ContentType {
 
     fn try_into(self) -> Result<TokenStream, Self::Error> {
         let exp = match self.value.as_str() {
-            "application/cbor" => quote! { ContentType::Cbor },
-            "application/cddl" => quote! { ContentType::Cddl },
-            "application/json" => quote! { ContentType::Json },
-            "application/json+schema" => quote! { ContentType::JsonSchema },
-            "text/css; charset=utf-8" => quote! { ContentType::Css },
-            "text/css; charset=utf-8; template=handlebars" => quote! { ContentType::CssHandlebars },
-            "text/html; charset=utf-8" => quote! { ContentType::Html },
+            "application/cbor" => quote! { ContentTypeRule::Cbor },
+            "application/cddl" => quote! { ContentTypeRule::Cddl },
+            "application/json" => quote! { ContentTypeRule::Json },
+            "application/json+schema" => quote! { ContentTypeRule::JsonSchema },
+            "text/css; charset=utf-8" => quote! { ContentTypeRule::Css },
+            "text/css; charset=utf-8; template=handlebars" => quote! { ContentTypeRule::CssHandlebars },
+            "text/html; charset=utf-8" => quote! { ContentTypeRule::Html },
             "text/html; charset=utf-8; template=handlebars" => {
-                quote! { ContentType::HtmlHandlebars }
+                quote! { ContentTypeRule::HtmlHandlebars }
             },
-            "text/markdown; charset=utf-8" => quote! { ContentType::Markdown },
+            "text/markdown; charset=utf-8" => quote! { ContentTypeRule::Markdown },
             "text/markdown; charset=utf-8; template=handlebars" => {
-                quote! { ContentType::MarkdownHandlebars }
+                quote! { ContentTypeRule::MarkdownHandlebars }
             },
-            "text/plain; charset=utf-8" => quote! { ContentType::Plain },
+            "text/plain; charset=utf-8" => quote! { ContentTypeRule::Plain },
             "text/plain; charset=utf-8; template=handlebars" => {
-                quote! { ContentType::PlainHandlebars }
+                quote! { ContentTypeRule::PlainHandlebars }
             },
             _ => return Err(anyhow::anyhow!("Unsupported Content Type: {}", self.value)),
         };
 
         Ok(quote! {
             crate::validator::rules::ContentTypeRule {
-                exp: #exp,
+                exp: crate::validator::rules::#exp,
             }
         })
     }

rust/catalyst-signed-doc-macro/src/rules/mod.rs

@@ -13,7 +13,7 @@ pub(crate) fn catalyst_signed_documents_rules_impl() -> anyhow::Result<TokenStre
     for (doc_name, doc_spec) in spec.docs {
         let const_type_name_ident = doc_name.ident();
 
-        let content_type_rule: TokenStream = doc_spec.metadata.content_type.try_into()?;
+        let content_type_rule: TokenStream = doc_spec.headers.content_type.try_into()?;
 
         // TODO: implement a proper initialization for all specific validation rules
         let rules = quote! {

rust/catalyst-signed-doc-macro/src/signed_doc_spec.rs

@@ -2,7 +2,6 @@
 
 use std::collections::HashMap;
 
-use anyhow::Context;
 use proc_macro2::Ident;
 use quote::format_ident;
 
@@ -45,8 +44,8 @@ pub(crate) struct DocSpec {
     /// Document type UUID v4 value
     #[serde(rename = "type")]
     pub(crate) doc_type: String,
-    /// Document type metadata definitions
-    pub(crate) metadata: field::Metadata,
+    /// `headers` field
+    pub(crate) headers: field::Headers,
 }
 
 impl CatalystSignedDocSpec {
@@ -55,7 +54,7 @@ impl CatalystSignedDocSpec {
     pub(crate) fn load_signed_doc_spec() -> anyhow::Result<CatalystSignedDocSpec> {
         let signed_doc_str = include_str!("../../../specs/signed_doc.json");
         let signed_doc_spec = serde_json::from_str(signed_doc_str)
-            .context("Catalyst Signed Documents spec must be a JSON object")?;
+            .map_err(|e| anyhow::anyhow!("Invalid Catalyst Signed Documents JSON Spec: {e}"))?;
         Ok(signed_doc_spec)
     }
 }