drawio_dsl 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4cd7150000e0bd48916f7c5605f1da32d91d5fa20cb221253a9acbaa8538e06
-  data.tar.gz: 84355154d1847979120f71315f9cd1b9f79965e652184255bb849e24e6c54832
+  metadata.gz: e5d0f74df30a578aa511a4d9a7ba497839667f25c33d30cb70ec97c42254ec57
+  data.tar.gz: bab21fd8a4c2e2db844e3bf1cba63b6e224778fbe94a029ddaba9fd6fad71539
 SHA512:
-  metadata.gz: b36ecdb34dcbcd5efc9309671650526590a98c41d7f7fb762349c401cd977284d33346ef8517b3dde60f827013f85b088dd839560e0d03b7c9dda1384e0816fa
-  data.tar.gz: 58eacb1d2c4eee64d09380cc9e1c9c7c9c9e6b105377494df083c3a1895d70e78b92a8309caeb7582e706e09c72f51625aa1fec852522c4b48af34d2fef88817
+  metadata.gz: c1b8da217e0876c4720cf087080ed0d66a332eaecb469ab51548b52f95f923943ea57c1fb2405499456be030ce8144d74667f8ff120a7df7d674b4f138c11945
+  data.tar.gz: 1bf29a42082f521cf04f51cd882bb0f664589f076add43d956ccf636f1c24f57c260bf46721bb4f18b8bf87acb9ed487b0ac77d5fd35d482b9dbd71853f875af

data/.builders/.data/shapes.json

@@ -117,7 +117,7 @@
     "y": 0,
     "w": 160,
     "h": 160,
-    "style_modifiers": "swimlane;horizontal=0"
+    "style_modifiers": "swimlane"
   },
   {
     "type": "container2",
@@ -125,7 +125,7 @@
     "y": 0,
     "w": 160,
     "h": 160,
-    "style_modifiers": "swimlane"
+    "style_modifiers": "swimlane;horizontal=0"
   },
   {
     "type": "container3",
@@ -214,5 +214,29 @@
     "w": 100,
     "h": 100,
     "style_modifiers": "triangle"
+  },
+  {
+    "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"
+  },
+  {
+    "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"
+  },
+  {
+    "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"
   }
 ]

data/.builders/blueprint/shapes.rb

@@ -7,34 +7,40 @@ KManager.model :shapes, namespace: %i[domain] do
     # shape is a custom object
     # row :shape      , 0, 0,  20,  20, ''
 
-    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;horizontal=0'
-    row :container2   , 0, 0, 160, 160, 'swimlane'
-    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'
+    # 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'
 
+    # 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'
   end
 
   action do

data/.rubocop.yml

@@ -41,6 +41,8 @@ Layout/LineLength:
   # Ignores annotate output
   IgnoredPatterns: ['\A# \*\*']
   IgnoreCopDirectives: true
