style(mrml-core): rename Options to RenderOptions

Signed-off-by: Jérémie Drouet <[email protected]>

packages/mrml-cli/src/main.rs

@@ -5,7 +5,7 @@ use std::io::prelude::*;
 use clap::{Parser, Subcommand};
 use mrml::mjml::Mjml;
 use mrml::prelude::print::Print;
-use mrml::prelude::render::Options as RenderOptions;
+use mrml::prelude::render::RenderOptions;
 
 #[derive(Debug, Parser)]
 #[clap(author, version, about, long_about = None)]

packages/mrml-core/benches/basic.rs

@@ -1,8 +1,8 @@
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
-use mrml::prelude::render::Options;
+use mrml::prelude::render::RenderOptions;
 
 fn render(input: &str) {
-    let opts = Options::default();
+    let opts = RenderOptions::default();
     let root = mrml::mjml::Mjml::parse(input).unwrap();
     root.render(&opts).unwrap();
 }

packages/mrml-core/benches/template.rs

@@ -1,8 +1,8 @@
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
-use mrml::prelude::render::Options;
+use mrml::prelude::render::RenderOptions;
 
 fn render(input: &str) {
-    let opts = Options::default();
+    let opts = RenderOptions::default();
     let root = mrml::mjml::Mjml::parse(input).unwrap();
     root.render(&opts).unwrap();
 }

packages/mrml-core/src/comment/render.rs

@@ -2,7 +2,7 @@ use std::cell::{Ref, RefCell};
 use std::rc::Rc;
 
 use super::Comment;
-use crate::prelude::render::{Error, Header, Options, Render, Renderable};
+use crate::prelude::render::{Error, Header, Render, RenderOptions, Renderable};
 
 struct CommentRender<'e, 'h> {
     header: Rc<RefCell<Header<'h>>>,
@@ -14,7 +14,7 @@ impl<'e, 'h> Render<'h> for CommentRender<'e, 'h> {
         self.header.borrow()
     }
 
