bump mml-lib@v0.5.0

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Bumped `mml-lib@v0.5.0`.
+
+## [0.3.0] - 2023-09-20
+
 ### Added
 
 - Added better diagnostic with `ariadne`.

Cargo.toml

@@ -17,8 +17,13 @@ name = "mml"
 path = "src/main.rs"
 
 [features]
-all = ["compiler", "interpreter", "pgp-commands", "pgp-gpg", "pgp-native"]
-default = ["compiler", "interpreter"]
+default = [
+  "compiler",
+  "interpreter",
+  # "pgp-commands",
+  # "pgp-gpg",
+  # "pgp-native",
+]
 compiler = ["mml-lib/compiler", "ariadne"]
 interpreter = ["mml-lib/interpreter"]
 pgp-commands = ["mml-lib/pgp-commands"]
@@ -59,7 +64,7 @@ version = "0.10"
 version = "0.4"
 
 [dependencies.mml-lib]
-version = "=0.4.0"
+version = "=0.5.0"
 default-features = false
 
 [dependencies.shellexpand-utils]

src/mml/compiler/handlers.rs

@@ -1,14 +1,15 @@
 use anyhow::{Context, Result};
 use ariadne::{Color, Label, Report, ReportKind, Source};
-use mml::{message::body::compiler::Error as CompileMmlBodyError, Error, MmlCompiler};
+use mml::{message::body::compiler::Error as CompileMmlBodyError, Error, MmlCompilerBuilder};
 
 pub async fn compile(mml: String) -> Result<()> {
-    let compiler = MmlCompiler::new();
+    let compiler = MmlCompilerBuilder::new()
+        // TODO:
+        // .with_pgp(…)
+        .build(&mml)
+        .context("cannot build MML compiler")?;
 
-    // TODO: add PGP args?
-    // compiler = compiler.with_pgp(…)
-
-    match compiler.compile(&mml).await {
+    match compiler.compile().await {
         Err(Error::CompileMmlBodyError(CompileMmlBodyError::ParseMmlError(errs, body))) => {
             errs.into_iter().for_each(|err| {
                 Report::build(ReportKind::Error, (), err.span().start)
@@ -25,8 +26,8 @@ pub async fn compile(mml: String) -> Result<()> {
             Ok(())
         }
         Err(err) => Err(err).context("cannot compile MML message"),
-        Ok(mime) => {
-            let mime = mime.write_to_string()?;
+        Ok(res) => {
+            let mime = res.into_string()?;
             print!("{mime}");
             Ok(())
         }

src/mml/interpreter/handlers.rs

@@ -1,7 +1,7 @@
 use anyhow::{Context, Result};
 use mml::{
     message::{FilterHeaders, FilterParts},
-    MimeInterpreter,
+    MimeInterpreterBuilder,
 };
 use std::path::PathBuf;
 
@@ -16,7 +16,7 @@ pub async fn interpret(
     show_plain_texts_signature: bool,
     mime: String,
 ) -> Result<()> {
-    let interpreter = MimeInterpreter::new()
+    let interpreter = MimeInterpreterBuilder::new()
         // TODO:
         // .with_pgp(…)
         .with_show_headers(filter_headers)
@@ -28,10 +28,11 @@ pub async fn interpret(
         .with_save_some_attachments_dir(save_attachments_dir)
         .with_show_attachments(show_attachments)
         .with_show_inline_attachments(show_inline_attachments)
-        .with_show_plain_texts_signature(show_plain_texts_signature);
+        .with_show_plain_texts_signature(show_plain_texts_signature)
+        .build();
 
     let mml = interpreter
-        .interpret_bytes(mime.as_bytes())
+        .from_bytes(mime.as_bytes())
         .await
         .context("cannot interpreter MIME message")?;