drawio_dsl 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc020dbec3ff4115cab4aa60206f9e7321670c6337c6621134b592695f2f8037
-  data.tar.gz: 42f7bab79c6318c124cf457f1f2cabfd3738eff6ba3d8c8066bb486901cb0021
+  metadata.gz: 4e735678bedd529db9a041d28a842688541af3ed033de9d668db46dbfc27d0a9
+  data.tar.gz: 3405bc43946cff333fc0f6f8d0d80a0b6148499661c503493e08e41b096b177f
 SHA512:
-  metadata.gz: 62b9fa5927e15b638fe9e135fd90b5a304c248f9328a2c42d43079a15b06e839c309ebfa3a356d824fd29fe85bdcf2c02ccbe262dbd1a62aaa8a60ea2cca055d
-  data.tar.gz: 402641432dd415ff7694a3204ba2c5180910bb1f8642ce238c6374b4b2e3d930a93ea5ed4e6a04350cfa98f7c0fb5d7d5b49002022997e77e8c200ce242cfba9
+  metadata.gz: f43ae6045334b52711170355daca9fed592dbd2fbfae1600f7b2292ba97fe3945aca83beb847dbdf4fff4fcefb6a1925f332faffe2092efb792901085bb7c190
+  data.tar.gz: 7772b8d310b725a5cd328bc7d8c4494d733ff120dc2b18583e49206f3b3d4a44697d0f31e46767a93afb2f46b91bbd8dbe258400083a5feccaefa0c086f60c4c

data/.builders/.data/shapes.json