-    fn render(&self, opts: &Options) -> Result<String, Error> {
+    fn render(&self, opts: &RenderOptions) -> Result<String, Error> {
         if opts.disable_comments {
             Ok(String::default())
         } else {
@@ -39,19 +39,19 @@ impl<'r, 'e: 'r, 'h: 'r> Renderable<'r, 'e, 'h> for Comment {
 #[cfg(all(test, feature = "parse"))]
 mod tests {
     use crate::mjml::Mjml;
-    use crate::prelude::render::Options;
+    use crate::prelude::render::RenderOptions;
 
     #[test]
     fn render_enabled() {
-        let opts = Options::default();
+        let opts = RenderOptions::default();
         let root = Mjml::parse(r#"<mjml><mj-body><!-- Hello World! --></mj-body></mjml>"#).unwrap();
         let result = root.render(&opts).unwrap();
         assert!(result.contains("Hello World!"));
     }
 
     #[test]
     fn render_disabled() {
-        let opts = Options {
+        let opts = RenderOptions {
             disable_comments: true,
             ..Default::default()
         };
@@ -62,7 +62,7 @@ mod tests {
 
     #[test]
     fn render_with_is_raw() {
-        let opts = Options::default();
+        let opts = RenderOptions::default();
         let root = Mjml::parse(r#"<mjml><mj-body><mj-section><mj-column><!-- Hello World! --></mj-column></mj-section></mj-body></mjml>"#).unwrap();
         let result = root.render(&opts).unwrap();
         assert!(result.contains("Hello World!"));

packages/mrml-core/src/mj_accordion/render.rs

@@ -5,7 +5,7 @@ use super::{MjAccordion, MjAccordionChild, NAME};
 use crate::helper::size::{Pixel, Size};
 use crate::helper::tag::Tag;
 use crate::prelude::hash::Map;
-use crate::prelude::render::{Error, Header, Options, Render, Renderable};
+use crate::prelude::render::{Error, Header, Render, RenderOptions, Renderable};
 
 const CHILDREN_ATTRIBUTES: [&str; 9] = [
     "border",
@@ -109,7 +109,7 @@ impl<'e, 'h> Render<'h> for MjAccordionRender<'e, 'h> {
         self.raw_siblings = value;
     }
 
-    fn render(&self, opts: &Options) -> Result<String, Error> {
+    fn render(&self, opts: &RenderOptions) -> Result<String, Error> {
         self.update_header();
         let children = self
             .element

packages/mrml-core/src/mj_accordion_element/render.rs

@@ -7,7 +7,7 @@ use crate::helper::tag::Tag;
 use crate::mj_accordion_text::MjAccordionText;
 use crate::mj_accordion_title::MjAccordionTitle;
 use crate::prelude::hash::Map;
-use crate::prelude::render::{Error, Header, Options, Render, Renderable};
+use crate::prelude::render::{Error, Header, Render, RenderOptions, Renderable};
 
 const CHILDREN_ATTRIBUTES: [&str; 9] = [
     "border",
@@ -28,7 +28,7 @@ struct MjAccordionElementRender<'e, 'h> {
 }
 
 impl<'e, 'h> MjAccordionElementRender<'e, 'h> {
-    fn render_title(&self, opts: &Options) -> Result<String, Error> {
+    fn render_title(&self, opts: &RenderOptions) -> Result<String, Error> {
         if let Some(ref child) = self.element.children.title {
             let mut renderer = child.renderer(Rc::clone(&self.header));
             CHILDREN_ATTRIBUTES.iter().for_each(|name| {
@@ -45,7 +45,7 @@ impl<'e, 'h> MjAccordionElementRender<'e, 'h> {
         }
     }
 
-    fn render_text(&self, opts: &Options) -> Result<String, Error> {
+    fn render_text(&self, opts: &RenderOptions) -> Result<String, Error> {
         if let Some(ref child) = self.element.children.text {
             let mut renderer = child.renderer(Rc::clone(&self.header));
             CHILDREN_ATTRIBUTES.iter().for_each(|name| {
@@ -62,7 +62,7 @@ impl<'e, 'h> MjAccordionElementRender<'e, 'h> {
         }
     }
 
-    fn render_children(&self, opts: &Options) -> Result<String, Error> {
+    fn render_children(&self, opts: &RenderOptions) -> Result<String, Error> {
         Ok(self.render_title(opts)? + &self.render_text(opts)?)
     }
 }
@@ -88,7 +88,7 @@ impl<'e, 'h> Render<'h> for MjAccordionElementRender<'e, 'h> {
         self.header.borrow()
     }
 
-    fn render(&self, opts: &Options) -> Result<String, Error> {
+    fn render(&self, opts: &RenderOptions) -> Result<String, Error> {
         let input = negation_conditional_tag(
             Tag::new("input")
                 .add_attribute("type", "checkbox")
@@ -136,7 +136,7 @@ mod tests {
 
     #[test]
     fn basic() {
-        let opts = Options::default();
+        let opts = RenderOptions::default();
         let head = Rc::new(RefCell::new(Header::new(&None)));
         let element = MjAccordionElement {
             attributes: Default::default(),

packages/mrml-core/src/mj_accordion_text/render.rs

@@ -4,7 +4,7 @@ use std::rc::Rc;
 use super::{MjAccordionText, NAME};
 use crate::helper::tag::Tag;
 use crate::prelude::hash::Map;
-use crate::prelude::render::{Error, Header, Options, Render, Renderable};
+use crate::prelude::render::{Error, Header, Render, RenderOptions, Renderable};
 
 struct MjAccordionTextRender<'e, 'h> {
     header: Rc<RefCell<Header<'h>>>,
@@ -13,7 +13,7 @@ struct MjAccordionTextRender<'e, 'h> {
 }
 
 impl<'e, 'h> MjAccordionTextRender<'e, 'h> {
-    fn render_children(&self, opts: &Options) -> Result<String, Error> {
+    fn render_children(&self, opts: &RenderOptions) -> Result<String, Error> {
         let content = self
             .element
             .children
@@ -68,7 +68,7 @@ impl<'e, 'h> Render<'h> for MjAccordionTextRender<'e, 'h> {
         self.header.borrow()
     }
 
-    fn render(&self, opts: &Options) -> Result<String, Error> {
+    fn render(&self, opts: &RenderOptions) -> Result<String, Error> {
         let font_families = self.attribute("font-family");
         self.header
             .borrow_mut()

packages/mrml-core/src/mj_accordion_title/render.rs

@@ -5,7 +5,7 @@ use super::{MjAccordionTitle, NAME};
 use crate::helper::condition::negation_conditional_tag;
 use crate::helper::tag::Tag;
 use crate::prelude::hash::Map;
-use crate::prelude::render::{Error, Header, Options, Render, Renderable};
+use crate::prelude::render::{Error, Header, Render, RenderOptions, Renderable};
 
 struct MjAccordionTitleRender<'e, 'h> {
     header: Rc<RefCell<Header<'h>>>,
@@ -20,7 +20,7 @@ impl<'e, 'h> MjAccordionTitleRender<'e, 'h> {
             .maybe_add_style("height", self.attribute("icon-height"))
     }
 
-    fn render_title(&self, opts: &Options) -> Result<String, Error> {
+    fn render_title(&self, opts: &RenderOptions) -> Result<String, Error> {
         let content = self
             .element
             .children
@@ -96,7 +96,7 @@ impl<'e, 'h> Render<'h> for MjAccordionTitleRender<'e, 'h> {
         self.header.borrow()
     }
 
-    fn render(&self, opts: &Options) -> Result<String, Error> {
+    fn render(&self, opts: &RenderOptions) -> Result<String, Error> {
         let font_families = self.attribute("font-family");
         self.header
             .borrow_mut()

packages/mrml-core/src/mj_body/render.rs

@@ -6,7 +6,7 @@ use super::MjBody;
 use crate::helper::size::Pixel;
 use crate::helper::tag::Tag;
 use crate::prelude::hash::Map;
-use crate::prelude::render::{Error, Header, Options, Render, Renderable};
+use crate::prelude::render::{Error, Header, Render, RenderOptions, Renderable};
 
 struct MjBodyRender<'e, 'h> {
     header: Rc<RefCell<Header<'h>>>,
@@ -51,7 +51,7 @@ impl<'e, 'h> MjBodyRender<'e, 'h> {
         }
     }
 
-    fn render_content(&self, opts: &Options) -> Result<String, Error> {
+    fn render_content(&self, opts: &RenderOptions) -> Result<String, Error> {
         let div = self.get_content_div_tag();
         let element_width = self.get_width();
         let mut children = String::default();
@@ -89,7 +89,7 @@ impl<'e, 'h> Render<'h> for MjBodyRender<'e, 'h> {
         self.header.borrow()
     }
 
-    fn render(&self, opts: &Options) -> Result<String, Error> {
+    fn render(&self, opts: &RenderOptions) -> Result<String, Error> {
         let body = self.get_body_tag();
         let result = body.render(self.render_preview() + &self.render_content(opts)?);
         Ok(result)

packages/mrml-core/src/mj_button/render.rs

@@ -5,7 +5,7 @@ use super::{MjButton, NAME};
 use crate::helper::size::Pixel;
 use crate::helper::tag::Tag;
 use crate::prelude::hash::Map;
-use crate::prelude::render::{Error, Header, Options, Render, Renderable};
+use crate::prelude::render::{Error, Header, Render, RenderOptions, Renderable};
 
 struct MjButtonRender<'e, 'h> {
     header: Rc<RefCell<Header<'h>>>,
@@ -37,7 +37,7 @@ impl<'e, 'h> MjButtonRender<'e, 'h> {
         }
     }
 
-    fn render_children(&self, opts: &Options) -> Result<String, Error> {
+    fn render_children(&self, opts: &RenderOptions) -> Result<String, Error> {
         self.element
             .children
             .iter()
@@ -122,7 +122,7 @@ impl<'e, 'h> Render<'h> for MjButtonRender<'e, 'h> {
         self.header.borrow()
     }
 
-    fn render(&self, opts: &Options) -> Result<String, Error> {
+    fn render(&self, opts: &RenderOptions) -> Result<String, Error> {
         let font_family = self.attribute("font-family");
         self.header
             .borrow_mut()

packages/mrml-core/src/mj_carousel/render.rs

@@ -7,7 +7,7 @@ use crate::helper::size::{Pixel, Size};
 use crate::helper::style::Style;
 use crate::helper::tag::Tag;
 use crate::prelude::hash::Map;
-use crate::prelude::render::{Error, Header, Options, Render, Renderable};
+use crate::prelude::render::{Error, Header, Render, RenderOptions, Renderable};
 
 impl<'r, 'e: 'r, 'h: 'r> Renderable<'r, 'e, 'h> for MjCarouselChild {
     fn renderer(&'e self, header: Rc<RefCell<Header<'h>>>) -> Box<dyn Render<'h> + 'r> {
@@ -89,7 +89,7 @@ impl<'e, 'h> MjCarouselRender<'e, 'h> {
             .add_style("padding", "0px")
     }
 
-    fn render_radios(&self, opts: &Options) -> Result<String, Error> {
+    fn render_radios(&self, opts: &RenderOptions) -> Result<String, Error> {
         self.element
             .children
             .iter()
@@ -110,7 +110,7 @@ impl<'e, 'h> MjCarouselRender<'e, 'h> {
             })
     }
 
-    fn render_thumbnails(&self, opts: &Options) -> Result<String, Error> {
+    fn render_thumbnails(&self, opts: &RenderOptions) -> Result<String, Error> {
         if self.attribute_equals("thumbnails", "visible") {
             let width = self.get_thumbnails_width();
             self.element
@@ -172,7 +172,7 @@ impl<'e, 'h> MjCarouselRender<'e, 'h> {
             .render(div)
     }
 
-    fn render_images(&self, opts: &Options) -> Result<String, Error> {
+    fn render_images(&self, opts: &RenderOptions) -> Result<String, Error> {
         let content = self
             .element
             .children
@@ -197,7 +197,7 @@ impl<'e, 'h> MjCarouselRender<'e, 'h> {
         Ok(self.set_style_images_td(Tag::td()).render(div))
     }
 
-    fn render_carousel(&self, opts: &Options) -> Result<String, Error> {
+    fn render_carousel(&self, opts: &RenderOptions) -> Result<String, Error> {
         let previous =
             self.render_controls("previous", self.attribute("left-icon").unwrap().as_str());
         let images = self.render_images(opts)?;
@@ -212,7 +212,7 @@ impl<'e, 'h> MjCarouselRender<'e, 'h> {
         Ok(table)
     }
 
-    fn render_fallback(&self, opts: &Options) -> Result<String, Error> {
+    fn render_fallback(&self, opts: &RenderOptions) -> Result<String, Error> {
         match self
             .element
             .children
@@ -438,7 +438,7 @@ impl<'e, 'h> Render<'h> for MjCarouselRender<'e, 'h> {
         self.raw_siblings = value;
     }
 
-    fn render(&self, opts: &Options) -> Result<String, Error> {
+    fn render(&self, opts: &RenderOptions) -> Result<String, Error> {
         let styles = self.render_style();
         self.header.borrow_mut().maybe_add_style(styles);
         let radios = self.render_radios(opts)?;

packages/mrml-core/src/mj_carousel_image/render.rs

@@ -5,7 +5,7 @@ use super::{MjCarouselImage, NAME};
 use crate::helper::size::Pixel;
 use crate::helper::tag::Tag;
 use crate::prelude::hash::Map;
-use crate::prelude::render::{Error, Header, Options, Render, Renderable};
+use crate::prelude::render::{Error, Header, Render, RenderOptions, Renderable};
 
 struct MjCarouselImageRender<'e, 'h> {
     header: Rc<RefCell<Header<'h>>>,
@@ -167,7 +167,7 @@ impl<'e, 'h> Render<'h> for MjCarouselImageRender<'e, 'h> {
         self.header.borrow()
     }
 
-    fn render_fragment(&self, name: &str, opts: &Options) -> Result<String, Error> {
+    fn render_fragment(&self, name: &str, opts: &RenderOptions) -> Result<String, Error> {
         match name {
             "main" => self.render(opts),
             "radio" => Ok(self.render_radio()),
@@ -176,7 +176,7 @@ impl<'e, 'h> Render<'h> for MjCarouselImageRender<'e, 'h> {
         }
     }
 
-    fn render(&self, _opts: &Options) -> Result<String, Error> {
+    fn render(&self, _opts: &RenderOptions) -> Result<String, Error> {
         let img = self
             .set_style_images_img(Tag::new("img"))
             .add_attribute("border", "0")

packages/mrml-core/src/mj_column/render.rs

@@ -5,7 +5,7 @@ use super::{MjColumn, NAME};
 use crate::helper::size::{Pixel, Size};
 use crate::helper::tag::Tag;
 use crate::prelude::hash::Map;
-use crate::prelude::render::{Error, Header, Options, Render, Renderable};
+use crate::prelude::render::{Error, Header, Render, RenderOptions, Renderable};
 
 struct MjColumnRender<'e, 'h> {
     header: Rc<RefCell<Header<'h>>>,
@@ -178,7 +178,7 @@ impl<'e, 'h> MjColumnRender<'e, 'h> {
             .maybe_add_style("padding-left", self.attribute("padding-left"))
     }
 
-    fn render_gutter(&self, opts: &Options) -> Result<String, Error> {
+    fn render_gutter(&self, opts: &RenderOptions) -> Result<String, Error> {
         let table = Tag::table_presentation().add_attribute("width", "100%");
         let tbody = Tag::tbody();
         let tr = Tag::tr();
@@ -194,7 +194,7 @@ impl<'e, 'h> MjColumnRender<'e, 'h> {
         }
     }
 
-    fn render_column(&self, opts: &Options) -> Result<String, Error> {
+    fn render_column(&self, opts: &RenderOptions) -> Result<String, Error> {
         let table = self
             .set_style_table(Tag::table_presentation())
             .add_attribute("width", "100%");
@@ -290,7 +290,7 @@ impl<'e, 'h> Render<'h> for MjColumnRender<'e, 'h> {
         }
     }
 
-    fn render(&self, opts: &Options) -> Result<String, Error> {
+    fn render(&self, opts: &RenderOptions) -> Result<String, Error> {
         let (classname, size) = self.get_column_class();
         self.header
             .borrow_mut()