drawio_dsl 0.1.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6af520857fe09be7e990c254d75364ae3c4f145e77beb8aaf1850c7e99954666
-  data.tar.gz: ed9f9debe4437765f426cb873cc226eb8721a89b2be257a30345122d59a25217
+  metadata.gz: 56780c6c8fa8c1ea29a29e07bf389cf257fd7a33faf52e955b3fe56133367063
+  data.tar.gz: f583d40a64cea1177d7d52ab627dcbfa954cb3091dada0903947f69f5792d3b5
 SHA512:
-  metadata.gz: 13a320ccac8daefe68036dafe8982451e28cb1ba56dd0be1b22694106fee82aa4625e8eee214a8a0cecdff476a5b2b56b90b45a6bbf8df82c1a315d36ea18a57
-  data.tar.gz: 912a578341300d29b610fb053b5d4d98a161e7be9c1decd65b72af0398305a216d785245572b020b7463ad708ed74d6f7ddf936708175337eb6834f92611dcd8
+  metadata.gz: 92b5c4e8e2a8210c3e2213df96f1d35034689a3d2ff9132e17fc1fa30f68b89551cb395f725e0b1b5da3b506e62471e2e64def33683f8959f53a41a43e4f5805
+  data.tar.gz: 112eb4f963aa4c295559f8d1e8ed0eaf0121bb768282924ca54059c3de4924d16a33b5a3d33dd9044378315840aafda7db34d228aa2064606eccf5d29776da52

data/.builders/.templates/command.rb

@@ -0,0 +1,8 @@
+KManager.model :{{command.name}}, namespace: %i[blueprint command] do
+  # microapp = import(:handlebars_helpers, :microapp)
+
+  settings do
+    name                  :{{command.name}}
+    description           "{{command.description}}"
+  end
+end

data/.builders/.templates/schema_shape.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module DrawioDsl
+  module Schema
+    class {{camle type}} < Shape
+      configure_shape(:{{snake type}})
+    end
+  end
+end

data/.builders/blueprint/shapes.rb

@@ -0,0 +1,19 @@
+KManager.model :shapes, namespace: %i[domain] do
+  # microapp = import(:handlebars_helpers, :microapp)
+
+  table :shapes do
+    fields :type, :x, :y, :w, :h, :style_modifiers
+
+    # row :shape      , x: 0, y: 0, w:  20, h:  20, style_modifiers: ''
+    row :square     , x: 0, y: 0, w: 160, h: 160, style_modifiers: ''
+    row :rectangle  , x: 0, y: 0, w: 200, h: 120, style_modifiers: ''
+    row :circle     , x: 0, y: 0, w: 160, h: 160, style_modifiers: 'double=1;ellipse'
+    row :process    , x: 0, y: 0, w: 200, h: 120, style_modifiers: 'double=1;shape=process'
+    row :ellipse    , x: 0, y: 0, w: 200, h: 120, style_modifiers: 'double=1;ellipse'
+    row :diamond    , x: 0, y: 0, w: 160, h: 160, style_modifiers: 'double=1;rhombus'
+    row :hexagon    , x: 0, y: 0, w: 200, h: 120, style_modifiers: 'double=1;shape=hexagon'
+    row :cloud      , x: 0, y: 0, w: 160, h: 160, style_modifiers: 'double=1;shape=cloud'
+    row :note       , x: 0, y: 0, w: 160, h: 160, style_modifiers: 'double=1;shape=note'
+    row :callout    , x: 0, y: 0, w: 160, h: 160, style_modifiers: 'double=1;shape=callout'
+  end
+end

data/.builders/boot.rb

@@ -60,6 +60,7 @@ resource_manager
   .fileset
   .glob('*.rb', exclude: ['boot.rb'])
   .glob('generators/**/*.rb')
+  .glob('blueprint/**/*.rb')
 resource_manager.add_resources
 
 KManager.boot

data/.builders/generators/10-page-margin.rb

