drawio_dsl 0.3.0 → 0.5.0

data/lib/drawio_dsl/configuration.rb

@@ -2,120 +2,33 @@
 
 # Attach configuration to the DrawIO DSL module
 module DrawioDsl
-  # Used to attach configuration to KConfig module
-  module ConfigurationExtension
-    def drawio
-      return @drawio if defined? @drawio
-
-      @drawio = DrawioDsl::Configuration.new
-    end
-  end
-
   # Configuration container for the DrawIO DSL
   class Configuration
+    include DrawioDsl::ConfigurationShapes
+    include DrawioDsl::ConfigurationThemes
+
     include KLog::Logging
 
     BaseStyle = Struct.new(:white_space, :html, :rounded, :shadow, :sketch, :glass, keyword_init: true)
 
-    ShapeDefaults   = Struct.new(:type, :x, :y, :w, :h, :style_modifiers)
-    ShapeThemeStyle = Struct.new(:fill_color, :stroke_color, :font_color, :gradient, keyword_init: true)
-
     attr_accessor :base_style
 
-    # Theme colors
-    attr_accessor :themes
-
-    # Shape shapes
-    attr_accessor :shape
-    attr_accessor :square
-    attr_accessor :rectangle
-    attr_accessor :circle
-    attr_accessor :process
-    attr_accessor :ellipse
-    attr_accessor :diamond
-    attr_accessor :hexagon
-
-    # <mxCell id="6" value="" style="rhombus;whiteSpace=wrap;html=1;" vertex="1" parent="TqO-B">
-    #     <mxGeometry x="-496" y="115" width="80" height="80" as="geometry"/>
-    # </mxCell>
+    attr_accessor :shapes
 
     def initialize
       @base_style = BaseStyle.new(white_space: :wrap, html: 1, rounded: nil, shadow: nil, sketch: nil, glass: nil)
 
-      @shape      = ShapeDefaults.new(:shape   , 0, 0, 20, 20, '')
-      @square     = ShapeDefaults.new(:square    , 0, 0, 160, 160, '')
-      @rectangle  = ShapeDefaults.new(:rectangle , 0, 0, 200, 120, '')
-      @circle     = ShapeDefaults.new(:circle    , 0, 0, 160, 160, 'ellipse')
-      @process    = ShapeDefaults.new(:process   , 0, 0, 200, 120, 'shape=process')
-      @ellipse    = ShapeDefaults.new(:ellipse   , 0, 0, 200, 120, 'ellipse')
-      @diamond    = ShapeDefaults.new(:diamond  , 0, 0, 160, 160, 'rhombus')
-      @hexagon    = ShapeDefaults.new(:hexagon  , 0, 0, 200, 120, 'shape=hexagon')
-
-      @themes     = {}
+      add_shapes
       add_themes
     end
 
     def palette(theme)
-      @themes[theme]
+      themes[theme]
     end
 
     def random_theme
