drawio_dsl 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4aa443955a1eee7a093fed153b72fc161aa0cacb953634b724c0a192e310105a
-  data.tar.gz: 1b85607fd8162acda612b0450ea6e088a4a9c72daf58583e10ee8e2199be3bfc
+  metadata.gz: b70dcf329c6e2ea402a192100ee60e2e54fb64fbe156a888f3ebcf7dc5bdfb1c
+  data.tar.gz: a6dab38bcfb52d4ab389558adccc212c59919132572c85e445355bad83a120bf
 SHA512:
-  metadata.gz: 7a735f763e86a650b9972d7161170c5d931491eb8ad326feae8dd0fa214a77111004a1e072f6e413131e1ac47f68b1e12979a88dbaf4c7ec12e445807d8e5649
-  data.tar.gz: fbd5b56939bf9c688ea8db05ce0132180b6cfbcfb0ff1314772feeb926462c32643495245e652de6e95bfca6c702188f205960512e3c1b82a6851de9a069058f
+  metadata.gz: 340f738bda37bebbc9b6694bc17d0ff5f93479d9b18ce82bdd3434c945cc5c1ccb064fffb1880734cac8fa861bde6f3ce706a1766487903bbc90c7e860577fba
+  data.tar.gz: 903aeb17c451ddc9171dcffb8eb7497c3610dcd65b79a73d376cdf6b9a753a2475b162b667dddb6253fa54849250a85cae0b69d2ee8c922ed1a97ceaf787206e

data/.builders/.data/shapes.json

@@ -41,7 +41,182 @@
       "style": "dashed=1;fixDash=1;dashPattern=8 8"
     }
   ],
