refactor

Signed-off-by: Andrei Gherghescu <[email protected]>

Author: andrei-ng

plotly/src/layout/layout.rs

@@ -1,7 +1,8 @@
-use plotly_derive::generate_layout_structs;
+use std::borrow::Cow;
+
+use plotly_derive::layout_structs;
 use plotly_derive::FieldSetter;
 use serde::Serialize;
-use std::borrow::Cow;
 
 use crate::color::Color;
 use crate::common::{Calendar, Font, Label, Title};
@@ -37,7 +38,7 @@ impl Into<Cow<'static, Template>> for &'static Template {
     }
 }
 
-#[generate_layout_structs]
+#[layout_structs]
 pub struct LayoutFields {
     title: Option<Title>,
     #[serde(rename = "showlegend")]

plotly/src/layout/mapbox.rs

@@ -73,9 +73,10 @@ impl Mapbox {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use serde_json::{json, to_value};
 
+    use super::*;
+
     #[test]
     #[rustfmt::skip]
     fn serialize_mapbox_style() {

plotly/src/layout/mod.rs

@@ -1,11 +1,11 @@
+use plotly_derive::FieldSetter;
 use serde::Serialize;
 use update_menu::UpdateMenu;
 
 use crate::{
     color::Color,
     common::{ColorScale, Orientation},
 };
-use plotly_derive::FieldSetter;
 
 pub mod themes;
 pub mod update_menu;
@@ -30,15 +30,18 @@ pub use self::axis::{
 pub use self::grid::{GridDomain, GridPattern, GridXSide, GridYSide, LayoutGrid, RowOrder};
 /// LayoutTemplate matches Layout except it lacks a field for template
 /// See layout/layout.rs for the full field list and doc comments.
-/// Layout is identical to LayoutTemplate except it has a `template` field and #[field_setter(kind = "layout")]
-/// See layout/layout.rs for the full field list and doc comments.
+/// Layout is identical to LayoutTemplate except it has a `template` field and
+/// #[field_setter(kind = "layout")] See layout/layout.rs for the full field
+/// list and doc comments.
 pub use self::layout::{Layout, LayoutTemplate, Template};
 pub use self::legend::{Legend, TraceOrder};
-pub use self::mapbox::{Mapbox, MapboxStyle};
+pub use self::mapbox::{Center, Mapbox, MapboxStyle};
 pub use self::modes::{
-    BarMode, BarNorm, BoxMode, ClickMode, UniformTextMode, ViolinMode, WaterfallMode,
+    AspectMode, BarMode, BarNorm, BoxMode, ClickMode, UniformTextMode, ViolinMode, WaterfallMode,
+};
+pub use self::scene::{
+    Camera, CameraCenter, DragMode, DragMode3D, HoverMode, LayoutScene, Projection, ProjectionType,
 };
-pub use self::scene::{DragMode, DragMode3D, HoverMode, LayoutScene, Projection, ProjectionType};
 pub use self::shape::{
     ActiveShape, DrawDirection, FillRule, NewShape, Shape, ShapeLayer, ShapeLine, ShapeSizeMode,
     ShapeType,

plotly/src/layout/modes.rs

@@ -1,5 +1,27 @@
 use serde::{Serialize, Serializer};
 
+#[derive(Serialize, Debug, Clone)]
+/// If "cube", this scene's axes are drawn as a cube, regardless of the axes'
+/// ranges. If "data", this scene's axes are drawn in proportion with the axes'
+/// ranges. If "manual", this scene's axes are drawn in proportion with the
+/// input of "aspectratio" (the default behavior if "aspectratio" is provided).
+/// If "auto", this scene's axes are drawn using the results of "data" except
+/// when one axis is more than four times the size of the two others, where in
+/// that case the results of "cube" are used.
+/// Default: "auto"
+#[derive(Default)]
+pub enum AspectMode {
+    #[serde(rename = "auto")]
+    #[default]
+    Auto,
+    #[serde(rename = "cube")]
+    Cube,
+    #[serde(rename = "data")]
+    Data,
+    #[serde(rename = "manual")]
+    Manual,
+}
+
 #[derive(Serialize, Debug, Clone)]
 #[serde(rename_all = "lowercase")]
 pub enum BoxMode {
@@ -123,4 +145,19 @@ mod tests {
         assert_eq!(to_value(WaterfallMode::Group).unwrap(), json!("group"));
         assert_eq!(to_value(WaterfallMode::Overlay).unwrap(), json!("overlay"));
     }
+
+    #[test]
+    fn serialize_aspect_mode() {
+        let aspect_mode = AspectMode::default();
+
+        assert_eq!(to_value(aspect_mode).unwrap(), json!("auto"));
+
+        let aspect_mode = AspectMode::Data;
+
+        assert_eq!(to_value(aspect_mode).unwrap(), json!("data"));
+
+        let aspect_mode = AspectMode::Cube;
+
+        assert_eq!(to_value(aspect_mode).unwrap(), json!("cube"));
+    }
 }

plotly/src/layout/scene.rs

@@ -2,29 +2,7 @@ use plotly_derive::FieldSetter;
 use serde::Serialize;
 
 use crate::color::Color;
-use crate::layout::{Annotation, Axis};
-
-#[derive(Serialize, Debug, Clone)]
-/// If "cube", this scene's axes are drawn as a cube, regardless of the axes'
-/// ranges. If "data", this scene's axes are drawn in proportion with the axes'
-/// ranges. If "manual", this scene's axes are drawn in proportion with the
-/// input of "aspectratio" (the default behavior if "aspectratio" is provided).
-/// If "auto", this scene's axes are drawn using the results of "data" except
-/// when one axis is more than four times the size of the two others, where in
-/// that case the results of "cube" are used.
-/// Default: "auto"
-#[derive(Default)]
-pub enum AspectMode {
-    #[serde(rename = "auto")]
-    #[default]
-    Auto,
-    #[serde(rename = "cube")]
-    Cube,
-    #[serde(rename = "data")]
-    Data,
-    #[serde(rename = "manual")]
-    Manual,
-}
+use crate::layout::{Annotation, AspectMode, Axis};
 
 #[serde_with::skip_serializing_none]
 #[derive(Serialize, Debug, Clone, FieldSetter)]
@@ -494,21 +472,6 @@ mod tests {
         assert_eq!(to_value(camera_center).unwrap(), expected);
     }
 
-    #[test]
-    fn serialize_aspect_mode() {
-        let aspect_mode = AspectMode::default();
-
-        assert_eq!(to_value(aspect_mode).unwrap(), json!("auto"));
-
-        let aspect_mode = AspectMode::Data;
-
-        assert_eq!(to_value(aspect_mode).unwrap(), json!("data"));
-
-        let aspect_mode = AspectMode::Cube;
-
-        assert_eq!(to_value(aspect_mode).unwrap(), json!("cube"));
-    }
-
     #[test]
     fn serialize_up() {
         let up = Up::new();

plotly_derive/src/lib.rs

@@ -14,13 +14,14 @@ pub fn field_setter(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
 }
 
 #[proc_macro_attribute]
-pub fn generate_layout_structs(_attr: TokenStream, item: TokenStream) -> TokenStream {
+pub fn layout_structs(_attr: TokenStream, item: TokenStream) -> TokenStream {
     let input = parse_macro_input!(item as ItemStruct);
     let vis = &input.vis;
     let fields = &input.fields;
     let attrs = &input.attrs;
 
-    // Generate LayoutTemplate (no template field, no #[field_setter(kind = "layout")])
+    // Generate LayoutTemplate (no template field, no #[field_setter(kind =
+    // "layout")])
     let template_struct_name = format_ident!("LayoutTemplate");
     let template_struct = quote! {
         #(#attrs)*