@@ -0,0 +1,46 @@
+KManager.action :bootstrap do
+  action do
+    director = DrawioDsl::Drawio
+      .init(k_builder)
+      .diagram(theme: :style_01)
+      .page('PgMargin-default') do
+        grid_layout(wrap_at: 4)
+        square(title: 'Page Margin 50, 50 (Default)')
+        circle
+        square
+        circle
+        square
+        circle
+        square
+        circle
+      end
+      .page('PgMargin-0-0', margin_left: 0, margin_top: 0) do
+        grid_layout(wrap_at: 4)
+        square(title: 'Page Margin 0, 0')
+        circle
+        square
+        circle
+        square
+        circle
+        square
+        circle
+      end
+      .page('PgMargin-90-70', margin_left: 90, margin_top: 70) do
+        grid_layout(wrap_at: 4)
+        square(title: 'Page Margin 90, 70')
+        circle
+        square
+        circle
+        square
+        circle
+        square
+        circle
+      end
+
+    diagram = DrawioDsl::XmlBuilder.new(director.builder.diagram)
+
+
+    File.write('../spec/.samples/drawio/10-page-margin.xml', diagram.build)
+    File.write('../spec/.samples/drawio/10-page-margin.drawio', diagram.build)
+  end
+end

data/.builders/generators/15-grid-direction.rb

@@ -0,0 +1,40 @@
+KManager.action :bootstrap do
+  action do
+
+    # KConfig.configuration.drawio.square.w = KConfig.configuration.drawio.square.w / 4
+    # KConfig.configuration.drawio.square.h = KConfig.configuration.drawio.square.h / 4
+    # KConfig.configuration.drawio.circle.w = KConfig.configuration.drawio.circle.w / 4
+    # KConfig.configuration.drawio.circle.h = KConfig.configuration.drawio.circle.h / 4
+    # KConfig.configuration.drawio.rectangle.w = KConfig.configuration.drawio.rectangle.w / 4
+    # KConfig.configuration.drawio.rectangle.h = KConfig.configuration.drawio.rectangle.h / 4
+
+    director = DrawioDsl::Drawio
+      .init(k_builder)
+      .diagram(theme: :style_01)
+      .page('Horizontal', margin_left: 0, margin_top: 0) do
+        grid_layout(wrap_at: 3, direction: :horizontal)
+        circle(title: '01')
+        square(title: '02')
+        circle(title: '03')
+        square(title: '04')
+        circle(title: '05')
+        square(title: '06')
+        circle(title: '07')
+      end
+      .page('Vertical', margin_left: 0, margin_top: 0) do
+        grid_layout(wrap_at: 3, direction: :vertical)
+        circle(title: '01')
+        square(title: '02')
+        circle(title: '03')
+        square(title: '04')
+        circle(title: '05')
+        square(title: '06')
+        circle(title: '07')
+      end
+
+    diagram = DrawioDsl::XmlBuilder.new(director.builder.diagram)
+
+    File.write('../spec/.samples/drawio/15-grid-direction.xml', diagram.build)
+    File.write('../spec/.samples/drawio/15-grid-direction.drawio', diagram.build)
+  end
+end

data/.builders/generators/16-grid-alignment.rb