+  "connector": {
+    "compass": [
+      {
+        "name": "n",
+        "x": 0.5,
+        "y": 0
+      },
+      {
+        "name": "ne",
+        "x": 1,
+        "y": 0
+      },
+      {
+        "name": "e",
+        "x": 1,
+        "y": 0.5
+      },
+      {
+        "name": "se",
+        "x": 1,
+        "y": 1
+      },
+      {
+        "name": "s",
+        "x": 0.5,
+        "y": 1
+      },
+      {
+        "name": "sw",
+        "x": 0,
+        "y": 1
+      },
+      {
+        "name": "w",
+        "x": 0,
+        "y": 0.5
+      },
+      {
+        "name": "nw",
+        "x": 0,
+        "y": 0
+      }
+    ],
+    "waypoints": [
+      {
+        "name": "straight",
+        "style": "edgeStyle=none"
+      },
+      {
+        "name": "orthogonal",
+        "style": "edgeStyle=orthogonalEdgeStyle"
+      },
+      {
+        "name": "elbow",
+        "style": "edgeStyle=elbowEdgeStyle"
+      },
+      {
+        "name": "elbow_vertical",
+        "style": "edgeStyle=elbowEdgeStyle;elbow=vertical"
+      },
+      {
+        "name": "isometric",
+        "style": "edgeStyle=isometricEdgeStyle"
+      },
+      {
+        "name": "isometric_vertical",
+        "style": "edgeStyle=isometricEdgeStyle;elbow=vertical"
+      },
+      {
+        "name": "orthogonal_curved",
+        "style": "edgeStyle=orthogonalEdgeStyle;curved=1"
+      },
+      {
+        "name": "entity_relation",
+        "style": "edgeStyle=entityRelationEdgeStyle"
+      }
+    ],
+    "arrows": [
+      {
+        "name": "simple",
+        "style": "open"
+      },
+      {
+        "name": "triangle",
+        "style": "block"
+      },
+      {
+        "name": "diamond",
+        "style": "diamond"
+      },
+      {
+        "name": "circle",
+        "style": "oval"
+      },
+      {
+        "name": "cross",
+        "style": "cross"
+      },
+      {
+        "name": "short",
+        "style": "classicThin"
+      },
+      {
+        "name": "default",
+        "style": "classic"
+      },
+      {
+        "name": "none",
+        "style": "none"
+      },
+      {
+        "name": "plain",
+        "style": "open"
+      },
+      {
+        "name": "skewed_dash",
+        "style": "dash"
+      },
+      {
+        "name": "concave",
+        "style": "openThin"
+      },
+      {
+        "name": "er_many",
+        "style": "ERmany"
+      },
+      {
+        "name": "er_one",
+        "style": "ERone"
+      },
+      {
+        "name": "er_one_optional",
+        "style": "ERzeroToOne"
+      },
+      {
+        "name": "er_one_mandatory",
+        "style": "ERmandOne"
+      },
+      {
+        "name": "er_many_optional",
+        "style": "ERzeroToMany"
+      },
+      {
+        "name": "er_many_mandatory",
+        "style": "ERoneToMany"
+      }
+    ],
+    "design": [
+      {
+        "name": "style1",
+        "style": ""
+      },
+      {
+        "name": "style2",
+        "style": "shape=link"
+      },
+      {
+        "name": "style3",
+        "style": "shape=flexArrow"
+      },
+      {
+        "name": "style4",
+        "style": "shape=arrow"
+      }
+    ]
+  },
   "shapes": [
+    {
+      "type": "line",
+      "category": "line",
+      "x": 0,
+      "y": 0,
+      "w": 50,
+      "h": 50,
+      "style_modifiers": "edgeStyle=none;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0"
+    },
     {
       "type": "h1",
       "category": "text",
@@ -375,15 +550,6 @@
       "h": 100,
       "style_modifiers": "triangle"
     },
-    {
-      "type": "line",
-      "category": "line",
-      "x": 0,
-      "y": 0,
-      "w": 50,
-      "h": 50,
-      "style_modifiers": "edgeStyle=entityRelationEdgeStyle;strokeWidth=1;elbow=vertical;startArrow=none;startFill=0;endArrow=block;endFill=0;targetPerimeterSpacing=0;shape=flexArrow;endSize=6;fillStyle=zigzag;"
-    },
     {
       "type": "embed_row",
       "category": "element",

data/.builders/blueprint/shapes.rb

@@ -1,6 +1,14 @@
 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]
 
@@ -16,12 +24,83 @@ m = KManager.model :shapes, namespace: %i[domain] do
     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, :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                   , :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'
@@ -62,9 +141,6 @@ m = KManager.model :shapes, namespace: %i[domain] do
     row :face                 , :element, 0, 0, 100, 100, 'verticalLabelPosition=bottom;verticalAlign=top;shape=mxgraph.basic.smiley'
     row :triangle             , :element, 0, 0, 100, 100, 'triangle'
 
-    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;'
-    # edge="1" parent="node_root_2T8" source="b" target="c"
-
     # configuration for embedded element shape
     # note that the width / height probably should be driven of parent shape
     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'
@@ -76,7 +152,13 @@ m = KManager.model :shapes, namespace: %i[domain] do
     data = self.raw_data
     content = {
       strokes: data['strokes'],
-      shapes: data['shapes']
+      connector: {
+        compass: data['connector_compass'],
+        waypoints: data['connector_waypoints'],
+        arrows: data['connector_arrows'],
+        design: data['connector_design']
+      },
+      shapes: data['shapes'],
     }
 
     k_builder

data/.builders/generators/project-plan.rb

@@ -10,11 +10,12 @@ KManager.action :project_plan 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: 'refactor the shape->text_only (boolean) to category (symbol)')
-        todo(title: 'build configuration for line strokes (eg. dashed, dotted)')
+        
+        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
 
@@ -29,7 +30,7 @@ KManager.action :project_plan do
         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')
@@ -45,6 +46,11 @@ KManager.action :project_plan 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')

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

@@ -5,15 +5,25 @@ KManager.action :bootstrap do
       .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_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 = ''
 
-        square(:a, title: '01')
-        circle(:b, title: '02')
-        rectangle(:c, title: '03')
-        ellipse(:d, title: '04')
       end
       .cd(:spec)
-      .osave('.samples/35-ids-and-arrows.drawio')
+      .save('.samples/35-ids-and-arrows.drawio')
       # .cd(:docs)
       # .export_svg('samples/styles-plain', page: 1)
   end

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [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)