-      @themes.keys.sample
-    end
-
-    private
-
-    def add_theme(name, **opts)
-      @themes[name] = ShapeThemeStyle.new(**opts)
-    end
-
-    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-    def add_themes
-      add_theme(:style_01         , fill_color: '#f5f5f5', stroke_color: '#666666', font_color: '#333333')
-      add_theme(:style_02         , fill_color: '#dae8fc', stroke_color: '#6c8ebf', font_color: '#333333')
-      add_theme(:style_03         , fill_color: '#d5e8d4', stroke_color: '#82b366', font_color: '#333333')
-      add_theme(:style_04         , fill_color: '#ffe6cc', stroke_color: '#d79b00', font_color: '#333333')
-      add_theme(:style_05         , fill_color: '#fff2cc', stroke_color: '#d6b656', font_color: '#333333')
-      add_theme(:style_06         , fill_color: '#f8cecc', stroke_color: '#b85450', font_color: '#333333')
-      add_theme(:style_07         , fill_color: '#e1d5e7', stroke_color: '#9673a6', font_color: '#333333')
-      add_theme(:style_08         , fill_color: '#60a917', stroke_color: '#2D7600', font_color: '#ffffff')
-      add_theme(:style_09         , fill_color: '#008a00', stroke_color: '#005700', font_color: '#ffffff')
-      add_theme(:style_10         , fill_color: '#1ba1e2', stroke_color: '#006EAF', font_color: '#ffffff')
-      add_theme(:style_11         , fill_color: '#0050ef', stroke_color: '#001DBC', font_color: '#ffffff')
-      add_theme(:style_12         , fill_color: '#6a00ff', stroke_color: '#3700CC', font_color: '#ffffff')
-      add_theme(:style_13         , fill_color: '#aa00ff', stroke_color: '#7700CC', font_color: '#ffffff')
-      add_theme(:style_14         , fill_color: '#d80073', stroke_color: '#A50040', font_color: '#ffffff')
-      add_theme(:style_15         , fill_color: '#a20025', stroke_color: '#6F0000', font_color: '#ffffff')
-      add_theme(:style_16         , fill_color: '#e51400', stroke_color: '#B20000', font_color: '#ffffff')
-      add_theme(:style_17         , fill_color: '#fa6800', stroke_color: '#C73500', font_color: '#000000')
-      add_theme(:style_18         , fill_color: '#f0a30a', stroke_color: '#BD7000', font_color: '#000000')
-      add_theme(:style_19         , fill_color: '#e3c800', stroke_color: '#B09500', font_color: '#000000')
-      add_theme(:style_20         , fill_color: '#6d8764', stroke_color: '#3A5431', font_color: '#ffffff')
-      add_theme(:style_21         , fill_color: '#647687', stroke_color: '#314354', font_color: '#ffffff')
-      add_theme(:style_22         , fill_color: '#76608a', stroke_color: '#432D57', font_color: '#ffffff')
-      add_theme(:style_23         , fill_color: '#a0522d', stroke_color: '#6D1F00', font_color: '#ffffff')
-      add_theme(:style_24         , fill_color: '#fad7ac', stroke_color: '#b46504', font_color: '#333333')
-      add_theme(:style_25         , fill_color: '#fad9d5', stroke_color: '#ae4132', font_color: '#333333')
-      add_theme(:style_26         , fill_color: '#b0e3e6', stroke_color: '#0e8088', font_color: '#000000')
-      add_theme(:style_27         , fill_color: '#b1ddf0', stroke_color: '#10739e', font_color: '#000000')
-      add_theme(:style_28         , fill_color: '#d0cee2', stroke_color: '#56517e', font_color: '#000000')
-      add_theme(:style_29         , fill_color: '#bac8d3', stroke_color: '#23445d', font_color: '#000000')
-      add_theme(:style_30         , fill_color: '#f5f5f5', stroke_color: '#666666', font_color: '#000000', gradient: '#b3b3b3')
-      add_theme(:style_31         , fill_color: '#dae8fc', stroke_color: '#6c8ebf', font_color: '#000000', gradient: '#7ea6e0')
-      add_theme(:style_32         , fill_color: '#d5e8d4', stroke_color: '#82b366', font_color: '#000000', gradient: '#97d077')
-      add_theme(:style_33         , fill_color: '#ffcd28', stroke_color: '#d79b00', font_color: '#000000', gradient: '#ffa500')
-      add_theme(:style_34         , fill_color: '#fff2cc', stroke_color: '#d6b656', font_color: '#000000', gradient: '#ffd966')
-      add_theme(:style_35         , fill_color: '#f8cecc', stroke_color: '#b85450', font_color: '#000000', gradient: '#ea6b66')
-      add_theme(:style_36         , fill_color: '#e6d0de', stroke_color: '#996185', font_color: '#000000', gradient: '#d5739d')
-      add_theme(:style_37         , fill_color: '#eeeeee', stroke_color: '#36393d', font_color: '#000000')
-      add_theme(:style_38         , fill_color: '#f9f7ed', stroke_color: '#36393d', font_color: '#000000')
-      add_theme(:style_39         , fill_color: '#ffcc99', stroke_color: '#36393d', font_color: '#000000')
-      add_theme(:style_40         , fill_color: '#cce5ff', stroke_color: '#36393d', font_color: '#000000')
-      add_theme(:style_41         , fill_color: '#ffff88', stroke_color: '#36393d', font_color: '#000000')
-      add_theme(:style_42         , fill_color: '#cdeb8b', stroke_color: '#36393d', font_color: '#000000')
-      add_theme(:style_43         , fill_color: '#ffcccc', stroke_color: '#36393d', font_color: '#000000')
+      themes.keys.sample
     end