@@ -1,6 +1,70 @@
 [
+  {
+    "type": "h1",
+    "text_only": true,
+    "x": 0,
+    "y": 0,
+    "w": 100,
+    "h": 50,
+    "style_modifiers": "text;fontSize=89;fontColor=#ffffff;fontStyle=1;fillColor=none"
+  },
+  {
+    "type": "h2",
+    "text_only": true,
+    "x": 0,
+    "y": 0,
+    "w": 100,
+    "h": 50,
+    "style_modifiers": "text;fontSize=67;fontColor=#ffffff;fontStyle=1;fillColor=none"
+  },
+  {
+    "type": "h3",
+    "text_only": true,
+    "x": 0,
+    "y": 0,
+    "w": 100,
+    "h": 50,
+    "style_modifiers": "text;fontSize=50;fontColor=#ffffff;fontStyle=1;fillColor=none"
+  },
+  {
+    "type": "h4",
+    "text_only": true,
+    "x": 0,
+    "y": 0,
+    "w": 100,
+    "h": 50,
+    "style_modifiers": "text;fontSize=37;fontColor=#ffffff;fontStyle=1;fillColor=none"
+  },
+  {
+    "type": "h5",
+    "text_only": true,
+    "x": 0,
+    "y": 0,
+    "w": 100,
+    "h": 50,
+    "style_modifiers": "text;fontSize=28;fontColor=#ffffff;fontStyle=1;fillColor=none"
+  },
+  {
+    "type": "h6",
+    "text_only": true,
+    "x": 0,
+    "y": 0,
+    "w": 100,
+    "h": 50,
+    "style_modifiers": "text;fontSize=21;fontColor=#ffffff;fontStyle=1;fillColor=none"
+  },
+  {
+    "type": "p",
+    "text_only": true,
+    "x": 0,
+    "y": 0,
+    "w": 100,
+    "h": 50,
+    "style_modifiers": "text;fontSize=16;fontColor=#ffffff;fontStyle=1;fillColor=none"
+  },
   {
     "type": "actor",
+    "text_only": false,
     "x": 0,
     "y": 0,
     "w": 40,
@@ -9,6 +73,7 @@
   },
   {
     "type": "actor2",
+    "text_only": false,
     "x": 0,
     "y": 0,
     "w": 30,
@@ -17,6 +82,7 @@
   },
   {
     "type": "callout",
+    "text_only": false,
     "x": 0,
     "y": 0,
     "w": 160,
@@ -25,6 +91,7 @@
   },
   {
     "type": "callout2",
+    "text_only": false,
     "x": 0,
     "y": 0,
     "w": 160,
@@ -33,6 +100,7 @@
   },
   {
     "type": "callout3",
+    "text_only": false,
     "x": 0,
     "y": 0,
     "w": 160,
@@ -41,6 +109,7 @@
   },
   {
     "type": "callout4",
+    "text_only": false,
     "x": 0,
     "y": 0,
     "w": 160,
@@ -49,6 +118,7 @@
   },
   {
     "type": "circle",
+    "text_only": false,
     "x": 0,
     "y": 0,
     "w": 160,
@@ -57,6 +127,7 @@
   },
   {
     "type": "cloud",
+    "text_only": false,
     "x": 0,
     "y": 0,
     "w": 160,
@@ -65,6 +136,7 @@
   },
   {
     "type": "cross",
+    "text_only": false,
     "x": 0,
     "y": 0,
     "w": 50,
@@ -73,6 +145,7 @@
   },
   {
     "type": "envelop",
+    "text_only": false,
     "x": 0,
     "y": 0,
     "w": 160,
@@ -81,6 +154,7 @@
   },
   {
     "type": "diamond",
+    "text_only": false,
     "x": 0,
     "y": 0,
     "w": 100,
@@ -89,6 +163,7 @@
   },
   {
     "type": "document",
+    "text_only": false,
     "x": 0,
     "y": 0,
     "w": 160,
@@ -97,6 +172,7 @@
   },
   {
     "type": "ellipse",
+    "text_only": false,
     "x": 0,
     "y": 0,
     "w": 200,
@@ -105,6 +181,7 @@
   },
   {
     "type": "hexagon",
+    "text_only": false,
     "x": 0,
     "y": 0,
     "w": 200,
@@ -113,6 +190,7 @@
   },
   {
     "type": "container",
+    "text_only": false,
     "x": 0,
     "y": 0,
     "w": 160,
@@ -121,6 +199,7 @@
   },
   {
     "type": "container2",
+    "text_only": false,
     "x": 0,
     "y": 0,
     "w": 160,
@@ -129,6 +208,7 @@
   },
   {
     "type": "container3",
+    "text_only": false,
     "x": 0,
     "y": 0,
     "w": 160,
@@ -137,6 +217,7 @@
   },
   {
     "type": "container4",
+    "text_only": false,
     "x": 0,
     "y": 0,
     "w": 160,
@@ -145,6 +226,7 @@
   },
   {
     "type": "note",
+    "text_only": false,
     "x": 0,
     "y": 0,
     "w": 160,
@@ -153,6 +235,7 @@
   },
   {
     "type": "process",
+    "text_only": false,
     "x": 0,
     "y": 0,
     "w": 200,
@@ -161,6 +244,7 @@
   },
   {
     "type": "rectangle",
+    "text_only": false,
     "x": 0,
     "y": 0,
     "w": 200,
@@ -169,6 +253,7 @@
   },
   {
     "type": "rectangle2",
+    "text_only": false,
     "x": 0,
     "y": 0,
     "w": 200,
@@ -177,6 +262,7 @@
   },
   {
     "type": "square",
+    "text_only": false,
     "x": 0,
     "y": 0,
     "w": 160,
@@ -185,6 +271,7 @@
   },
   {
     "type": "step",
+    "text_only": false,
     "x": 0,
     "y": 0,
     "w": 120,
@@ -193,6 +280,7 @@
   },
   {
     "type": "tick",
+    "text_only": false,
     "x": 0,
     "y": 0,
     "w": 50,
@@ -201,6 +289,7 @@
   },
   {
     "type": "face",
+    "text_only": false,
     "x": 0,
     "y": 0,
     "w": 100,
@@ -209,6 +298,7 @@
   },
   {
     "type": "triangle",
+    "text_only": false,
     "x": 0,
     "y": 0,
     "w": 100,
@@ -217,6 +307,7 @@
   },
   {
     "type": "embed_row",
+    "text_only": false,
     "x": 0,
     "y": 0,
     "w": 200,
@@ -225,6 +316,7 @@
   },
   {
     "type": "embed_col50",
+    "text_only": false,
     "x": 0,
     "y": 0,
     "w": 50,
@@ -233,6 +325,7 @@
   },
   {
     "type": "embed_col200",
+    "text_only": false,
     "x": 0,
     "y": 0,
     "w": 150,

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, :x, :y, :w, :h, :style_modifiers, keyword_init: true)
+    ShapeDefaults   = Struct.new(:type, :text_only, :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, x: 0, y: 0, w: 20, h: 20, style_modifiers: ''),
+        shape: ShapeDefaults.new(type: :shape, text_only: false, x: 0, y: 0, w: 20, h: 20, style_modifiers: ''),
         {{#each shapes}}
-        {{snake ./type}}: ShapeDefaults.new(type: :{{snake ./type}}, x: {{./x}}, y: {{./y}}, w: {{./w}}, h: {{./h}}, style_modifiers: '{{{./style_modifiers}}}'){{#if @last}}{{^}},{{/if}}
+        {{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}}
         {{/each}}
       )
     end

data/.builders/.templates/basic/schema_require.rb

@@ -4,6 +4,7 @@ require_relative 'common_style'
 require_relative 'default_palette'
 require_relative 'diagram'
 require_relative 'node'
+require_relative 'node_list'
 require_relative 'page'
 
 require_relative 'layouts/layout'

data/.builders/blueprint/shapes.rb

@@ -2,45 +2,53 @@ KManager.model :shapes, namespace: %i[domain] do
   # microapp = import(:handlebars_helpers, :microapp)
 
   table :shapes do
-    fields [:type, :x, :y, :w, :h, :style_modifiers]
+    fields [:type, :text_only, :x, :y, :w, :h, :style_modifiers]
 
     # shape is a custom object
     # row :shape      , 0, 0,  20,  20, ''
 
     # configuration for general purpose shapes
-    row :actor                , 0, 0,  40,  50, 'shape=actor'
-    row :actor2               , 0, 0,  30,  50, 'shape=umlActor;verticalLabelPosition=bottom;outlineConnect=1'
-    row :callout              , 0, 0, 160, 120, 'shape=callout'
-    row :callout2             , 0, 0, 160, 160, 'shape=mxgraph.basic.oval_callout'
-    row :callout3             , 0, 0, 160, 160, 'shape=mxgraph.basic.cloud_callout'
-    row :callout4             , 0, 0, 160, 120, 'shape=mxgraph.basic.roundRectCallout;dx=30;dy=15;size=5;boundedLbl=1;'
-    row :circle               , 0, 0, 160, 160, 'ellipse'
-    row :cloud                , 0, 0, 160, 160, 'shape=cloud'
-    row :cross                , 0, 0,  50,  50, 'verticalLabelPosition=bottom;verticalAlign=top;html=1;shape=mxgraph.basic.x'
-    row :envelop              , 0, 0, 160, 100, 'shape=message'
-    row :diamond              , 0, 0, 100, 100, 'rhombus'
-    row :document             , 0, 0, 160, 160, 'shape=mxgraph.basic.document'
-    row :ellipse              , 0, 0, 200, 120, 'ellipse'
-    row :hexagon              , 0, 0, 200, 120, 'shape=hexagon'
-    row :container            , 0, 0, 160, 160, 'swimlane'
-    row :container2           , 0, 0, 160, 160, 'swimlane;horizontal=0'
-    row :container3           , 0, 0, 160, 160, 'swimlane;startSize=50'
-    row :container4           , 0, 0, 160, 160, 'swimlane;resizable=0'
-    row :note                 , 0, 0, 160, 160, 'shape=note'
-    row :process              , 0, 0, 200, 120, 'shape=process'
-    row :rectangle            , 0, 0, 200, 120, ''
-    row :rectangle2           , 0, 0, 200, 120, 'shape=mxgraph.basic.cloud_rect'
-    row :square               , 0, 0, 160, 160, ''
-    row :step                 , 0, 0, 120,  80, 'shape=step;perimeter=stepPerimeter;fixedSize=1'
-    row :tick                 , 0, 0,  50,  50, 'verticalLabelPosition=bottom;verticalAlign=top;shape=mxgraph.basic.tick'
-    row :face                 , 0, 0, 100, 100, 'verticalLabelPosition=bottom;verticalAlign=top;shape=mxgraph.basic.smiley'
-    row :triangle             , 0, 0, 100, 100, 'triangle'
+    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 :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 :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 :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 :face                 , false, 0, 0, 100, 100, 'verticalLabelPosition=bottom;verticalAlign=top;shape=mxgraph.basic.smiley'
+    row :triangle             , false, 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            , 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          , 0, 0,  50,  40, 'shape=partialRectangle;connectable=0;top=0;left=0;bottom=0;right=0;fontStyle=1;overflow=hidden'
-    row :embed_col200         , 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            , 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'
   end
 
   action do

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

@@ -17,6 +17,7 @@ KManager.action :requires do
 
         add('schema/_.rb', template_file: 'schema_require.rb', shapes: shapes)
 
+        # build source code for each shape
         shapes.each do |shape|
           add("schema/shapes/#{shape['type']}.rb",
             template_file: 'schema_shape.rb',
@@ -29,6 +30,7 @@ KManager.action :requires do
 
         cd(:spec)
 
+        # build spec for each shape
         shapes.each do |shape|
           add("schema/shapes/#{shape['type']}_spec.rb",
             template_file: 'schema_shape_spec.rb',

data/.builders/generators/project_plans/drawio_dsl.rb

@@ -0,0 +1,24 @@
+KManager.action :todo_drawio_dsl do
+  action do
+
+    # :rounded, :shadow, :sketch, :glass
+    director = DrawioDsl::Drawio
+      .init(k_builder, on_exist: :write, on_action: :execute)
+      .diagram(theme: :style_03)
+      .page('To Do', margin_left: 0, margin_top: 0, rounded: 1) do
+        grid_layout(direction: :vertical, grid_h: 120, grid_w: 400, wrap_at: 10, grid: 0)
+
+        h5(w: 400, h: 80, title: 'DrawIO DSL')
+        p(w: 400, h: 80, title: 'Project plan')
+        square(w: 300, h: 80, title: 'Enter report into system')
+        square(w: 300, h: 80, title: 'Preliminary Review')
+      end
+
+    diagram = DrawioDsl::XmlBuilder.new(director.builder.diagram)
+
+    director
+      .cd(:spec)
+      .add('project-plans/drawio_dsl.drawio', content: diagram.build)
+
+  end
+end

data/.builders/generators/sample_diagrams/50-willoughby-council.rb

@@ -4,30 +4,44 @@ KManager.action :bootstrap do
     # :rounded, :shadow, :sketch, :glass
     director = DrawioDsl::Drawio
       .init(k_builder)
-      .diagram(theme: :style_06)
+      .diagram(theme: :style_03)
       .page('Shapes', margin_left: 0, margin_top: 0, rounded: 1) do
-        grid_layout(wrap_at: 40, direction: :vertical, )
+        grid_layout(direction: :vertical, grid_h: 120, grid_w: 400, wrap_at: 10, grid: 0)
+
+        h5(w: 400, h: 80, title: 'Preparation for Investigation')
+        p(w: 400, h: 80, title: '(<b>source</b>: <i>Hunter & Central Coast Regional Environmental Management Strategy – Investigations guideline</i>)')
+        square(w: 300, h: 80, title: 'Enter report into system')
+        square(w: 300, h: 80, title: 'Preliminary Review')
+        square(w: 300, h: 80, title: 'Insufficient Information')
+        square(w: 300, h: 80, title: 'Seek Additional Information')
+        square(w: 300, h: 80, title: 'Identify Possible Breach')
+        square(w: 300, h: 80, title: 'Insufficient evidence or no breach detected')
+        square(w: 300, h: 80, title: 'Plan follow up action')
+        square(w: 300, h: 80, title: 'Establish Jurisdiction - Council or other agency?')
+        square(w: 300, h: 80, title: 'Refer to other agency')
+        square(w: 300, h: 80, title: 'Council Responsibility')
+        square(w: 300, h: 80, title: 'Plan investigation')
+        square(w: 300, h: 80, title: 'Conduct investigation Gather and manage evidence (Evidence Gathering Guideline)')
+        square(w: 300, h: 80, title: 'Prepare recommendations report')
+        square(w: 300, h: 80, title: 'Make decision')
+        square(w: 300, h: 80, title: 'Take action (Enforcement Options Guideline)')
+        square(w: 300, h: 80, title: 'Review investigation')
+        square(w: 300, h: 80, title: 'Close case')
+        square(w: 300, h: 80, title: 'Feedback to complainant')
+
+        grid_layout(wrap_at: 40, direction: :vertical, grid_w: 250, grid_h: 150, wrap_at: 5)
+
+        square(theme: :style_02, w: 240, h: 140, title: '1. Complaint received by Council gets recorded into the system.')
+        square(theme: :style_02, w: 240, h: 140, title: '2. Council Officer will review the nature of the complaint and consider what evidence or information it has.')
+        square(theme: :style_02, w: 240, h: 140, title: '3. If the information given thus far is insufficient Officer can go back to complainant and seek additional information.')
+        square(theme: :style_02, w: 240, h: 140, title: '4. With that information Council should be in a position to identify whether there has been a breach.')
+        square(theme: :style_02, w: 240, h: 140, title: '5. If there has been a breach: establish whether it&apos;s a matter for which the Council has jurisdiction (ie is it a piece of legislation for which the Council has the authority to enforce?).')
+        square(theme: :style_02, w: 240, h: 140, title: '6. If not: Council can refer that matter to another agency; such as Police, Fisheries, Transport NSW, EPA etc')
+        square(theme: :style_02, w: 240, h: 140, title: '7. If it is the Councils responsibility then Council needs to plan out the investigation. That will be through: gathering and collecting evidence through statements, observations, interviews, samples, items of interest.')
+        square(theme: :style_02, w: 240, h: 140, title: '8. The Council Officer should prepare a recommendations report which will: <br/>* go through the history of the matter <br/>* go through the investigations that have happened <br/>* go through the evidence that the Council has and then provide a recommendation as to the future action to be taken')
+        square(theme: :style_02, w: 240, h: 140, title: '9. Once the Council has that evidence and is in a position that it thinks it can MAKE A DECISION')
+        square(theme: :style_02, w: 240, h: 140, title: '10. TAKE ACTION: Once a decision is made as to the action that should happen in respect of the breach the council can then decide as to what the appropriate action is: WARNING, CIVIL, CRIMINAL and then proceed from there => it is important to keep the complainant informed throughout the entire process to be able to explain why you have taken the course you&apos;ve taken and to be able to justify it')
 
-        square(w: 300, h: 100, title: 'PREPARATION FOR INVESTIGATION ')
-        square(w: 300, h: 100, title: '(source: Hunter & Central Coast Regional Environmental Management Strategy – Investigations guideline) ')
-        square(w: 300, h: 100, title: 'Enter report into system')
-        square(w: 300, h: 100, title: 'Preliminary Review ')
-        square(w: 300, h: 100, title: 'Insufficient Information ')
-        square(w: 300, h: 100, title: 'Seek Additional Information ')
-        square(w: 300, h: 100, title: 'Identify Possible Breach ')
-        square(w: 300, h: 100, title: 'Insufficient evidence or no breach detected ')
-        square(w: 300, h: 100, title: 'Plan follow up action ')
-        square(w: 300, h: 100, title: 'Establish Jurisdiction - Council or other agency? ')
-        square(w: 300, h: 100, title: 'Refer to other agency ')
-        square(w: 300, h: 100, title: 'Council Responsibility ')
-        square(w: 300, h: 100, title: 'Plan investigation ')
-        square(w: 300, h: 100, title: 'Conduct investigation Gather and manage evidence (Evidence Gathering Guideline) ')
-        square(w: 300, h: 100, title: 'Prepare recommendations report ')
-        square(w: 300, h: 100, title: 'Make decision ')
-        square(w: 300, h: 100, title: 'Take action (Enforcement Options Guideline) ')
-        square(w: 300, h: 100, title: 'Review investigation ')
-        square(w: 300, h: 100, title: 'Close case ')
-        square(w: 300, h: 100, title: 'Feedback to complainant ')
       end
 
     diagram = DrawioDsl::XmlBuilder.new(director.builder.diagram)

data/.rubocop.yml

@@ -77,6 +77,9 @@ Metrics/MethodLength:
     - "lib/drawio_dsl/schema/shapes/page.rb"
     - "lib/drawio_dsl/configuration_shapes.rb"
     - "lib/drawio_dsl/configuration_themes.rb"
+Metrics/PerceivedComplexity:
+  Exclude:
+    - "lib/drawio_dsl/drawio_shapes.rb"
 Naming/MemoizedInstanceVariableName:
   Enabled: false
 Naming/AccessorMethodName:

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.5.2](https://github.com/klueless-io/drawio_dsl/compare/v0.5.1...v0.5.2) (2022-03-07)
+
+
+### Bug Fixes
+
+* grid_h/w added and grid_size will drive those values ([372f262](https://github.com/klueless-io/drawio_dsl/commit/372f2626cb9daf8377d184af9746631d16cc9e50))
+
 ## [0.5.1](https://github.com/klueless-io/drawio_dsl/compare/v0.5.0...v0.5.1) (2022-03-07)
 
 

data/lib/drawio_dsl/configuration_shapes.rb

@@ -5,9 +5,16 @@
 module DrawioDsl
   # Used to attach configuration to KConfig module
   module ConfigurationShapes
-    ShapeDefaults = Struct.new(:type, :x, :y, :w, :h, :style_modifiers, keyword_init: true)
+    ShapeDefaults = Struct.new(:type, :text_only, :x, :y, :w, :h, :style_modifiers, keyword_init: true)
     Shapes = Struct.new(
       :shape,
+      :h1,
+      :h2,
+      :h3,
+      :h4,
+      :h5,
+      :h6,
+      :p,
       :actor,
       :actor2,
       :callout,
@@ -43,39 +50,44 @@ module DrawioDsl
 
     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'),
-        container2: ShapeDefaults.new(type: :container2, x: 0, y: 0, w: 160, h: 160, style_modifiers: 'swimlane;horizontal=0'),
-        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'),
-        embed_row: ShapeDefaults.new(type: :embed_row, x: 0, y: 0, w: 200, h: 40,
-                                     style_modifiers: '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'),
-        embed_col50: ShapeDefaults.new(type: :embed_col50, x: 0, y: 0, w: 50, h: 40, style_modifiers: 'shape=partialRectangle;connectable=0;top=0;left=0;bottom=0;right=0;fontStyle=1;overflow=hidden'),
-        embed_col200: ShapeDefaults.new(type: :embed_col200, x: 0, y: 0, w: 150, h: 40,
-                                        style_modifiers: 'shape=partialRectangle;connectable=0;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden')
+        shape: ShapeDefaults.new(type: :shape, text_only: false, x: 0, y: 0, w: 20, h: 20, style_modifiers: ''),
+        h1: ShapeDefaults.new(type: :h1, x: 0, text_only: true, y: 0, w: 100, h: 50, style_modifiers: 'text;fontSize=89;fontColor=#ffffff;fontStyle=1;fillColor=none'),
+        h2: ShapeDefaults.new(type: :h2, x: 0, text_only: true, y: 0, w: 100, h: 50, style_modifiers: 'text;fontSize=67;fontColor=#ffffff;fontStyle=1;fillColor=none'),
+        h3: ShapeDefaults.new(type: :h3, x: 0, text_only: true, y: 0, w: 100, h: 50, style_modifiers: 'text;fontSize=50;fontColor=#ffffff;fontStyle=1;fillColor=none'),
+        h4: ShapeDefaults.new(type: :h4, x: 0, text_only: true, y: 0, w: 100, h: 50, style_modifiers: 'text;fontSize=37;fontColor=#ffffff;fontStyle=1;fillColor=none'),
+        h5: ShapeDefaults.new(type: :h5, x: 0, text_only: true, y: 0, w: 100, h: 50, style_modifiers: 'text;fontSize=28;fontColor=#ffffff;fontStyle=1;fillColor=none'),
+        h6: ShapeDefaults.new(type: :h6, x: 0, text_only: true, y: 0, w: 100, h: 50, style_modifiers: 'text;fontSize=21;fontColor=#ffffff;fontStyle=1;fillColor=none'),
+        p: ShapeDefaults.new(type: :p, x: 0, text_only: true, y: 0, w: 100, h: 50, style_modifiers: 'text;fontSize=16;fontColor=#ffffff;fontStyle=1;fillColor=none'),
+        actor: ShapeDefaults.new(type: :actor, x: 0, text_only: false, y: 0, w: 40, h: 50, style_modifiers: 'shape=actor'),
+        actor2: ShapeDefaults.new(type: :actor2, x: 0, text_only: false, y: 0, w: 30, h: 50, style_modifiers: 'shape=umlActor;verticalLabelPosition=bottom;outlineConnect=1'),
+        callout: ShapeDefaults.new(type: :callout, x: 0, text_only: false, y: 0, w: 160, h: 120, style_modifiers: 'shape=callout'),
+        callout2: ShapeDefaults.new(type: :callout2, x: 0, text_only: false, y: 0, w: 160, h: 160, style_modifiers: 'shape=mxgraph.basic.oval_callout'),
+        callout3: ShapeDefaults.new(type: :callout3, x: 0, text_only: false, y: 0, w: 160, h: 160, style_modifiers: 'shape=mxgraph.basic.cloud_callout'),
+        callout4: ShapeDefaults.new(type: :callout4, x: 0, text_only: false, 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, text_only: false, y: 0, w: 160, h: 160, style_modifiers: 'ellipse'),
+        cloud: ShapeDefaults.new(type: :cloud, x: 0, text_only: false, y: 0, w: 160, h: 160, style_modifiers: 'shape=cloud'),
+        cross: ShapeDefaults.new(type: :cross, x: 0, text_only: false, 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, text_only: false, y: 0, w: 160, h: 100, style_modifiers: 'shape=message'),
+        diamond: ShapeDefaults.new(type: :diamond, x: 0, text_only: false, y: 0, w: 100, h: 100, style_modifiers: 'rhombus'),
+        document: ShapeDefaults.new(type: :document, x: 0, text_only: false, y: 0, w: 160, h: 160, style_modifiers: 'shape=mxgraph.basic.document'),
+        ellipse: ShapeDefaults.new(type: :ellipse, x: 0, text_only: false, y: 0, w: 200, h: 120, style_modifiers: 'ellipse'),
+        hexagon: ShapeDefaults.new(type: :hexagon, x: 0, text_only: false, y: 0, w: 200, h: 120, style_modifiers: 'shape=hexagon'),
+        container: ShapeDefaults.new(type: :container, x: 0, text_only: false, y: 0, w: 160, h: 160, style_modifiers: 'swimlane'),
+        container2: ShapeDefaults.new(type: :container2, x: 0, text_only: false, y: 0, w: 160, h: 160, style_modifiers: 'swimlane;horizontal=0'),
+        container3: ShapeDefaults.new(type: :container3, x: 0, text_only: false, y: 0, w: 160, h: 160, style_modifiers: 'swimlane;startSize=50'),
+        container4: ShapeDefaults.new(type: :container4, x: 0, text_only: false, y: 0, w: 160, h: 160, style_modifiers: 'swimlane;resizable=0'),
+        note: ShapeDefaults.new(type: :note, x: 0, text_only: false, y: 0, w: 160, h: 160, style_modifiers: 'shape=note'),
+        process: ShapeDefaults.new(type: :process, x: 0, text_only: false, y: 0, w: 200, h: 120, style_modifiers: 'shape=process'),
+        rectangle: ShapeDefaults.new(type: :rectangle, x: 0, text_only: false, y: 0, w: 200, h: 120, style_modifiers: ''),
+        rectangle2: ShapeDefaults.new(type: :rectangle2, x: 0, text_only: false, y: 0, w: 200, h: 120, style_modifiers: 'shape=mxgraph.basic.cloud_rect'),
+        square: ShapeDefaults.new(type: :square, x: 0, text_only: false, y: 0, w: 160, h: 160, style_modifiers: ''),
+        step: ShapeDefaults.new(type: :step, x: 0, text_only: false, y: 0, w: 120, h: 80, style_modifiers: 'shape=step;perimeter=stepPerimeter;fixedSize=1'),
+        tick: ShapeDefaults.new(type: :tick, x: 0, text_only: false, y: 0, w: 50, h: 50, style_modifiers: 'verticalLabelPosition=bottom;verticalAlign=top;shape=mxgraph.basic.tick'),
+        face: ShapeDefaults.new(type: :face, x: 0, text_only: false, y: 0, w: 100, h: 100, style_modifiers: 'verticalLabelPosition=bottom;verticalAlign=top;shape=mxgraph.basic.smiley'),
+        triangle: ShapeDefaults.new(type: :triangle, x: 0, text_only: false, y: 0, w: 100, h: 100, style_modifiers: 'triangle'),
+        embed_row: ShapeDefaults.new(type: :embed_row, x: 0, text_only: false, y: 0, w: 200, h: 40, style_modifiers: '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'),
+        embed_col50: ShapeDefaults.new(type: :embed_col50, x: 0, text_only: false, y: 0, w: 50, h: 40, style_modifiers: 'shape=partialRectangle;connectable=0;top=0;left=0;bottom=0;right=0;fontStyle=1;overflow=hidden'),
+        embed_col200: ShapeDefaults.new(type: :embed_col200, x: 0, text_only: false, y: 0, w: 150, h: 40, style_modifiers: 'shape=partialRectangle;connectable=0;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden')
       )
     end
   end

data/lib/drawio_dsl/dom_builder_shapes.rb

@@ -4,6 +4,41 @@
 module DrawioDsl
   # DrawioDsl is a DSL for draw-io diagrams.
   module DomBuilderShapes
+    def add_h1(**opts)
+      h1 = DrawioDsl::Schema::H1.new(current_page, **opts)
+      add_shape(h1)
+    end
+
+    def add_h2(**opts)
+      h2 = DrawioDsl::Schema::H2.new(current_page, **opts)
+      add_shape(h2)
+    end
+
+    def add_h3(**opts)
+      h3 = DrawioDsl::Schema::H3.new(current_page, **opts)
+      add_shape(h3)
+    end
+
+    def add_h4(**opts)
+      h4 = DrawioDsl::Schema::H4.new(current_page, **opts)
+      add_shape(h4)
+    end
+
+    def add_h5(**opts)
+      h5 = DrawioDsl::Schema::H5.new(current_page, **opts)
+      add_shape(h5)
+    end
+
+    def add_h6(**opts)
+      h6 = DrawioDsl::Schema::H6.new(current_page, **opts)
+      add_shape(h6)
+    end
+
+    def add_p(**opts)
+      p = DrawioDsl::Schema::P.new(current_page, **opts)
+      add_shape(p)
+    end
+
     def add_actor(**opts)
       actor = DrawioDsl::Schema::Actor.new(current_page, **opts)
       add_shape(actor)

data/lib/drawio_dsl/drawio_shapes.rb

@@ -5,70 +5,112 @@ module DrawioDsl
   # :nocov:
   module DrawioShapes
     def random(**opts)
-      case rand(30)
+      case rand(37)
       when 0
-        actor(**opts)
+        h1(**opts)
       when 1
-        actor2(**opts)
+        h2(**opts)
       when 2
-        callout(**opts)
+        h3(**opts)
       when 3
-        callout2(**opts)
+        h4(**opts)
       when 4
-        callout3(**opts)
+        h5(**opts)
       when 5
-        callout4(**opts)
+        h6(**opts)
       when 6
-        circle(**opts)
+        p(**opts)
       when 7
-        cloud(**opts)
+        actor(**opts)
       when 8
-        cross(**opts)
+        actor2(**opts)
       when 9
-        envelop(**opts)
+        callout(**opts)
       when 10
-        diamond(**opts)
+        callout2(**opts)
       when 11
-        document(**opts)
+        callout3(**opts)
       when 12
-        ellipse(**opts)
+        callout4(**opts)
       when 13
-        hexagon(**opts)
+        circle(**opts)
       when 14
-        container(**opts)
+        cloud(**opts)
       when 15
-        container2(**opts)
+        cross(**opts)
       when 16
-        container3(**opts)
+        envelop(**opts)
       when 17
-        container4(**opts)
+        diamond(**opts)
       when 18
-        note(**opts)
+        document(**opts)
       when 19
-        process(**opts)
+        ellipse(**opts)
       when 20
-        rectangle(**opts)
+        hexagon(**opts)
       when 21
-        rectangle2(**opts)
+        container(**opts)
       when 22
-        square(**opts)
+        container2(**opts)
       when 23
-        step(**opts)
+        container3(**opts)
       when 24
-        tick(**opts)
+        container4(**opts)
       when 25
-        face(**opts)
+        note(**opts)
       when 26
-        triangle(**opts)
+        process(**opts)
       when 27
-        embed_row(**opts)
+        rectangle(**opts)
       when 28
-        embed_col50(**opts)
+        rectangle2(**opts)
       when 29
+        square(**opts)
+      when 30
+        step(**opts)
+      when 31
+        tick(**opts)
+      when 32
+        face(**opts)
+      when 33
+        triangle(**opts)
+      when 34
+        embed_row(**opts)
+      when 35
+        embed_col50(**opts)
+      when 36
         embed_col200(**opts)
       end
     end
 
+    def h1(**opts)
+      builder.add_h1(**opts)
+    end
+
+    def h2(**opts)
+      builder.add_h2(**opts)
+    end
+
+    def h3(**opts)
+      builder.add_h3(**opts)
+    end
+
+    def h4(**opts)
+      builder.add_h4(**opts)
+    end
+
+    def h5(**opts)
+      builder.add_h5(**opts)
+    end
+
+    def h6(**opts)
+      builder.add_h6(**opts)
+    end
+
+    def p(**opts)
+      builder.add_p(**opts)
+    end
+
     def actor(**opts)
       builder.add_actor(**opts)
     end

data/lib/drawio_dsl/schema/_.rb

@@ -12,6 +12,13 @@ require_relative 'layouts/flex_layout'
 require_relative 'layouts/grid_layout'
 
 require_relative 'shapes/shape'
+require_relative 'shapes/h1'
+require_relative 'shapes/h2'
+require_relative 'shapes/h3'
+require_relative 'shapes/h4'
+require_relative 'shapes/h5'
+require_relative 'shapes/h6'
+require_relative 'shapes/p'
 require_relative 'shapes/actor'
 require_relative 'shapes/actor2'
 require_relative 'shapes/callout'

data/lib/drawio_dsl/schema/layouts/grid_layout.rb

@@ -88,7 +88,7 @@ module DrawioDsl
 
         # Flow down to the next row
         page.position_x = anchor_x
-        page.position_y += grid_w
+        page.position_y += grid_h
         @cell_no = 1
       end
 
@@ -101,7 +101,7 @@ module DrawioDsl
 
         # Flow right to the next column
         page.position_y = anchor_y
-        page.position_x += grid_h
+        page.position_x += grid_w
         @cell_no = 1
       end
     end

data/lib/drawio_dsl/schema/node.rb

@@ -22,32 +22,37 @@ module DrawioDsl
         }
       end
 
-      #   def debug(format: :detail)
-      #     if format == :detail
-      #       debug_detail(to_h)
-      #     else
-      #       debug_row(classification, id)
-      #     end
-      #   end
+      # :nocov:
+      # rubocop:disable Metrics/AbcSize
+      def debug(format: :detail)
+        if format == :detail
+          debug_detail(to_h)
+        else
+          debug_row(classification, id)
+        end
+      end
 
-      #   def debug_detail(**key_values)
-      #     key_values.each do |key, value|
-      #       puts "#{key.to_s.ljust(15)}: #{value}"
-      #     end
-      #   end
+      def debug_detail(**key_values)
+        key_values.each do |key, value|
+          puts "#{key.to_s.ljust(15)}: #{value}"
+        end
+      end
 
-      #
-      #   def debug_row(classification, id, type = nil, x = nil, y = nil, width = nil, height = nil)
-      #     row = []
-      #     row << classification.to_s.ljust(11)
-      #     row << id.to_s.ljust(6)
-      #     row << (type.nil? ? '' : type).to_s.ljust(15)
-      #     row << (x.nil? ? '' : x).to_s.rjust(5)
-      #     row << (y.nil? ? '' : y).to_s.rjust(5)
-      #     row << (width.nil? ? '' : width).to_s.rjust(5)
-      #     row << (height.nil? ? '' : height).to_s.rjust(5)
-      #     puts row.join(' | ')
-      #   end
+      # rubocop:disable Metrics/ParameterLists
+      def debug_row(classification, id, type = nil, x = nil, y = nil, width = nil, height = nil)
+        row = []
+        row << classification.to_s.ljust(11)
+        row << id.to_s.ljust(6)
+        row << (type.nil? ? '' : type).to_s.ljust(15)
+        row << (x.nil? ? '' : x).to_s.rjust(5)
+        row << (y.nil? ? '' : y).to_s.rjust(5)
+        row << (width.nil? ? '' : width).to_s.rjust(5)
+        row << (height.nil? ? '' : height).to_s.rjust(5)
+        puts row.join(' | ')
+      end
+      # rubocop:enable Metrics/ParameterLists
+      # :nocov:
     end
+    # rubocop:enable Metrics/AbcSize
   end
 end

data/lib/drawio_dsl/schema/shapes/h1.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module DrawioDsl
+  module Schema
+    class H1 < Shape
+      configure_shape(:h1)
+    end
+  end
+end

data/lib/drawio_dsl/schema/shapes/h2.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module DrawioDsl
+  module Schema
+    class H2 < Shape
+      configure_shape(:h2)
+    end
+  end
+end

data/lib/drawio_dsl/schema/shapes/h3.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module DrawioDsl
+  module Schema
+    class H3 < Shape
+      configure_shape(:h3)
+    end
+  end
+end

data/lib/drawio_dsl/schema/shapes/h4.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module DrawioDsl
+  module Schema
+    class H4 < Shape
+      configure_shape(:h4)
+    end
+  end
+end

data/lib/drawio_dsl/schema/shapes/h5.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module DrawioDsl
+  module Schema
+    class H5 < Shape
+      configure_shape(:h5)
+    end
+  end
+end

data/lib/drawio_dsl/schema/shapes/h6.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module DrawioDsl
+  module Schema
+    class H6 < Shape
+      configure_shape(:h6)
+    end
+  end
+end

data/lib/drawio_dsl/schema/shapes/p.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module DrawioDsl
+  module Schema
+    class P < Shape
+      configure_shape(:p)
+    end
+  end
+end

data/lib/drawio_dsl/schema/shapes/shape.rb

@@ -8,7 +8,10 @@ module DrawioDsl
         attr_reader :shape_defaults
 
         def configure_shape(name)
-          raise "Shape #{name} not found in configuration" unless KConfig.configuration.drawio.shapes.members.include?(name)
+          unless KConfig.configuration.drawio.shapes.members.include?(name)
+            puts "Shape #{name} not found in configuration"
+            return
+          end
 
           config = KConfig.configuration.drawio.shapes[name]
 
@@ -35,6 +38,7 @@ module DrawioDsl
       attr_accessor :gradient
 
       attr_accessor :type
+      attr_accessor :text_only
       attr_accessor :x
       attr_accessor :y
       attr_accessor :w
@@ -66,16 +70,17 @@ module DrawioDsl
         @glass            = args[:glass]            || page.style.glass
 
         @type             = args[:type]             || shape_defaults.type
+        @text_only        = args[:text_only]        || shape_defaults.text_only
         @x                = args[:x]                || shape_defaults.x
         @y                = args[:y]                || shape_defaults.y
         @w                = args[:w]                || shape_defaults.w
         @h                = args[:h]                || shape_defaults.h
         @style_modifiers  = args[:style_modifiers]  || shape_defaults.style_modifiers
 
-        @fill_color       = args[:fill_color]       || theme_palette.fill_color
-        @stroke_color     = args[:stroke_color]     || theme_palette.stroke_color
+        @fill_color       = args[:fill_color]       || (text_only ? nil : theme_palette.fill_color)
+        @stroke_color     = args[:stroke_color]     || (text_only ? nil : theme_palette.stroke_color)
+        @gradient         = args[:gradient]         || (text_only ? nil : theme_palette.gradient)
         @font_color       = args[:font_color]       || theme_palette.font_color
-        @gradient         = args[:gradient]         || theme_palette.gradient
       end
 
       def style

data/lib/drawio_dsl/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DrawioDsl
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "drawio_dsl",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "drawio_dsl",
-      "version": "0.5.2",
+      "version": "0.5.3",
       "devDependencies": {
         "@klueless-js/semantic-release-rubygem": "github:klueless-js/semantic-release-rubygem",
         "@semantic-release/changelog": "^6.0.1",

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drawio_dsl",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "DrawIO DSL can build DrawIO diagrams using a Domain Specific Language",
   "scripts": {
     "release": "semantic-release"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drawio_dsl
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - David Cruwys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-07 00:00:00.000000000 Z
+date: 2022-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: k_config
@@ -85,6 +85,7 @@ files:
 - ".builders/boot.rb"
 - ".builders/generators/01-bootstrap.rb"
 - ".builders/generators/02-generate-app.rb"
+- ".builders/generators/project_plans/drawio_dsl.rb"
 - ".builders/generators/sample_diagrams/10-page-margin.rb"
 - ".builders/generators/sample_diagrams/15-grid-direction.rb"
 - ".builders/generators/sample_diagrams/16-grid-alignment.rb"
@@ -146,8 +147,15 @@ files:
 - lib/drawio_dsl/schema/shapes/embed_row.rb
 - lib/drawio_dsl/schema/shapes/envelop.rb
 - lib/drawio_dsl/schema/shapes/face.rb
+- lib/drawio_dsl/schema/shapes/h1.rb
+- lib/drawio_dsl/schema/shapes/h2.rb
+- lib/drawio_dsl/schema/shapes/h3.rb
+- lib/drawio_dsl/schema/shapes/h4.rb
+- lib/drawio_dsl/schema/shapes/h5.rb
+- lib/drawio_dsl/schema/shapes/h6.rb
 - lib/drawio_dsl/schema/shapes/hexagon.rb
 - lib/drawio_dsl/schema/shapes/note.rb
+- lib/drawio_dsl/schema/shapes/p.rb
 - lib/drawio_dsl/schema/shapes/process.rb
 - lib/drawio_dsl/schema/shapes/rectangle.rb
 - lib/drawio_dsl/schema/shapes/rectangle2.rb