@@ -0,0 +1,73 @@
+KManager.action :bootstrap do
+  action do
+
+    # KConfig.configuration.drawio.square.w = KConfig.configuration.drawio.square.w / 4
+    # KConfig.configuration.drawio.square.h = KConfig.configuration.drawio.square.h / 4
+    # KConfig.configuration.drawio.circle.w = KConfig.configuration.drawio.circle.w / 4
+    # KConfig.configuration.drawio.circle.h = KConfig.configuration.drawio.circle.h / 4
+    # KConfig.configuration.drawio.rectangle.w = KConfig.configuration.drawio.rectangle.w / 4
+    # KConfig.configuration.drawio.rectangle.h = KConfig.configuration.drawio.rectangle.h / 4
+
+    director = DrawioDsl::Drawio
+      .init(k_builder,
+        on_exist:                   :skip,                      # %i[skip write compare]
+        on_action:                  :queue                      # %i[queue execute]
+      )
+      .diagram(theme: :style_01)
+      .page('Grid-Center', margin_left: 0, margin_top: 0) do
+        grid_layout(wrap_at: 3)
+        circle
+        square
+        circle
+        square
+        circle
+        square
+        circle
+      end
+      .page('Grid-Top', margin_left: 0, margin_top: 0) do
+        grid_layout(wrap_at: 3, v_align: :top, h_align: :center)
+        circle
+        square
+        circle
+        square
+        circle
+        square
+        circle
+      end
+      .page('Grid-Bottom', margin_left: 0, margin_top: 0) do
+        grid_layout(wrap_at: 3, v_align: :bottom, h_align: :center)
+        circle
+        square
+        circle
+        square
+        circle
+        square
+        circle
+      end
+      .page('Grid-Left', margin_left: 0, margin_top: 0) do
+        grid_layout(wrap_at: 3, v_align: :center, h_align: :left)
+        circle
+        square
+        circle
+        square
+        circle
+        square
+        circle
+      end
+      .page('Grid-Right', margin_left: 0, margin_top: 0) do
+        grid_layout(wrap_at: 3, v_align: :center, h_align: :right)
+        circle
+        square
+        circle
+        square
+        circle
+        square
+        circle
+      end
+
+    diagram = DrawioDsl::XmlBuilder.new(director.builder.diagram)
+
+    File.write('../spec/.samples/drawio/16-grid-alignment.xml', diagram.build)
+    File.write('../spec/.samples/drawio/16-grid-alignment.drawio', diagram.build)
+  end
+end

data/.builders/generators/20-styles.rb

@@ -0,0 +1,64 @@
+KManager.action :bootstrap do
+  action do
+
+    # :rounded, :shadow, :sketch, :glass
+    director = DrawioDsl::Drawio
+      .init(k_builder)
+      .diagram(theme: :style_06)
+      .page('Style-Plain', margin_left: 0, margin_top: 0) do
+        grid_layout(wrap_at: 4)
+        circle
+        square
+        circle
+        square
+        circle
+        square
+        circle
+      end
+      .page('Style-Shadow', shadow: 1, margin_left: 0, margin_top: 0) do
+        grid_layout(wrap_at: 4)
+        circle
+        square
+        circle
+        square
+        circle
+        square
+        circle
+      end
+      .page('Style-Rounded', rounded: 1, margin_left: 0, margin_top: 0) do
+        grid_layout(wrap_at: 4)
+        circle
+        square
+        circle
+        square
+        circle
+        square
+        circle
+      end
+      .page('Style-Glass', glass: 1, margin_left: 0, margin_top: 0) do
+        grid_layout(wrap_at: 4)
+        circle
+        square
+        circle
+        square
+        circle
+        square
+        circle
+      end
+      .page('Style-Sketch', sketch: 1, margin_left: 0, margin_top: 0) do
+        grid_layout(wrap_at: 4)
+        circle
+        square
+        circle
+        square
+        circle
+        square
+        circle
+      end
+
+    diagram = DrawioDsl::XmlBuilder.new(director.builder.diagram)
+
+    File.write('../spec/.samples/drawio/20-styles.xml', diagram.build)
+    File.write('../spec/.samples/drawio/20-styles.drawio', diagram.build)
+  end
+end

data/.builders/generators/25-themes.rb

@@ -0,0 +1,24 @@
+KManager.action :bootstrap do
+  action do
+
+    # :rounded, :shadow, :sketch, :glass
+    director = DrawioDsl::Drawio
+      .init(k_builder)
+      .diagram(theme: :style_06)
+      .page('Style-Plain', margin_left: 0, margin_top: 0) do
+        grid_layout(wrap_at: 5)
+
+        square(title: 'The quick brown fox jumps over the lazy dog')
+        circle(title: 'Mary had a little lamb')
+
+        KConfig.configuration.drawio.themes.keys.each do |theme|
+          random(title: theme.to_s, theme: theme)
+        end
+      end
+
+    diagram = DrawioDsl::XmlBuilder.new(director.builder.diagram)
+
+    File.write('../spec/.samples/drawio/25-themes.xml', diagram.build)
+    File.write('../spec/.samples/drawio/25-themes.drawio', diagram.build)
+  end
+end

data/.rubocop.yml

@@ -67,6 +67,10 @@ Naming/VariableNumber:
 Naming/MethodParameterName:
   AllowedNames:
     - as