-    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
   end
 end
 

data/lib/drawio_dsl/configuration_extension.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# Attach configuration to the DrawIO DSL module
+module DrawioDsl
+  # Used to attach configuration to KConfig module
+  module ConfigurationExtension
+    def drawio
+      return @drawio if defined? @drawio
+
+      @drawio = DrawioDsl::Configuration.new
+    end
+  end
+end

data/lib/drawio_dsl/configuration_shapes.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+# Attach configuration to the DrawIO DSL module
+# :nocov:
+module DrawioDsl
+  # Used to attach configuration to KConfig module
+  module ConfigurationShapes
+    ShapeDefaults = Struct.new(:type, :x, :y, :w, :h, :style_modifiers, keyword_init: true)
+    Shapes = Struct.new(
+      :shape,
+      :actor,
+      :actor2,
+      :callout,
+      :callout2,
+      :callout3,
+      :callout4,
+      :circle,
+      :cloud,
+      :cross,
+      :envelop,
+      :diamond,
+      :document,
+      :ellipse,
+      :hexagon,
+      :container,
+      :container2,
+      :container3,
+      :container4,
+      :note,
+      :process,
+      :rectangle,
+      :rectangle2,
+      :square,
+      :step,
+      :tick,
+      :face,
+      :triangle,
+      keyword_init: true
+    )
+
+    def add_shapes
+      @shapes = Shapes.new(
+        shape: ShapeDefaults.new(type: :shape, x: 0, y: 0, w: 20, h: 20, style_modifiers: ''),
+        actor: ShapeDefaults.new(type: :actor, x: 0, y: 0, w: 40, h: 50, style_modifiers: 'shape=actor'),
+        actor2: ShapeDefaults.new(type: :actor2, x: 0, y: 0, w: 30, h: 50, style_modifiers: 'shape=umlActor;verticalLabelPosition=bottom;outlineConnect=1'),
+        callout: ShapeDefaults.new(type: :callout, x: 0, y: 0, w: 160, h: 120, style_modifiers: 'shape=callout'),
+        callout2: ShapeDefaults.new(type: :callout2, x: 0, y: 0, w: 160, h: 160, style_modifiers: 'shape=mxgraph.basic.oval_callout'),
+        callout3: ShapeDefaults.new(type: :callout3, x: 0, y: 0, w: 160, h: 160, style_modifiers: 'shape=mxgraph.basic.cloud_callout'),
+        callout4: ShapeDefaults.new(type: :callout4, x: 0, y: 0, w: 160, h: 120, style_modifiers: 'shape=mxgraph.basic.roundRectCallout;dx=30;dy=15;size=5;boundedLbl=1;'),
+        circle: ShapeDefaults.new(type: :circle, x: 0, y: 0, w: 160, h: 160, style_modifiers: 'ellipse'),
+        cloud: ShapeDefaults.new(type: :cloud, x: 0, y: 0, w: 160, h: 160, style_modifiers: 'shape=cloud'),
+        cross: ShapeDefaults.new(type: :cross, x: 0, y: 0, w: 50, h: 50, style_modifiers: 'verticalLabelPosition=bottom;verticalAlign=top;html=1;shape=mxgraph.basic.x'),
+        envelop: ShapeDefaults.new(type: :envelop, x: 0, y: 0, w: 160, h: 100, style_modifiers: 'shape=message'),
+        diamond: ShapeDefaults.new(type: :diamond, x: 0, y: 0, w: 100, h: 100, style_modifiers: 'rhombus'),
+        document: ShapeDefaults.new(type: :document, x: 0, y: 0, w: 160, h: 160, style_modifiers: 'shape=mxgraph.basic.document'),
+        ellipse: ShapeDefaults.new(type: :ellipse, x: 0, y: 0, w: 200, h: 120, style_modifiers: 'ellipse'),
+        hexagon: ShapeDefaults.new(type: :hexagon, x: 0, y: 0, w: 200, h: 120, style_modifiers: 'shape=hexagon'),
+        container: ShapeDefaults.new(type: :container, x: 0, y: 0, w: 160, h: 160, style_modifiers: 'swimlane;horizontal=0'),
+        container2: ShapeDefaults.new(type: :container2, x: 0, y: 0, w: 160, h: 160, style_modifiers: 'swimlane'),
+        container3: ShapeDefaults.new(type: :container3, x: 0, y: 0, w: 160, h: 160, style_modifiers: 'swimlane;startSize=50'),
+        container4: ShapeDefaults.new(type: :container4, x: 0, y: 0, w: 160, h: 160, style_modifiers: 'swimlane;resizable=0'),
+        note: ShapeDefaults.new(type: :note, x: 0, y: 0, w: 160, h: 160, style_modifiers: 'shape=note'),
+        process: ShapeDefaults.new(type: :process, x: 0, y: 0, w: 200, h: 120, style_modifiers: 'shape=process'),
+        rectangle: ShapeDefaults.new(type: :rectangle, x: 0, y: 0, w: 200, h: 120, style_modifiers: ''),
+        rectangle2: ShapeDefaults.new(type: :rectangle2, x: 0, y: 0, w: 200, h: 120, style_modifiers: 'shape=mxgraph.basic.cloud_rect'),
+        square: ShapeDefaults.new(type: :square, x: 0, y: 0, w: 160, h: 160, style_modifiers: ''),
+        step: ShapeDefaults.new(type: :step, x: 0, y: 0, w: 120, h: 80, style_modifiers: 'shape=step;perimeter=stepPerimeter;fixedSize=1'),
+        tick: ShapeDefaults.new(type: :tick, x: 0, y: 0, w: 50, h: 50, style_modifiers: 'verticalLabelPosition=bottom;verticalAlign=top;shape=mxgraph.basic.tick'),
+        face: ShapeDefaults.new(type: :face, x: 0, y: 0, w: 100, h: 100, style_modifiers: 'verticalLabelPosition=bottom;verticalAlign=top;shape=mxgraph.basic.smiley'),
+        triangle: ShapeDefaults.new(type: :triangle, x: 0, y: 0, w: 100, h: 100, style_modifiers: 'triangle')
+      )
+    end
+  end
+end
+# :nocov:

