drawio_dsl 0.8.0 → 0.8.3

data/.builders/.templates/basic/configuration_shapes.rb

@@ -5,7 +5,7 @@
 module DrawioDsl
   # Used to attach configuration to KConfig module
   module ConfigurationShapes
-    ShapeDefaults   = Struct.new(:type, :text_only, :x, :y, :w, :h, :style_modifiers, keyword_init: true)
+    ShapeDefaults   = Struct.new(:type, :category, :x, :y, :w, :h, :style_modifiers, keyword_init: true)
     Shapes = Struct.new(
       :shape,
       {{#each shapes}}
@@ -16,9 +16,9 @@ module DrawioDsl
 
     def add_shapes
       @shapes = Shapes.new(
-        shape: ShapeDefaults.new(type: :shape, text_only: false, x: 0, y: 0, w: 20, h: 20, style_modifiers: ''),
+        shape: ShapeDefaults.new(type: :shape, category: :element, x: 0, y: 0, w: 20, h: 20, style_modifiers: ''),
         {{#each shapes}}
-        {{snake ./type}}: ShapeDefaults.new(type: :{{snake ./type}}, x: {{./x}}, text_only: {{./text_only}}, y: {{./y}}, w: {{./w}}, h: {{./h}}, style_modifiers: '{{{./style_modifiers}}}'){{#if @last}}{{^}},{{/if}}
+        {{snake ./type}}: ShapeDefaults.new(type: :{{snake ./type}}, x: {{./x}}, category: :{{./category}}, y: {{./y}}, w: {{./w}}, h: {{./h}}, style_modifiers: '{{{./style_modifiers}}}'){{#if @last}}{{^}},{{/if}}
         {{/each}}
       )
     end

data/.builders/.templates/basic/dom_builder_shapes.rb

@@ -6,7 +6,8 @@ module DrawioDsl
   module DomBuilderShapes
     {{#each shapes}}
 
-    def add_{{snake ./type}}(**opts, &block)
+    def add_{{snake ./type}}(id = nil, **opts, &block)
+      opts = { id: id }.merge(opts) if id
       {{snake ./type}} = DrawioDsl::Schema::{{camel ./type}}.new(current_page, **opts, &block)
       add_shape({{snake ./type}})
     end

data/.builders/.templates/basic/drawio_shapes.rb

@@ -14,8 +14,8 @@ module DrawioDsl
     end
     {{#each shapes}}
 
-    def {{snake ./type}}(**opts, &block)
-      builder.add_{{snake ./type}}(**opts, &block)
+    def {{snake ./type}}(id = nil, **opts, &block)
+      builder.add_{{snake ./type}}(id, **opts, &block)
     end
     {{/each}}
   end

data/.builders/blueprint/shapes.rb

@@ -1,66 +1,169 @@
 m = KManager.model :shapes, namespace: %i[domain] do
   # microapp = import(:handlebars_helpers, :microapp)
 
+  # other settings
+  # strokeWidth: 1-n
+  # when there is an arrow at beginning
+  # startFill=1,0
+  # when there is an arrow at end
+  # endFill=1,0
+
+
+  table :strokes do
+    fields [:name, :style]
+
+    row :dashed               , 'dashed=1;fixDash=1'
+    row :dotted               , 'dashed=1;fixDash=1;dashPattern=1 4'
+    row :dashdot              , 'dashed=1;fixDash=1;dashPattern=10 5 1 5'
+    row :dashdotdot           , 'dashed=1;fixDash=1;dashPattern=10 5 1 5 1 5'
+    row :dotdotdot            , 'dashed=1;fixDash=1;dashPattern=1 2'
+    row :longdash             , 'dashed=1;fixDash=1;dashPattern=16 6'
+    row :dashlongdash         , 'dashed=1;fixDash=1;dashPattern=10 6 16 6'
+    row :dashed24             , 'dashed=1;fixDash=1;dashPattern=3 8'
+    row :dashed32             , 'dashed=1;fixDash=1;dashPattern=6 5'
+    row :dashed44             , 'dashed=1;fixDash=1;dashPattern=8 8'
+  end
+
+  table :connector_compass do
+    fields %i[name x y]
+
+    row :n  , x: 0.5 , y: 0       # 'exitX=0.5;exitY=0;exitDx=0;exitDy=0'  'entryX=0.5;entryY=0;entryDx=0;entryDy=0'
+    row :ne , x: 1   , y: 0       # 'exitX=1;exitY=0;exitDx=0;exitDy=0'    'entryX=1;entryY=0;entryDx=0;entryDy=0'
+    row :e  , x: 1   , y: 0.5     # 'exitX=1;exitY=0.5;exitDx=0;exitDy=0'  'entryX=1;entryY=0.5;entryDx=0;entryDy=0'
+    row :se , x: 1   , y: 1       # 'exitX=1;exitY=1;exitDx=0;exitDy=0'    'entryX=1;entryY=1;entryDx=0;entryDy=0'
+    row :s  , x: 0.5 , y: 1       # 'exitX=0.5;exitY=1;exitDx=0;exitDy=0'  'entryX=0.5;entryY=1;entryDx=0;entryDy=0'
+    row :sw , x: 0   , y: 1       # 'exitX=0;exitY=1;exitDx=0;exitDy=0'    'entryX=0;entryY=1;entryDx=0;entryDy=0'
+    row :w  , x: 0   , y: 0.5     # 'exitX=0;exitY=0.5;exitDx=0;exitDy=0'  'entryX=0;entryY=0.5;entryDx=0;entryDy=0'
+    row :nw , x: 0   , y: 0       # 'exitX=0;exitY=0;exitDx=0;exitDy=0'    'entryX=0;entryY=0;entryDx=0;entryDy=0'
+  end
+
+  table :connector_design do
+    fields [:name, :style]
+
+    row :style1, ''
+    row :style2, 'shape=link'
+    row :style3, 'shape=flexArrow'
+    row :style4, 'shape=arrow'
+  end
+
+  table :connector_arrows do
+    fields [:name, :style]
+
+    row :simple                     , 'open'
+    row :triangle                   , 'block'
+    row :diamond                    , 'diamond'
+    row :circle                     , 'oval'
+    row :cross                      , 'cross'
+    row :short                      , 'classicThin'
+    row :default                    , 'classic'
+    row :none                       , 'none'
+    row :plain                      , 'open'
+    row :skewed_dash                , 'dash'
+    row :concave                    , 'openThin'
+    row :er_many                    , 'ERmany'
+    row :er_one                     , 'ERone'
+    row :er_one_optional            , 'ERzeroToOne'
+    row :er_one_mandatory           , 'ERmandOne'
+    row :er_many_optional           , 'ERzeroToMany'
+    row :er_many_mandatory          , 'ERoneToMany'
+  end
+
+  table :connector_waypoints do # aka edgeStyle
+    fields [:name, :style]
+
+    row :straight                 , 'edgeStyle=none'
+    row :orthogonal               , 'edgeStyle=orthogonalEdgeStyle'
+    row :elbow                    , 'edgeStyle=elbowEdgeStyle'
+    row :elbow_vertical           , 'edgeStyle=elbowEdgeStyle;elbow=vertical'
+    row :isometric                , 'edgeStyle=isometricEdgeStyle'
+    row :isometric_vertical       , 'edgeStyle=isometricEdgeStyle;elbow=vertical'
+    row :orthogonal_curved        , 'edgeStyle=orthogonalEdgeStyle;curved=1'
+    row :entity_relation          , 'edgeStyle=entityRelationEdgeStyle'
+  end
+
   table :shapes do
-    fields [:type, :text_only, :x, :y, :w, :h, :style_modifiers]
+    fields [:type, :category, :x, :y, :w, :h, :style_modifiers]
 
     # shape is a custom object
     # row :shape      , 0, 0,  20,  20, ''
 
+    row :line                 , :line   , 0, 0,  50,  50, 'edgeStyle=none;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0'
+    # row :line                 , :line   , 0, 0,  50,  50, 'edgeStyle=entityRelationEdgeStyle;strokeWidth=1;elbow=vertical;startArrow=none;startFill=0;endArrow=block;endFill=0;targetPerimeterSpacing=0;shape=flexArrow;endSize=6;fillStyle=zigzag;'
+    # row :dashed               , 'dashed=1;fixDash=1'
+    # row :dotted               , 'dashed=1;fixDash=1;dashPattern=1 4'
+    # row :dashdot              , 'dashed=1;fixDash=1;dashPattern=10 5 1 5'
+    # row :dashdotdot           , 'dashed=1;fixDash=1;dashPattern=10 5 1 5 1 5'
+    # row :dotdotdot            , 'dashed=1;fixDash=1;dashPattern=1 2'
+    # row :longdash             , 'dashed=1;fixDash=1;dashPattern=16 6'
+    # row :dashlongdash         , 'dashed=1;fixDash=1;dashPattern=10 6 16 6'
+    # row :dashed24             , 'dashed=1;fixDash=1;dashPattern=3 8'
+    # row :dashed32             , 'dashed=1;fixDash=1;dashPattern=6 5'
+    # row :dashed44             , 'dashed=1;fixDash=1;dashPattern=8 8'
+    # edge="1" parent="node_root_2T8" source="b" target="c"
+
     # configuration for general purpose shapes
-    row :h1                   ,  true, 0, 0, 100,  50, 'text;fontSize=89;fontColor=#ffffff;fontStyle=1;fillColor=none'
-    row :h2                   ,  true, 0, 0, 100,  50, 'text;fontSize=67;fontColor=#ffffff;fontStyle=1;fillColor=none'
-    row :h3                   ,  true, 0, 0, 100,  50, 'text;fontSize=50;fontColor=#ffffff;fontStyle=1;fillColor=none'
-    row :h4                   ,  true, 0, 0, 100,  50, 'text;fontSize=37;fontColor=#ffffff;fontStyle=1;fillColor=none'
-    row :h5                   ,  true, 0, 0, 100,  50, 'text;fontSize=28;fontColor=#ffffff;fontStyle=1;fillColor=none'
-    row :h6                   ,  true, 0, 0, 100,  50, 'text;fontSize=21;fontColor=#ffffff;fontStyle=1;fillColor=none'
-    row :p                    ,  true, 0, 0, 100,  50, 'text;fontSize=16;fontColor=#ffffff;fontStyle=1;fillColor=none'
-
-    row :actor                , false, 0, 0,  40,  50, 'shape=actor'
-    row :actor2               , false, 0, 0,  30,  50, 'shape=umlActor;verticalLabelPosition=bottom;outlineConnect=1'
-    row :callout              , false, 0, 0, 160, 120, 'shape=callout'
-    row :callout2             , false, 0, 0, 160, 160, 'shape=mxgraph.basic.oval_callout'
-    row :callout3             , false, 0, 0, 160, 160, 'shape=mxgraph.basic.cloud_callout'
-    row :callout4             , false, 0, 0, 160, 120, 'shape=mxgraph.basic.roundRectCallout;dx=30;dy=15;size=5;boundedLbl=1;'
-    row :circle               , false, 0, 0, 160, 160, 'ellipse'
-    row :cloud                , false, 0, 0, 160, 160, 'shape=cloud'
-    row :container            , false, 0, 0, 160, 160, 'swimlane'
-    row :container2           , false, 0, 0, 160, 160, 'swimlane;horizontal=0'
-    row :container3           , false, 0, 0, 160, 160, 'swimlane;startSize=50'
-    row :container4           , false, 0, 0, 160, 160, 'swimlane;resizable=0'
-    row :cross                , false, 0, 0,  50,  50, 'verticalLabelPosition=bottom;verticalAlign=top;html=1;shape=mxgraph.basic.x'
-    row :envelop              , false, 0, 0, 160, 100, 'shape=message'
-    row :diamond              , false, 0, 0, 100, 100, 'rhombus'
-    row :document             , false, 0, 0, 160, 160, 'shape=mxgraph.basic.document'
-    row :ellipse              , false, 0, 0, 200, 120, 'ellipse'
-    row :hexagon              , false, 0, 0, 200, 120, 'shape=hexagon'
-    row :interface            , false, 0, 0, 160, 160, 'align=left;overflow=fill;fontSize=12;fontFamily=Helvetica'
-    row :klass                , false, 0, 0, 160, 160, 'align=left;overflow=fill;fontSize=12;fontFamily=Helvetica'
-    row :note                 , false, 0, 0, 160, 160, 'shape=note'
-    row :process              , false, 0, 0, 200, 120, 'shape=process'
-    row :rectangle            , false, 0, 0, 200, 120, ''
-    row :rectangle2           , false, 0, 0, 200, 120, 'shape=mxgraph.basic.cloud_rect'
-    row :square               , false, 0, 0, 160, 160, ''
-    row :step                 , false, 0, 0, 120,  80, 'shape=step;perimeter=stepPerimeter;fixedSize=1'
-    row :tick                 , false, 0, 0,  50,  50, 'verticalLabelPosition=bottom;verticalAlign=top;shape=mxgraph.basic.tick'
-    row :todo                 , false, 0, 0, 300,  60, ''
-    row :face                 , false, 0, 0, 100, 100, 'verticalLabelPosition=bottom;verticalAlign=top;shape=mxgraph.basic.smiley'
-    row :triangle             , false, 0, 0, 100, 100, 'triangle'
+    row :h1                   , :text   , 0, 0, 100,  50, 'text;fontSize=89;fontColor=#ffffff;fontStyle=1;fillColor=none'
+    row :h2                   , :text   , 0, 0, 100,  50, 'text;fontSize=67;fontColor=#ffffff;fontStyle=1;fillColor=none'
+    row :h3                   , :text   , 0, 0, 100,  50, 'text;fontSize=50;fontColor=#ffffff;fontStyle=1;fillColor=none'
+    row :h4                   , :text   , 0, 0, 100,  50, 'text;fontSize=37;fontColor=#ffffff;fontStyle=1;fillColor=none'
+    row :h5                   , :text   , 0, 0, 100,  50, 'text;fontSize=28;fontColor=#ffffff;fontStyle=1;fillColor=none'
+    row :h6                   , :text   , 0, 0, 100,  50, 'text;fontSize=21;fontColor=#ffffff;fontStyle=1;fillColor=none'
+    row :p                    , :text   , 0, 0, 100,  50, 'text;fontSize=16;fontColor=#ffffff;fontStyle=1;fillColor=none'
+
+    row :actor                , :element, 0, 0,  40,  50, 'shape=actor'
+    row :actor2               , :element, 0, 0,  30,  50, 'shape=umlActor;verticalLabelPosition=bottom;outlineConnect=1'
+    row :callout              , :element, 0, 0, 160, 120, 'shape=callout'
+    row :callout2             , :element, 0, 0, 160, 160, 'shape=mxgraph.basic.oval_callout'
+    row :callout3             , :element, 0, 0, 160, 160, 'shape=mxgraph.basic.cloud_callout'
+    row :callout4             , :element, 0, 0, 160, 120, 'shape=mxgraph.basic.roundRectCallout;dx=30;dy=15;size=5;boundedLbl=1;'
+    row :circle               , :element, 0, 0, 160, 160, 'ellipse'
+    row :cloud                , :element, 0, 0, 160, 160, 'shape=cloud'
+    row :container            , :element, 0, 0, 160, 160, 'swimlane'
+    row :container2           , :element, 0, 0, 160, 160, 'swimlane;horizontal=0'
+    row :container3           , :element, 0, 0, 160, 160, 'swimlane;startSize=50'
+    row :container4           , :element, 0, 0, 160, 160, 'swimlane;resizable=0'
+    row :cross                , :element, 0, 0,  50,  50, 'verticalLabelPosition=bottom;verticalAlign=top;html=1;shape=mxgraph.basic.x'
+    row :envelop              , :element, 0, 0, 160, 100, 'shape=message'
+    row :diamond              , :element, 0, 0, 100, 100, 'rhombus'
+    row :document             , :element, 0, 0, 160, 160, 'shape=mxgraph.basic.document'
+    row :ellipse              , :element, 0, 0, 200, 120, 'ellipse'
+    row :hexagon              , :element, 0, 0, 200, 120, 'shape=hexagon'
+    row :interface            , :element, 0, 0, 160, 160, 'align=left;overflow=fill;fontSize=12;fontFamily=Helvetica'
+    row :klass                , :element, 0, 0, 160, 160, 'align=left;overflow=fill;fontSize=12;fontFamily=Helvetica'
+    row :note                 , :element, 0, 0, 160, 160, 'shape=note'
+    row :process              , :element, 0, 0, 200, 120, 'shape=process'
+    row :rectangle            , :element, 0, 0, 200, 120, ''
+    row :rectangle2           , :element, 0, 0, 200, 120, 'shape=mxgraph.basic.cloud_rect'
+    row :square               , :element, 0, 0, 160, 160, ''
+    row :step                 , :element, 0, 0, 120,  80, 'shape=step;perimeter=stepPerimeter;fixedSize=1'
+    row :tick                 , :element, 0, 0,  50,  50, 'verticalLabelPosition=bottom;verticalAlign=top;shape=mxgraph.basic.tick'
+    row :todo                 , :element, 0, 0, 300,  60, ''
+    row :face                 , :element, 0, 0, 100, 100, 'verticalLabelPosition=bottom;verticalAlign=top;shape=mxgraph.basic.smiley'
+    row :triangle             , :element, 0, 0, 100, 100, 'triangle'
 
     # configuration for embedded element shape
     # note that the width / height probably should be driven of parent shape
-    row :embed_row            , false, 0, 0, 200,  40, 'shape=partialRectangle;collapsible=0;dropTarget=0;pointerEvents=0;top=0;left=0;bottom=1;right=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest'
-    row :embed_col50          , false, 0, 0,  50,  40, 'shape=partialRectangle;connectable=0;top=0;left=0;bottom=0;right=0;fontStyle=1;overflow=hidden'
-    row :embed_col200         , false, 0, 0, 150,  40, 'shape=partialRectangle;connectable=0;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden'
+    row :embed_row            , :element, 0, 0, 200,  40, 'shape=partialRectangle;collapsible=0;dropTarget=0;pointerEvents=0;top=0;left=0;bottom=1;right=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest'
+    row :embed_col50          , :element, 0, 0,  50,  40, 'shape=partialRectangle;connectable=0;top=0;left=0;bottom=0;right=0;fontStyle=1;overflow=hidden'
+    row :embed_col200         , :element, 0, 0, 150,  40, 'shape=partialRectangle;connectable=0;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden'
   end
 
   action do
     data = self.raw_data
-    shapes = JSON.pretty_generate(data['shapes'])
+    content = {
+      strokes: data['strokes'],
+      connector: {
+        compass: data['connector_compass'],
+        waypoints: data['connector_waypoints'],
+        arrows: data['connector_arrows'],
+        design: data['connector_design']
+      },
+      shapes: data['shapes'],
+    }
 
     k_builder
       .cd(:data)
-      .add_file('shapes.json', content: shapes, on_exist: :write)
+      .add_file('shapes.json', content: JSON.pretty_generate(content), on_exist: :write)
   end
 end
 

data/.builders/generators/02-generate-app.rb

@@ -2,7 +2,9 @@ KManager.action :requires do
 
   action do
     shapes_file = k_builder.target_folders.get_filename(:data, 'shapes.json')
-    shapes = JSON.parse(File.read(shapes_file))
+    shapes_configuration = JSON.parse(File.read(shapes_file))
+    shapes = shapes_configuration['shapes']
+    # strokes = shapes_configuration['strokes']
 
     KDirector::Dsls::BasicDsl
       .init(k_builder,

data/.builders/generators/{project_plans/drawio_dsl.rb → project-plan.rb}

@@ -1,4 +1,4 @@
-KManager.action :todo_drawio_dsl do
+KManager.action :project_plan do
   action do
 
     DrawioDsl::Drawio
@@ -10,10 +10,12 @@ KManager.action :todo_drawio_dsl do
         # p(x: 350, y: 40, w: 400, h: 80, title: 'Project plan - In progress')
 
         grid_layout(y:90, direction: :horizontal, grid_h: 80, grid_w: 320, wrap_at: 3, grid: 0)
-
-        todo(title: 'move DrawioDsl::Formatters::Factory::FORMATTERS to resource file')
-        todo(title: 'move DrawioDsl::Formatters::StyleBuilder::MAPPINGS to resource file')
-
+        
+        todo(title: 'build a class diagram')
+        todo(title: 'add new shapes related to line connectors')
+        todo(title: 'line connector aliases gives a simple way to use predefined line configurations')
+        todo(title: 'line connectors need to support autolinking using ids')
+        todo(title: 'line connectors should not effect the grid positioning systems')
       end
       .page('To Do', theme: :style_02, margin_left: 0, margin_top: 0) do
 
@@ -22,11 +24,13 @@ KManager.action :todo_drawio_dsl do
 
         grid_layout(y:90, direction: :horizontal, grid_h: 80, grid_w: 320, wrap_at: 3, grid: 0)
 
-        todo(title: 'Add page background to theme, use it whenever the theme is set at a diagram/page level')
+        todo(title: 'add page background to theme, use it whenever the theme is set at a diagram/page level')
+        todo(title: 'move DrawioDsl::Formatters::Factory::FORMATTERS to resource file')
+        todo(title: 'move DrawioDsl::Formatters::StyleBuilder::MAPPINGS to resource file')
         todo(title: 'need to setup new project plans')
         todo(title: 'settings style attributes need to de-duplicate, might be best to utilize the new StyleBuilder class')
         todo(title: 'write SVG directly into other projects')
-        todo(title: 'add :shape and :text-only to random shape generator')
+        todo(title: 'add :shape, :line and :text to random shape generator')
         todo(title: 'Nodes need to support child nodes')
         todo(title: 'Grid layout does not position itself in relation to the last element')
         todo(title: 'Dynamic sized shapes that expand to the size of their text')
@@ -42,8 +46,16 @@ KManager.action :todo_drawio_dsl do
 
         grid_layout(y:90, direction: :horizontal, grid_h: 80, grid_w: 320, wrap_at: 3, grid: 0)
 
+        todo(title: 'build configuration for line strokes %i[dashed dotted dashdot dashdotdot dotdotdot longdash)')
+        todo(title: 'build configuration for line compass %i[n ne e se s sw w nw]')
+        todo(title: 'build configuration for line shape %i[style1 style2 style3 style4]')
+        todo(title: 'build configuration for arrows %i[straight triangle diamond circle cross short default none plain skewed_dash concave er_many er_one er_one_optional er_one_mandatory er_many_optional er_many_mandatory]')
+        todo(title: 'refactor the shape->text_only (boolean) to category (symbol)')
+        todo(title: 'ensure that ids are working as expected')
+        todo(title: 'alter the initial parameter of all shapes so that it can be an ID, without named attribute')
+        todo(title: 'move project-plan files')
         todo(title: 'alter configure_shape so it sets the default shape key and use that for selecting the default HTML formatter')
-        todo(title: 'Add todo shape to simplify project plan drawing')
+        todo(title: 'add todo shape to simplify project plan drawing')
         todo(title: 'introduce .value property to shape and let it use either formatted HTML or plain text title')
         todo(title: 'formatter DSL that can render HTML directly into the value property')
         todo(title: 'formatter DSL for class and interface generation')
@@ -59,11 +71,10 @@ KManager.action :todo_drawio_dsl do
         todo(title: 'add save as .drawio')
 
       end
-      .cd(:spec)
-      .save('project-plans/drawio_dsl.drawio')
       .cd(:docs)
-      .export_svg('project_in_progress', page: 1)
-      .export_svg('project_todo'       , page: 2)
-      .export_svg('project_done'       , page: 3)
+      .save('project-plan/project.drawio')
+      .export_svg('project-plan/project_in_progress', page: 1)
+      .export_svg('project-plan/project_todo'       , page: 2)
+      .export_svg('project-plan/project_done'       , page: 3)
   end
 end

data/.builders/generators/sample_diagrams/05-samples.rb

@@ -9,15 +9,28 @@ KManager.action :bootstrap do
       .page('Samples') do
         grid_layout(wrap_at: 5)
 
-        KConfig.configuration.drawio.shapes.select { |shape| shape.type != :shape && !shape.text_only }.each do |shape|
-          # print random number between 0 and 1
-          send(shape.type, theme: KConfig.configuration.drawio.random_theme, title: shape.type.to_s, shape: shape, rounded: rnd(2), gloss: rnd(2), sketch: rnd(8))
+        # KConfig.configuration.drawio.shapes.select { |shape| shape.type != :shape && !shape.text_only }.each do |shape|
+        #   # print random number between 0 and 1
+        #   send(shape.type, theme: KConfig.configuration.drawio.random_theme, title: shape.type.to_s, shape: shape, rounded: rnd(2), gloss: rnd(2), sketch: rnd(8))
+        # end
+
+        for jersy_number in 67..112
+          team_color = :style_02
+          team_color = :style_03 if jersy_number % 3 == 0
+          team_color = :style_04 if jersy_number % 12 == 0
+
+          if jersy_number % 20 == 0
+            cloud(title: jersy_number, theme: team_color)
+          else
+            actor(title: jersy_number, theme: team_color)
+          end
         end
+      
 
       end
       .cd(:spec)
-      .save('.samples/05-samples.drawio')
-      .cd(:docs)
-      .export_svg('samples/samples', page: 1)
+      .osave('.samples/05-samples.drawio')
+      # .cd(:docs)
+      # .export_svg('samples/samples', page: 1)
   end
 end

data/.builders/generators/sample_diagrams/30-html-shapes.rb

@@ -8,17 +8,17 @@ KManager.action :html_shapes do
       .page('Style-Plain', margin_left: 0, margin_top: 0, rounded: 0, background: '#FFEADB') do
         grid_layout(wrap_at: 8)
 
-        # html = DrawioDsl::Formatters::InterfaceFormatter.new
+        # html = DrawioDsl::Formatters::KlassFormatter.new
         #   .header('IPerson')
         #   .field(:first_name, type: :string)
         #   .field(:last_name, type: :string)
         #   .field(:age, type: :integer)
         #   .field(:birthday, type: :date)
         #   .method(:full_name)
+        #   .method(:sean)
         #   .as_html
 
-        # square(
-        #   title: html,
+        # square(title: html,
         #   style_modifiers: 'align=left;overflow=fill;fontSize=12;fontFamily=Helvetica'
         # )
 
@@ -41,8 +41,8 @@ KManager.action :html_shapes do
         end
       end
       .cd(:spec)
-      .save('.samples/30-html-shapes.drawio')
-      .cd(:docs)
-      .export_svg('samples/html-shapes', page: 1)
+      .osave('.samples/30-html-shapes.drawio')
+      # .cd(:docs)
+      # .export_svg('samples/html-shapes', page: 1)
   end
 end

data/.builders/generators/sample_diagrams/35-ids-and-arrows.rb

@@ -0,0 +1,30 @@
+KManager.action :bootstrap do
+  action do
+
+    DrawioDsl::Drawio
+      .init(k_builder, on_exist: :write, on_action: :execute)
+      .diagram(theme: :style_06)
+      .page('Style-Plain', margin_left: 0, margin_top: 0) do
+        grid_layout(wrap_at: 2, grid_w: 400)
+
+        shape_count = 2
+        # for 1 to 20 step 2
+        (1..shape_count).step(2).each do |i|
+          circle(i, title: i)
+          ellipse(i+1, title: i + 1)
+        end
+
+        (1..shape_count).step(2).each do |i|
+          line(source: i, target: i+1)
+        end
+
+        # # label = '<div style="background-color: #B85450; height: 100%; margin: 0; border: 1px solid red;"><p style="padding: 10px; font-size: 12px;color: #ffffff;width: 150px;"><img style="margin-right: 20px" src="https://picsum.photos/40" /> the quick brown fox jumped over the lazy dog</p></div>'
+        # label = ''
+
+      end
+      .cd(:spec)
+      .save('.samples/35-ids-and-arrows.drawio')
+      # .cd(:docs)
+      # .export_svg('samples/styles-plain', page: 1)
+  end
+end

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [0.8.2](https://github.com/klueless-io/drawio_dsl/compare/v0.8.1...v0.8.2) (2022-03-17)
+
+
+### Bug Fixes
+
+* refactor the shape->text_only (boolean) to category (symbol) ([a469b2f](https://github.com/klueless-io/drawio_dsl/commit/a469b2fb0af9e47af35e8835fde79faba66a36df))
+
+## [0.8.1](https://github.com/klueless-io/drawio_dsl/compare/v0.8.0...v0.8.1) (2022-03-16)
+
+
+### Bug Fixes
+
+* alter the initial parameter of all shapes so that it can be an ID, without named attribute ([9c00a63](https://github.com/klueless-io/drawio_dsl/commit/9c00a634f818d25b92042a9cdb81749dbe994cf5))
+
+# [0.8.0](https://github.com/klueless-io/drawio_dsl/compare/v0.7.0...v0.8.0) (2022-03-15)
+
+
+### Features
+
+* alter configure_shape so it sets the default shape key and use that for selecting the default HTML formatter ([f0cde77](https://github.com/klueless-io/drawio_dsl/commit/f0cde7719c7b230147f10e269cbb9f02584b542b))
+
 # [0.7.0](https://github.com/klueless-io/drawio_dsl/compare/v0.6.0...v0.7.0) (2022-03-14)