+    - x
+    - y
+    - w
+    - h
 Style/EmptyMethod:    
   Exclude:
     - "**/spec/**/*"
@@ -79,7 +83,8 @@ Metrics/ParameterLists:
 Layout/EmptyLineBetweenDefs:
   Exclude:
     - "**/spec/**/*"
-
+Style/Documentation:
+  Enabled: false
 Lint/AmbiguousBlockAssociation:
   Exclude:
     - "**/spec/**/*"

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+# [0.3.0](https://github.com/klueless-io/drawio_dsl/compare/v0.2.0...v0.3.0) (2022-03-04)
+
+
+### Features
+
+* add samples for direction, alignment, themes, styles and page margin ([2e9f735](https://github.com/klueless-io/drawio_dsl/commit/2e9f735ba50c9391d7dea64c565ca9c0fb61978a))
+
+# [0.2.0](https://github.com/klueless-io/drawio_dsl/compare/v0.1.0...v0.2.0) (2022-03-04)
+
+
+### Features
+
+* update drawio with grid layout engine ([cc5dc51](https://github.com/klueless-io/drawio_dsl/commit/cc5dc51debfd902a815df704fa2dd77f39f498c7))
+
+# [0.1.0](https://github.com/klueless-io/drawio_dsl/compare/v0.0.1...v0.1.0) (2022-03-02)
+
+
+### Features
+
+* initial draw-io dsl ([ac197c8](https://github.com/klueless-io/drawio_dsl/commit/ac197c88b66b883b5fcce93090c285bc9ccdb7a3))
+* initial draw-io dsl ([12c8b98](https://github.com/klueless-io/drawio_dsl/commit/12c8b98392e5f7da598cf2f9c375f1ca7041533b))
+* initial draw-io dsl ([6ef32ad](https://github.com/klueless-io/drawio_dsl/commit/6ef32adcb1287d9993ebe30c437326716357a08e))
+* initial draw-io dsl ([16827b5](https://github.com/klueless-io/drawio_dsl/commit/16827b57767d12c387167b86f17b33115d1d0378))
+
 ## [Unreleased]
 
 ## [0.1.0] - 2022-02-25

data/lib/drawio_dsl/configuration.rb

@@ -16,38 +16,33 @@ module DrawioDsl
     include KLog::Logging
 
     BaseStyle = Struct.new(:white_space, :html, :rounded, :shadow, :sketch, :glass, keyword_init: true)
-
-    ElementDefaults   = Struct.new(:type, :x, :y, :w, :h, :style_modifiers)
-    ElementThemeStyle = Struct.new(:fill_color, :stroke_color, :font_color, :gradient, keyword_init: true)
+    ShapeDefaults   = Struct.new(:type, :x, :y, :w, :h, :style_modifiers, keyword_init: true)
+    ShapeThemeStyle = Struct.new(:fill_color, :stroke_color, :font_color, :gradient, keyword_init: true)
+
+    Shapes = Struct.new(
+      :shape,
+      :square,
+      :rectangle,
+      :circle,
+      :process,
+      :ellipse,
+      :diamond,
+      :hexagon,
+      :cloud,
+      :note,
+      :callout,
+      keyword_init: true
+    )
 
     attr_accessor :base_style
 
-    # Theme colors
     attr_accessor :themes
-
-    # Element shapes
-    attr_accessor :element
-    attr_accessor :square
-    attr_accessor :rectangle
-    attr_accessor :circle
-    attr_accessor :process
-    attr_accessor :ellipse
-    attr_accessor :triangle
-    attr_accessor :parallelogram
-    attr_accessor :hexagon
+    attr_accessor :shapes
 
     def initialize
       @base_style = BaseStyle.new(white_space: :wrap, html: 1, rounded: nil, shadow: nil, sketch: nil, glass: nil)
 
-      @element    = ElementDefaults.new(:element   , 0, 0, 20, 20, '')
-      @square     = ElementDefaults.new(:square    , 0, 0, 160, 160, '')
-      @rectangle  = ElementDefaults.new(:rectangle , 0, 0, 240, 120, '')
-      @circle     = ElementDefaults.new(:circle    , 0, 0, 160, 160, 'ellipse')
-      @process    = ElementDefaults.new(:process   , 0, 0, 240, 120, 'shape=process')
-      @ellipse    = ElementDefaults.new(:ellipse   , 0, 0, 240, 120, 'ellipse')
-      @triangle   = ElementDefaults.new(:triangle  , 0, 0, 160, 160, 'rhombus')
-
-      @themes     = {}
+      add_shapes
       add_themes
     end
 
@@ -61,12 +56,30 @@ module DrawioDsl
 
     private
 
+    def add_shapes
+      @shapes = Shapes.new(
+        shape: ShapeDefaults.new(type: :shape , x: 0, y: 0, w: 20, h: 20, style_modifiers: ''),
+        square: ShapeDefaults.new(type: :square , x: 0, y: 0, w: 160, h: 160, style_modifiers: ''),
+        rectangle: ShapeDefaults.new(type: :rectangle , x: 0, y: 0, w: 200, h: 120, style_modifiers: ''),
+        circle: ShapeDefaults.new(type: :circle , x: 0, y: 0, w: 160, h: 160, style_modifiers: 'double=1;ellipse'),
+        process: ShapeDefaults.new(type: :process , x: 0, y: 0, w: 200, h: 120, style_modifiers: 'double=1;shape=process'),
+        ellipse: ShapeDefaults.new(type: :ellipse , x: 0, y: 0, w: 200, h: 120, style_modifiers: 'double=1;ellipse'),
+        diamond: ShapeDefaults.new(type: :diamond , x: 0, y: 0, w: 160, h: 160, style_modifiers: 'double=1;rhombus'),
+        hexagon: ShapeDefaults.new(type: :hexagon , x: 0, y: 0, w: 200, h: 120, style_modifiers: 'double=1;shape=hexagon'),
+        cloud: ShapeDefaults.new(type: :cloud , x: 0, y: 0, w: 160, h: 160, style_modifiers: 'double=1;shape=cloud'),
+        note: ShapeDefaults.new(type: :note , x: 0, y: 0, w: 160, h: 160, style_modifiers: 'double=1;shape=note'),
+        callout: ShapeDefaults.new(type: :callout , x: 0, y: 0, w: 160, h: 160, style_modifiers: 'double=1;shape=callout')
+      )
+    end
+
     def add_theme(name, **opts)
-      @themes[name] = ElementThemeStyle.new(**opts)
+      @themes[name] = ShapeThemeStyle.new(**opts)
     end
 
     # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     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')
@@ -90,26 +103,26 @@ module DrawioDsl
       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')
-      add_theme(:style_25         , fill_color: '#fad9d5', stroke_color: '#ae4132')
-      add_theme(:style_26         , fill_color: '#b0e3e6', stroke_color: '#0e8088')
-      add_theme(:style_27         , fill_color: '#b1ddf0', stroke_color: '#10739e')
-      add_theme(:style_28         , fill_color: '#d0cee2', stroke_color: '#56517e')
-      add_theme(:style_29         , fill_color: '#bac8d3', stroke_color: '#23445d')
-      add_theme(:style_30         , fill_color: '#f5f5f5', stroke_color: '#666666', gradient: '#b3b3b3')
-      add_theme(:style_31         , fill_color: '#dae8fc', stroke_color: '#6c8ebf', gradient: '#7ea6e0')
-      add_theme(:style_32         , fill_color: '#d5e8d4', stroke_color: '#82b366', gradient: '#97d077')
-      add_theme(:style_33         , fill_color: '#ffcd28', stroke_color: '#d79b00', gradient: '#ffa500')
-      add_theme(:style_34         , fill_color: '#fff2cc', stroke_color: '#d6b656', gradient: '#ffd966')
-      add_theme(:style_35         , fill_color: '#f8cecc', stroke_color: '#b85450', gradient: '#ea6b66')
-      add_theme(:style_36         , fill_color: '#e6d0de', stroke_color: '#996185', gradient: '#d5739d')
-      add_theme(:style_37         , fill_color: '#eeeeee', stroke_color: '#36393d')
-      add_theme(:style_38         , fill_color: '#f9f7ed', stroke_color: '#36393d')
-      add_theme(:style_39         , fill_color: '#ffcc99', stroke_color: '#36393d')
-      add_theme(:style_40         , fill_color: '#cce5ff', stroke_color: '#36393d')
-      add_theme(:style_41         , fill_color: '#ffff88', stroke_color: '#36393d')
-      add_theme(:style_42         , fill_color: '#cdeb8b', stroke_color: '#36393d')
-      add_theme(:style_43         , fill_color: '#ffcccc', stroke_color: '#36393d')
+      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
     # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
   end

data/lib/drawio_dsl/dom_builder.rb

@@ -7,7 +7,8 @@ module DrawioDsl
     attr_reader :last_action
 
     attr_reader :current_page
-    attr_reader :current_element
+    attr_reader :current_layout_rule
+    attr_reader :current_shape
 
     def initialize
       @actions = []
@@ -18,7 +19,7 @@ module DrawioDsl
       @actions = []
       @last_action = {}
       set_diagram
-      set_layout_engine
+      # set_layout_engine
     end
 
     def queue_action(action)
@@ -26,16 +27,6 @@ module DrawioDsl
       @last_action = action
     end
 
-    def set_layout_engine(**opts)
-      @layout_engine = DrawioDsl::LayoutEngine.new(**opts)
-    end
-
-    def layout_engine
-      return @layout_engine if defined? @layout_engine
-
-      set_layout_engine
-    end
-
     def set_diagram(**opts)
       @diagram = DrawioDsl::Schema::Diagram.new(**opts)
     end
@@ -55,40 +46,92 @@ module DrawioDsl
       @current_page
     end
 
-    def add_element(element)
-      @current_element = element
+    # ----------------------------------------------------------------------
+    # Layout provides rules for positioning components
+    # ----------------------------------------------------------------------
+
+    def add_grid_layout(**opts)
+      rule = DrawioDsl::Schema::GridLayout.new(current_page, **opts)
+      add_layout_rule(rule)
+    end
+
+    def add_flex_layout(**opts)
+      rule = DrawioDsl::Schema::FlexLayout.new(current_page, **opts)
+      add_layout_rule(rule)
+    end
+
+    def add_layout_rule(rule)
+      @current_layout_rule = rule
+
+      rule.id = "rule-#{current_page.nodes.length + 1}" unless rule.id
+
+      current_page.nodes << rule
+
+      rule
+    end
+
+    # ----------------------------------------------------------------------
+    # Shapes represent visual components
+    # ----------------------------------------------------------------------
 
-      element.id = "#{current_page.id}-#{current_page.elements.length + 1}" unless element.id
+    def add_shape(shape)
+      @current_shape = shape
 
-      layout_engine.container.place_element(element)
+      shape.id = "#{current_page.id}-#{current_page.nodes.length + 1}" unless shape.id
 
-      current_page.elements << element
-      @current_element
+      current_page.nodes << shape
+
+      shape
     end
 
     def add_square(**opts)
       square = DrawioDsl::Schema::Square.new(current_page, **opts)
-      add_element(square)
+      add_shape(square)
     end
 
     def add_rectangle(**opts)
       rectangle = DrawioDsl::Schema::Rectangle.new(current_page, **opts)
-      add_element(rectangle)
+      add_shape(rectangle)
     end
 
     def add_circle(**opts)
       circle = DrawioDsl::Schema::Circle.new(current_page, **opts)
-      add_element(circle)
+      add_shape(circle)
     end
 
     def add_process(**opts)
       process = DrawioDsl::Schema::Process.new(current_page, **opts)
-      add_element(process)
+      add_shape(process)
     end
 
     def add_ellipse(**opts)
       ellipse = DrawioDsl::Schema::Ellipse.new(current_page, **opts)
-      add_element(ellipse)
+      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
+
+    def add_cloud(**opts)
+      cloud = DrawioDsl::Schema::Cloud.new(current_page, **opts)
+      add_shape(cloud)
+    end
+
+    def add_note(**opts)
+      note = DrawioDsl::Schema::Note.new(current_page, **opts)
+      add_shape(note)
+    end
+
+    def add_callout(**opts)
+      callout = DrawioDsl::Schema::Callout.new(current_page, **opts)
+      add_shape(callout)
     end
 
     def debug