data/lib/drawio_dsl/configuration_themes.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+# Attach configuration to the DrawIO DSL module
+module DrawioDsl
+  # Configuration for each theme
+  module ConfigurationThemes
+    ShapeThemeStyle = Struct.new(:fill_color, :stroke_color, :font_color, :gradient, keyword_init: true)
+
+    attr_accessor :themes
+
+    def add_theme(name, **opts)
+      @themes[name] = ShapeThemeStyle.new(**opts)
+    end
+
+    def add_themes
+      @themes = {}
+
+      add_theme(:style_01         , fill_color: '#f5f5f5', stroke_color: '#666666', font_color: '#333333')
+      add_theme(:style_02         , fill_color: '#dae8fc', stroke_color: '#6c8ebf', font_color: '#333333')
+      add_theme(:style_03         , fill_color: '#d5e8d4', stroke_color: '#82b366', font_color: '#333333')
+      add_theme(:style_04         , fill_color: '#ffe6cc', stroke_color: '#d79b00', font_color: '#333333')
+      add_theme(:style_05         , fill_color: '#fff2cc', stroke_color: '#d6b656', font_color: '#333333')
+      add_theme(:style_06         , fill_color: '#f8cecc', stroke_color: '#b85450', font_color: '#333333')
+      add_theme(:style_07         , fill_color: '#e1d5e7', stroke_color: '#9673a6', font_color: '#333333')
+      add_theme(:style_08         , fill_color: '#60a917', stroke_color: '#2D7600', font_color: '#ffffff')
+      add_theme(:style_09         , fill_color: '#008a00', stroke_color: '#005700', font_color: '#ffffff')
+      add_theme(:style_10         , fill_color: '#1ba1e2', stroke_color: '#006EAF', font_color: '#ffffff')
+      add_theme(:style_11         , fill_color: '#0050ef', stroke_color: '#001DBC', font_color: '#ffffff')
+      add_theme(:style_12         , fill_color: '#6a00ff', stroke_color: '#3700CC', font_color: '#ffffff')
+      add_theme(:style_13         , fill_color: '#aa00ff', stroke_color: '#7700CC', font_color: '#ffffff')
+      add_theme(:style_14         , fill_color: '#d80073', stroke_color: '#A50040', font_color: '#ffffff')
+      add_theme(:style_15         , fill_color: '#a20025', stroke_color: '#6F0000', font_color: '#ffffff')
+      add_theme(:style_16         , fill_color: '#e51400', stroke_color: '#B20000', font_color: '#ffffff')
+      add_theme(:style_17         , fill_color: '#fa6800', stroke_color: '#C73500', font_color: '#000000')
+      add_theme(:style_18         , fill_color: '#f0a30a', stroke_color: '#BD7000', font_color: '#000000')
+      add_theme(:style_19         , fill_color: '#e3c800', stroke_color: '#B09500', font_color: '#000000')
+      add_theme(:style_20         , fill_color: '#6d8764', stroke_color: '#3A5431', font_color: '#ffffff')
+      add_theme(:style_21         , fill_color: '#647687', stroke_color: '#314354', font_color: '#ffffff')
+      add_theme(:style_22         , fill_color: '#76608a', stroke_color: '#432D57', font_color: '#ffffff')
+      add_theme(:style_23         , fill_color: '#a0522d', stroke_color: '#6D1F00', font_color: '#ffffff')
+      add_theme(:style_24         , fill_color: '#fad7ac', stroke_color: '#b46504', font_color: '#333333')
+      add_theme(:style_25         , fill_color: '#fad9d5', stroke_color: '#ae4132', font_color: '#333333')
+      add_theme(:style_26         , fill_color: '#b0e3e6', stroke_color: '#0e8088', font_color: '#000000')
+      add_theme(:style_27         , fill_color: '#b1ddf0', stroke_color: '#10739e', font_color: '#000000')
+      add_theme(:style_28         , fill_color: '#d0cee2', stroke_color: '#56517e', font_color: '#000000')
+      add_theme(:style_29         , fill_color: '#bac8d3', stroke_color: '#23445d', font_color: '#000000')
+      add_theme(:style_30         , fill_color: '#f5f5f5', stroke_color: '#666666', font_color: '#000000', gradient: '#b3b3b3')
+      add_theme(:style_31         , fill_color: '#dae8fc', stroke_color: '#6c8ebf', font_color: '#000000', gradient: '#7ea6e0')
+      add_theme(:style_32         , fill_color: '#d5e8d4', stroke_color: '#82b366', font_color: '#000000', gradient: '#97d077')
+      add_theme(:style_33         , fill_color: '#ffcd28', stroke_color: '#d79b00', font_color: '#000000', gradient: '#ffa500')
+      add_theme(:style_34         , fill_color: '#fff2cc', stroke_color: '#d6b656', font_color: '#000000', gradient: '#ffd966')
+      add_theme(:style_35         , fill_color: '#f8cecc', stroke_color: '#b85450', font_color: '#000000', gradient: '#ea6b66')
+      add_theme(:style_36         , fill_color: '#e6d0de', stroke_color: '#996185', font_color: '#000000', gradient: '#d5739d')
+      add_theme(:style_37         , fill_color: '#eeeeee', stroke_color: '#36393d', font_color: '#000000')
+      add_theme(:style_38         , fill_color: '#f9f7ed', stroke_color: '#36393d', font_color: '#000000')
+      add_theme(:style_39         , fill_color: '#ffcc99', stroke_color: '#36393d', font_color: '#000000')
+      add_theme(:style_40         , fill_color: '#cce5ff', stroke_color: '#36393d', font_color: '#000000')
+      add_theme(:style_41         , fill_color: '#ffff88', stroke_color: '#36393d', font_color: '#000000')
+      add_theme(:style_42         , fill_color: '#cdeb8b', stroke_color: '#36393d', font_color: '#000000')
+      add_theme(:style_43         , fill_color: '#ffcccc', stroke_color: '#36393d', font_color: '#000000')
+    end
+  end
+end