+  Exclude:
+    - "lib/drawio_dsl/configuration_shapes.rb"
 
 Lint/UnusedMethodArgument:
   AllowUnusedKeywordArguments: true

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# [0.5.0](https://github.com/klueless-io/drawio_dsl/compare/v0.4.1...v0.5.0) (2022-03-07)
+
+
+### Features
+
+* add new and update older shapes ([64a0d83](https://github.com/klueless-io/drawio_dsl/commit/64a0d83dda6181183c0980914b7b2ee1520b84e6))
+* final code generation in place for shapes ([ac4ed3c](https://github.com/klueless-io/drawio_dsl/commit/ac4ed3cace4e1794d38306e14d3cee60529add4b))
+* final code generation in place for shapes ([4c2a6fb](https://github.com/klueless-io/drawio_dsl/commit/4c2a6fb376fe61cfd44a699677f7781c9e2b215c))
+
 ## [0.4.1](https://github.com/klueless-io/drawio_dsl/compare/v0.4.0...v0.4.1) (2022-03-06)
 
 

data/lib/drawio_dsl/configuration_shapes.rb

@@ -35,6 +35,9 @@ module DrawioDsl
       :tick,
       :face,
       :triangle,
+      :embed_row,
+      :embed_col50,
+      :embed_col200,
       keyword_init: true
     )
 
@@ -55,8 +58,8 @@ module DrawioDsl
         document: ShapeDefaults.new(type: :document, x: 0, y: 0, w: 160, h: 160, style_modifiers: 'shape=mxgraph.basic.document'),
         ellipse: ShapeDefaults.new(type: :ellipse, x: 0, y: 0, w: 200, h: 120, style_modifiers: 'ellipse'),
         hexagon: ShapeDefaults.new(type: :hexagon, x: 0, y: 0, w: 200, h: 120, style_modifiers: 'shape=hexagon'),
-        container: ShapeDefaults.new(type: :container, x: 0, y: 0, w: 160, h: 160, style_modifiers: 'swimlane;horizontal=0'),
-        container2: ShapeDefaults.new(type: :container2, x: 0, y: 0, w: 160, h: 160, style_modifiers: 'swimlane'),
+        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'),
@@ -67,7 +70,12 @@ module DrawioDsl
         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')
+        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')
       )
     end
   end

data/lib/drawio_dsl/dom_builder.rb

@@ -54,20 +54,20 @@ module DrawioDsl
 
     def add_grid_layout(**opts)
       rule = DrawioDsl::Schema::GridLayout.new(current_page, **opts)
-      add_layout_rule(rule)
+      add_layout(rule)
     end
 
     def add_flex_layout(**opts)
       rule = DrawioDsl::Schema::FlexLayout.new(current_page, **opts)
-      add_layout_rule(rule)
+      add_layout(rule)
     end
 
-    def add_layout_rule(rule)
+    def add_layout(rule)
       @current_layout_rule = rule
 
       rule.id = "rule-#{current_page.nodes.length + 1}" unless rule.id
 
-      current_page.nodes << rule
+      current_page.nodes.add(rule)
 
       rule
     end
@@ -81,7 +81,7 @@ module DrawioDsl
 
       shape.id = "#{current_page.id}-#{current_page.nodes.length + 1}" unless shape.id
 
-      current_page.nodes << shape
+      current_page.nodes.add(shape)
 
       shape
     end

data/lib/drawio_dsl/dom_builder_shapes.rb

@@ -138,6 +138,21 @@ module DrawioDsl
       triangle = DrawioDsl::Schema::Triangle.new(current_page, **opts)
       add_shape(triangle)
     end
+
+    def add_embed_row(**opts)
+      embed_row = DrawioDsl::Schema::EmbedRow.new(current_page, **opts)
+      add_shape(embed_row)
+    end
+
+    def add_embed_col50(**opts)
+      embed_col50 = DrawioDsl::Schema::EmbedCol50.new(current_page, **opts)
+      add_shape(embed_col50)
+    end
+
+    def add_embed_col200(**opts)
+      embed_col200 = DrawioDsl::Schema::EmbedCol200.new(current_page, **opts)
+      add_shape(embed_col200)
+    end
   end
 end
 # :nocov:

data/lib/drawio_dsl/drawio_shapes.rb

@@ -5,7 +5,7 @@ module DrawioDsl
   # :nocov:
   module DrawioShapes
     def random(**opts)
-      case rand(27)
+      case rand(30)
       when 0
         actor(**opts)
       when 1
@@ -60,6 +60,12 @@ module DrawioDsl
         face(**opts)
       when 26
         triangle(**opts)
+      when 27
+        embed_row(**opts)
+      when 28
+        embed_col50(**opts)
+      when 29
+        embed_col200(**opts)
       end
     end
 
@@ -170,6 +176,18 @@ module DrawioDsl
     def triangle(**opts)
       builder.add_triangle(**opts)
     end
+
+    def embed_row(**opts)
+      builder.add_embed_row(**opts)
+    end
+
+    def embed_col50(**opts)
+      builder.add_embed_col50(**opts)
+    end
+
+    def embed_col200(**opts)
+      builder.add_embed_col200(**opts)
+    end
   end
   # :nocov:
 end

data/lib/drawio_dsl/layout_engine.rb

@@ -14,22 +14,15 @@ module DrawioDsl
     attr_reader :current_page
     attr_reader :current_layout
 
-    # attr_reader :page_margin_top
-    # attr_reader :page_margin_left
-    # attr_reader :x
-    # attr_reader :y
-
     def initialize(page)
       @page = page
-      # @x = 0
-      # @y = 0
     end
 
     def call
       page.position_x = page.margin_left
       page.position_y = page.margin_top
 
-      page.nodes.each do |node|
+      page.nodes.all.each do |node|
         case node.classification
         when :layout_rule
           @current_layout = node

data/lib/drawio_dsl/schema/_.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'
@@ -38,3 +39,6 @@ require_relative 'shapes/step'
 require_relative 'shapes/tick'
 require_relative 'shapes/face'
 require_relative 'shapes/triangle'
+require_relative 'shapes/embed_row'
+require_relative 'shapes/embed_col50'
+require_relative 'shapes/embed_col200'

data/lib/drawio_dsl/schema/node_list.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module DrawioDsl
+  module Schema
+    class NodeList
+      attr_reader :nodes
+
+      def initialize
+        @nodes = []
+      end
+
+      def add(node)
+        @nodes << node
+      end
+
+      def all
+        @nodes
+      end
+
+      def shapes
+        @nodes.select { |node| node.is_a?(DrawioDsl::Schema::Shape) }
+      end
+
+      def layouts
+        @nodes.select { |node| node.is_a?(DrawioDsl::Schema::Layout) }
+      end
+
+      def length
+        @nodes.length
+      end
+
+      def to_h
+        @nodes.map(&:to_h)
+      end
+    end
+  end
+end

data/lib/drawio_dsl/schema/page.rb

@@ -86,13 +86,13 @@ module DrawioDsl
           @gradient     ||= theme_palette.gradient
         end
 
-        @nodes = args[:nodes] || []
+        @nodes = NodeList.new # []
       end
       # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/MethodLength
 
-      def shapes
-        @nodes.select { |node| node.is_a?(DrawioDsl::Schema::Shape) }
-      end
+      # def shapes
+      #   nodes.shapes
+      # end
 
       def to_h
         {
@@ -104,7 +104,7 @@ module DrawioDsl
           palette: palette.to_h,
           style: style.to_h,
           settings: settings,
-          nodes: nodes.map(&:to_h)
+          nodes: nodes.to_h
         }
       end
 

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

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

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

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

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

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

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

@@ -96,6 +96,12 @@ module DrawioDsl
       end
       # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
+      def as_xml(xml)
+        xml.mxCell(id: id, value: title, style: style, vertex: 1, parent: "#{page.id}-B") do
+          xml.mxGeometry(x: x, y: y, width: w, height: h, as: 'geometry')
+        end
+      end
+
       def to_h
         {
           id: id,

data/lib/drawio_dsl/version.rb

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

data/lib/drawio_dsl/xml_builder.rb

@@ -52,23 +52,13 @@ module DrawioDsl
           xml.root do
             xml.mxCell(id: "#{page.id}-A")
             xml.mxCell(id: "#{page.id}-B", parent: "#{page.id}-A")
-            page.nodes.each do |node|
-              build_shape(xml, node) if node.classification == :shape
+            page.nodes.all.each do |node|
+              node.as_xml(xml) if node.classification == :shape
             end
           end
         end
       end
     end
     # rubocop:enable  Metrics/MethodLength, Metrics/AbcSize, Metrics/BlockLength
-
-    def build_shape(xml, shape)
-      # puts "opts: #{opts}"
-      # puts shape.x
-      # puts shape.y
-
-      xml.mxCell(id: shape.id, value: shape.title, style: shape.style, vertex: 1, parent: "#{shape.page.id}-B") do
-        xml.mxGeometry(x: shape.x, y: shape.y, width: shape.w, height: shape.h, as: 'geometry')
-      end
-    end
   end
 end

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "drawio_dsl",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "drawio_dsl",
-      "version": "0.5.0",
+      "version": "0.5.1",
       "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.0",
+  "version": "0.5.1",
   "description": "DrawIO DSL can build DrawIO diagrams using a Domain Specific Language",
   "scripts": {
     "release": "semantic-release"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drawio_dsl
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - David Cruwys
@@ -122,6 +122,7 @@ files:
 - lib/drawio_dsl/schema/layouts/grid_layout.rb
 - lib/drawio_dsl/schema/layouts/layout.rb
 - lib/drawio_dsl/schema/node.rb
+- lib/drawio_dsl/schema/node_list.rb
 - lib/drawio_dsl/schema/page.rb
 - lib/drawio_dsl/schema/shapes/actor.rb
 - lib/drawio_dsl/schema/shapes/actor2.rb
@@ -139,6 +140,9 @@ files:
 - lib/drawio_dsl/schema/shapes/diamond.rb
 - lib/drawio_dsl/schema/shapes/document.rb
 - lib/drawio_dsl/schema/shapes/ellipse.rb
+- lib/drawio_dsl/schema/shapes/embed_col200.rb
+- lib/drawio_dsl/schema/shapes/embed_col50.rb
+- 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/hexagon.rb