data/lib/drawio_dsl/dom_builder.rb

@@ -3,6 +3,8 @@
 module DrawioDsl
   # DrawioDsl is a DSL for draw-io diagrams.
   class DomBuilder
+    include DomBuilderShapes
+
     attr_reader :actions
     attr_reader :last_action
 
@@ -84,45 +86,12 @@ module DrawioDsl
       shape
     end
 
-    def add_square(**opts)
-      square = DrawioDsl::Schema::Square.new(current_page, **opts)
-      add_shape(square)
-    end
-
-    def add_rectangle(**opts)
-      rectangle = DrawioDsl::Schema::Rectangle.new(current_page, **opts)
-      add_shape(rectangle)
-    end
-
-    def add_circle(**opts)
-      circle = DrawioDsl::Schema::Circle.new(current_page, **opts)
-      add_shape(circle)
-    end
-
-    def add_process(**opts)
-      process = DrawioDsl::Schema::Process.new(current_page, **opts)
-      add_shape(process)
-    end
-
-    def add_ellipse(**opts)
-      ellipse = DrawioDsl::Schema::Ellipse.new(current_page, **opts)
-      add_shape(ellipse)
-    end
-
-    def add_diamond(**opts)
-      diamond = DrawioDsl::Schema::Diamond.new(current_page, **opts)
-      add_shape(diamond)
-    end
-
-    def add_hexagon(**opts)
-      add_hexagon = DrawioDsl::Schema::Hexagon.new(current_page, **opts)
-      add_shape(add_hexagon)
-    end
-
+    # :nocov:
     def debug
       puts JSON.pretty_generate(actions)
       puts JSON.pretty_generate(diagram.to_h)
     end
+    # :nocov:
 
     def dom
       diagram.to_h

data/lib/drawio_dsl/dom_builder_shapes.rb

@@ -0,0 +1,143 @@
+# frozen_string_literal: true
+
+# :nocov:
+module DrawioDsl
+  # DrawioDsl is a DSL for draw-io diagrams.
+  module DomBuilderShapes
+    def add_actor(**opts)
+      actor = DrawioDsl::Schema::Actor.new(current_page, **opts)
+      add_shape(actor)
+    end
+
+    def add_actor2(**opts)
+      actor2 = DrawioDsl::Schema::Actor2.new(current_page, **opts)
+      add_shape(actor2)
+    end
+
+    def add_callout(**opts)
+      callout = DrawioDsl::Schema::Callout.new(current_page, **opts)
+      add_shape(callout)
+    end
+
+    def add_callout2(**opts)
+      callout2 = DrawioDsl::Schema::Callout2.new(current_page, **opts)
+      add_shape(callout2)
+    end
+
+    def add_callout3(**opts)
+      callout3 = DrawioDsl::Schema::Callout3.new(current_page, **opts)
+      add_shape(callout3)
+    end
+
+    def add_callout4(**opts)
+      callout4 = DrawioDsl::Schema::Callout4.new(current_page, **opts)
+      add_shape(callout4)
+    end
+
+    def add_circle(**opts)
+      circle = DrawioDsl::Schema::Circle.new(current_page, **opts)
+      add_shape(circle)
+    end
+
+    def add_cloud(**opts)
+      cloud = DrawioDsl::Schema::Cloud.new(current_page, **opts)
+      add_shape(cloud)
+    end
+
+    def add_cross(**opts)
+      cross = DrawioDsl::Schema::Cross.new(current_page, **opts)
+      add_shape(cross)
+    end
+
+    def add_envelop(**opts)
+      envelop = DrawioDsl::Schema::Envelop.new(current_page, **opts)
+      add_shape(envelop)
+    end
+
+    def add_diamond(**opts)
+      diamond = DrawioDsl::Schema::Diamond.new(current_page, **opts)
+      add_shape(diamond)
+    end
+
+    def add_document(**opts)
+      document = DrawioDsl::Schema::Document.new(current_page, **opts)
+      add_shape(document)
+    end
+
+    def add_ellipse(**opts)
+      ellipse = DrawioDsl::Schema::Ellipse.new(current_page, **opts)
+      add_shape(ellipse)
+    end
+
+    def add_hexagon(**opts)
+      hexagon = DrawioDsl::Schema::Hexagon.new(current_page, **opts)
+      add_shape(hexagon)
+    end
+
+    def add_container(**opts)
+      container = DrawioDsl::Schema::Container.new(current_page, **opts)
+      add_shape(container)
+    end
+
+    def add_container2(**opts)
+      container2 = DrawioDsl::Schema::Container2.new(current_page, **opts)
+      add_shape(container2)
+    end
+
+    def add_container3(**opts)
+      container3 = DrawioDsl::Schema::Container3.new(current_page, **opts)
+      add_shape(container3)
+    end
+
+    def add_container4(**opts)
+      container4 = DrawioDsl::Schema::Container4.new(current_page, **opts)
+      add_shape(container4)
+    end
+
+    def add_note(**opts)
+      note = DrawioDsl::Schema::Note.new(current_page, **opts)
+      add_shape(note)
+    end
+
+    def add_process(**opts)
+      process = DrawioDsl::Schema::Process.new(current_page, **opts)
+      add_shape(process)
+    end
+
+    def add_rectangle(**opts)
+      rectangle = DrawioDsl::Schema::Rectangle.new(current_page, **opts)
+      add_shape(rectangle)
+    end
+
+    def add_rectangle2(**opts)
+      rectangle2 = DrawioDsl::Schema::Rectangle2.new(current_page, **opts)
+      add_shape(rectangle2)
+    end
+
+    def add_square(**opts)
+      square = DrawioDsl::Schema::Square.new(current_page, **opts)
+      add_shape(square)
+    end
+
+    def add_step(**opts)
+      step = DrawioDsl::Schema::Step.new(current_page, **opts)
+      add_shape(step)
+    end
+
+    def add_tick(**opts)
+      tick = DrawioDsl::Schema::Tick.new(current_page, **opts)
+      add_shape(tick)
+    end
+
+    def add_face(**opts)
+      face = DrawioDsl::Schema::Face.new(current_page, **opts)
+      add_shape(face)
+    end
+
+    def add_triangle(**opts)
+      triangle = DrawioDsl::Schema::Triangle.new(current_page, **opts)
+      add_shape(triangle)
+    end
+  end
+end
+# :nocov:

data/lib/drawio_dsl/drawio.rb

@@ -19,35 +19,18 @@ module DrawioDsl
       layout.call
       self
     end
-
-    def apply_layout
-      engine = DrawioDsl::LayoutEngine.new(builder.diagram)
-      engine.call
-
-      self
-    end
   end
 
   # DrawioDsl::DrawioPage is created when you call .page on the draw-io DSL.
   class DrawioPage < KDirector::Directors::ChildDirector
-    attr_reader :auto_layout
-    attr_reader :current_x
-    attr_reader :current_y
+    include DrawioDsl::DrawioShapes
 
     def initialize(parent, **opts)
       super(parent, **opts)
 
-      @auto_layout = true
-      @current_x = 20
-      @current_y = 20
-
       builder.add_page(**opts)
     end
 
-    def layout_rule(**opts)
-      builder.add_layout_rule(**opts)
-    end
-
     def grid_layout(**opts)
       builder.add_grid_layout(**opts)
     end
@@ -55,60 +38,5 @@ module DrawioDsl
     def flex_layout(**opts)
       builder.add_flex_layout(**opts)
     end
-
-    # rubocop:disable Metrics/CyclomaticComplexity
-    def random(**opts)
-      case rand(7)
-      when 0
-        square(**opts)
-      when 1
-        rectangle(**opts)
-      when 2
-        circle(**opts)
-      when 3
-        process(**opts)
-      when 4
-        ellipse(**opts)
-      when 5
-        diamond(**opts)
-      when 6
-        hexagon(**opts)
-      end
-    end
-    # rubocop:enable Metrics/CyclomaticComplexity
-
-    def square(**opts)
-      builder.add_square(**opts)
-    end
-
-    def rectangle(**opts)
-      builder.add_rectangle(**opts)
-    end
-
-    def circle(**opts)
-      builder.add_circle(**opts)
-    end
-
-    def process(**opts)
-      builder.add_process(**opts)
-    end
-
-    def ellipse(**opts)
-      builder.add_ellipse(**opts)
-    end
-
-    def diamond(**opts)
-      builder.add_diamond(**opts)
-    end
-
-    def hexagon(**opts)
-      builder.add_hexagon(**opts)
-    end
-
-    private
-
-    def current_shape
-      builder.current_shape
-    end
   end
 end