drawio_dsl 0.11.0 → 0.11.3

data/lib/drawio_dsl/configuration.rb

@@ -18,8 +18,8 @@ module DrawioDsl
       @base_style = BaseStyle.new(white_space: :wrap, html: 1, rounded: nil, shadow: nil, sketch: nil, glass: nil)
     end
 
-    def stroke(type)
-      strokes[type] || ''
+    def stroke(key)
+      strokes[key] || ''
     end
 
     def strokes
@@ -27,21 +27,21 @@ module DrawioDsl
 
       @strokes = {}
       source_config['strokes'].each do |stroke|
-        @strokes[stroke['type'].to_sym] = stroke['style']
+        @strokes[stroke['key'].to_sym] = stroke['style']
       end
 
       @strokes
     end
 
     # need test
-    def get_item_by_category(type, category)
+    def get_item_by_category(key, category)
       case category
       when :text
-        text(type)
+        text(key)
       when :line
-        line(type)
+        line(key)
       else
-        element(type)
+        element(key)
       end
     end
 
@@ -69,9 +69,9 @@ module DrawioDsl
     class Shape
       attr_reader :source_config
 
-      ElementShapeConfig = Struct.new(:type, :x, :y, :w, :h, :style_modifiers, keyword_init: true)
-      LineShapeConfig    = Struct.new(:type, :x, :y, :w, :h, :style_modifiers, keyword_init: true)
-      TextShapeConfig    = Struct.new(:type, :x, :y, :w, :h, :style_modifiers, keyword_init: true)
+      ElementShapeConfig = Struct.new(:key, :x, :y, :w, :h, :style_modifiers, keyword_init: true)
+      LineShapeConfig    = Struct.new(:key, :x, :y, :w, :h, :style_modifiers, keyword_init: true)
+      TextShapeConfig    = Struct.new(:key, :x, :y, :w, :h, :style_modifiers, keyword_init: true)
 
       def initialize(source_config)
         @source_config = source_config
@@ -79,15 +79,8 @@ module DrawioDsl
 
       # Elements
 
-      def element(type)
-        elements[type] || ElementShapeConfig.new(
-          type: :square,
-          x: 0,
-          y: 0,
-          w: 160,
-          h: 160,
-          style_modifiers: ''
-        )
+      def element(key)
+        elements[key] || default_element
       end
 
       def elements
@@ -95,8 +88,8 @@ module DrawioDsl
 
         @elements = {}
         source_config['elements'].each do |element|
-          @elements[element['type'].to_sym] = ElementShapeConfig.new(
-            type: element['type'].to_sym,
+          @elements[element['key'].to_sym] = ElementShapeConfig.new(
+            key: element['key'].to_sym,
             x: element['x'].to_i,
             y: element['y'].to_i,
             w: element['w'].to_i,
@@ -108,25 +101,29 @@ module DrawioDsl
         @elements
       end
 
-      def element_types
+      def default_element
+        @default_element ||= ElementShapeConfig.new(
+          key: :square,
+          x: 0,
+          y: 0,
+          w: 160,
+          h: 160,
+          style_modifiers: ''
+        )
+      end
+
+      def element_keys
         elements.keys
       end
 
-      def random_element_type
-        elements.values.sample.type
+      def random_element_key
+        elements.values.sample.key
       end
 
       # Lines
 
-      def line(type)
-        lines[type] || LineShapeConfig.new(
-          type: :solid,
-          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'
-        )
+      def line(key)
+        lines[key] || default_line
       end
 
       def lines
@@ -134,8 +131,8 @@ module DrawioDsl
 
         @lines = {}
         source_config['lines'].each do |line|
-          @lines[line['type'].to_sym] = LineShapeConfig.new(
-            type: line['type'].to_sym,
+          @lines[line['key'].to_sym] = LineShapeConfig.new(
+            key: line['key'].to_sym,
             x: line['x'].to_i,
             y: line['y'].to_i,
             w: line['w'].to_i,
@@ -147,23 +144,27 @@ module DrawioDsl
         @lines
       end
 
-      def line_types
+      def default_line
+        @default_line ||= LineShapeConfig.new(
+          key: :solid,
+          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'
+        )
+      end
+
+      def line_keys
         lines.keys
       end
 
-      def random_line_type
-        lines.values.sample.type
+      def random_line_key
+        lines.values.sample.key
       end
 
-      def text(type)
-        texts[type] || TextShapeConfig.new(
-          type: :p,
-          x: 0,
-          y: 0,
-          w: 100,
-          h: 50,
-          style_modifiers: 'text;fontSize=16;fontStyle=1;fillColor=none'
-        )
+      def text(key)
+        texts[key] || default_text
       end
 
       # Texts
@@ -173,8 +174,8 @@ module DrawioDsl
 
         @texts = {}
         source_config['texts'].each do |text|
-          @texts[text['type'].to_sym] = TextShapeConfig.new(
-            type: text['type'].to_sym,
+          @texts[text['key'].to_sym] = TextShapeConfig.new(
+            key: text['key'].to_sym,
             x: text['x'].to_i,
             y: text['y'].to_i,
             w: text['w'].to_i,
@@ -186,12 +187,23 @@ module DrawioDsl
         @texts
       end
 
-      def text_types
+      def default_text
+        @default_line ||= TextShapeConfig.new(
+          key: :p,
+          x: 0,
+          y: 0,
+          w: 100,
+          h: 50,
+          style_modifiers: 'text;fontSize=16;fontStyle=1;fillColor=none'
+        )
+      end
+
+      def text_keys
         texts.keys
       end
 
-      def random_text_type
-        texts.values.sample.type
+      def random_text_key
+        texts.values.sample.key
       end
     end
 
@@ -205,8 +217,8 @@ module DrawioDsl
         @source_config = source_config
       end
 
-      def compass_point(type)
-        compass_points[type] || XyConfig.new(x: 0, y: 0)
+      def compass_point(key)
+        compass_points[key] || XyConfig.new(x: 0, y: 0)
       end
 
       def compass_points
@@ -214,14 +226,14 @@ module DrawioDsl
 
         @compass_points = {}
         source_config['compass_points'].each do |compass_point|
-          @compass_points[compass_point['type'].to_sym] = XyConfig.new(x: compass_point['x'], y: compass_point['y'])
+          @compass_points[compass_point['key'].to_sym] = XyConfig.new(x: compass_point['x'], y: compass_point['y'])
         end
 
         @compass_points
       end
 
-      def waypoint(type)
-        waypoints[type] || ''
+      def waypoint(key)
+        waypoints[key] || ''
       end
 
       def waypoints
@@ -229,14 +241,14 @@ module DrawioDsl
 
         @waypoints = {}
         source_config['waypoints'].each do |waypoint|
-          @waypoints[waypoint['type'].to_sym] = waypoint['style']
+          @waypoints[waypoint['key'].to_sym] = waypoint['style']
         end
 
         @waypoints
       end
 
-      def arrow(type)
-        arrows[type] || 'open'
+      def arrow(key)
+        arrows[key] || 'open'
       end
 
       def arrows
@@ -244,14 +256,14 @@ module DrawioDsl
 
         @arrows = {}
         source_config['arrows'].each do |arrow|
-          @arrows[arrow['type'].to_sym] = arrow['style']
+          @arrows[arrow['key'].to_sym] = arrow['style']
         end
 
         @arrows
       end
 
-      def design(type)
-        designs[type] || ''
+      def design(key)
+        designs[key] || ''
       end
 
       def designs
@@ -259,7 +271,7 @@ module DrawioDsl
 
         @designs = {}
         source_config['designs'].each do |design|
-          @designs[design['type'].to_sym] = design['style']
+          @designs[design['key'].to_sym] = design['style']
         end
 
         @designs
@@ -269,16 +281,16 @@ module DrawioDsl
     class Theme
       attr_reader :source_config
 
-      BackgroundThemeConfig = Struct.new(:type, :bg_color, :font_color, :favourite, keyword_init: true)
-      ElementThemeConfig = Struct.new(:type, :fill_color, :stroke_color, :font_color, :gradient, keyword_init: true)
+      BackgroundThemeConfig = Struct.new(:key, :bg_color, :font_color, :favourite, keyword_init: true)
+      ElementThemeConfig = Struct.new(:key, :fill_color, :stroke_color, :font_color, :gradient, keyword_init: true)
 
       def initialize(source_config)
         @source_config = source_config
       end
 
-      def background(type)
-        backgrounds[type] || BackgroundThemeConfig.new(
-          type: type,
+      def background(key)
+        backgrounds[key] || BackgroundThemeConfig.new(
+          key: key,
           bg_color: '#000000',
           font_color: '#FFFFFF',
           favourite: false
@@ -290,8 +302,8 @@ module DrawioDsl
 
         @backgrounds = {}
         source_config['backgrounds'].each do |background|
-          @backgrounds[background['type'].to_sym] = BackgroundThemeConfig.new(
-            type: background['type'].to_sym,
+          @backgrounds[background['key'].to_sym] = BackgroundThemeConfig.new(
+            key: background['key'].to_sym,
             bg_color: background['bg_color'],
             font_color: background['font_color'],
             favourite: background['favourite'] == 1
@@ -301,21 +313,21 @@ module DrawioDsl
         @backgrounds
       end
 
-      def background_types
+      def background_keys
         backgrounds.keys
       end
 
-      def favourite_background_types
-        backgrounds.values.select(&:favourite).map(&:type)
+      def favourite_background_keys
+        backgrounds.values.select(&:favourite).map(&:key)
       end
 
-      def random_background_type
-        backgrounds.values.sample.type
+      def random_background_key
+        backgrounds.values.sample.key
       end
 
-      def element(type)
-        elements[type] || ElementThemeConfig.new(
-          type: type,
+      def element(key)
+        elements[key] || ElementThemeConfig.new(
+          key: key,
           fill_color: '#ffffff',
           stroke_color: '#000000',
           font_color: '#000000',
@@ -328,8 +340,8 @@ module DrawioDsl
 
         @elements = {}
         source_config['elements'].each do |element|
-          @elements[element['type'].to_sym] = ElementThemeConfig.new(
-            type: element['type'].to_sym,
+          @elements[element['key'].to_sym] = ElementThemeConfig.new(
+            key: element['key'].to_sym,
             fill_color: element['fill_color'],
             stroke_color: element['stroke_color'],
             font_color: element['font_color'],
@@ -340,12 +352,12 @@ module DrawioDsl
         @elements
       end
 
-      def element_types
+      def element_keys
         elements.keys
       end
 
-      def random_element_type
-        elements.values.sample.type
+      def random_element_key
+        elements.values.sample.key
       end
     end
   end

data/lib/drawio_dsl/dom_builder.rb

@@ -47,8 +47,8 @@ module DrawioDsl
       current_page.id = SecureRandom.alphanumeric(3) unless current_page.id
 
       # add anchor nodes
-      page_anchor = DrawioDsl::Schema::Anchor.new(self, id: "page_root_#{current_page.id}", type: :page_root)
-      node_anchor = DrawioDsl::Schema::Anchor.new(self, id: "node_root_#{current_page.id}", type: :node_root)
+      page_anchor = DrawioDsl::Schema::Anchor.new(self, id: "page_root_#{current_page.id}", key: :page_root)
+      node_anchor = DrawioDsl::Schema::Anchor.new(self, id: "node_root_#{current_page.id}", key: :node_root)
       page_anchor.add_node(node_anchor)
 
       @focus_node = node_anchor

data/lib/drawio_dsl/dom_builder_shapes.rb

@@ -10,6 +10,66 @@ module DrawioDsl
       add_shape(solid)
     end
 
+    def add_dashed(id = nil, **opts, &block)
+      opts = { id: id }.merge(opts) if id
+      dashed = DrawioDsl::Schema::Dashed.new(current_page, **opts, &block)
+      add_shape(dashed)
+    end
+
+    def add_dotted(id = nil, **opts, &block)
+      opts = { id: id }.merge(opts) if id
+      dotted = DrawioDsl::Schema::Dotted.new(current_page, **opts, &block)
+      add_shape(dotted)
+    end
+
+    def add_dash_dot(id = nil, **opts, &block)
+      opts = { id: id }.merge(opts) if id
+      dash_dot = DrawioDsl::Schema::DashDot.new(current_page, **opts, &block)
+      add_shape(dash_dot)
+    end
+
+    def add_dash_dot_dot(id = nil, **opts, &block)
+      opts = { id: id }.merge(opts) if id
+      dash_dot_dot = DrawioDsl::Schema::DashDotDot.new(current_page, **opts, &block)
+      add_shape(dash_dot_dot)
+    end
+
+    def add_dot_dot_dot(id = nil, **opts, &block)
+      opts = { id: id }.merge(opts) if id
+      dot_dot_dot = DrawioDsl::Schema::DotDotDot.new(current_page, **opts, &block)
+      add_shape(dot_dot_dot)
+    end
+
+    def add_long_dash(id = nil, **opts, &block)
+      opts = { id: id }.merge(opts) if id
+      long_dash = DrawioDsl::Schema::LongDash.new(current_page, **opts, &block)
+      add_shape(long_dash)
+    end
+
+    def add_dash_long_dash(id = nil, **opts, &block)
+      opts = { id: id }.merge(opts) if id
+      dash_long_dash = DrawioDsl::Schema::DashLongDash.new(current_page, **opts, &block)
+      add_shape(dash_long_dash)
+    end
+
+    def add_dashed24(id = nil, **opts, &block)
+      opts = { id: id }.merge(opts) if id
+      dashed24 = DrawioDsl::Schema::Dashed24.new(current_page, **opts, &block)
+      add_shape(dashed24)
+    end
+
+    def add_dashed32(id = nil, **opts, &block)
+      opts = { id: id }.merge(opts) if id
+      dashed32 = DrawioDsl::Schema::Dashed32.new(current_page, **opts, &block)
+      add_shape(dashed32)
+    end
+
+    def add_dashed44(id = nil, **opts, &block)
+      opts = { id: id }.merge(opts) if id
+      dashed44 = DrawioDsl::Schema::Dashed44.new(current_page, **opts, &block)
+      add_shape(dashed44)
+    end
+
     def add_h1(id = nil, **opts, &block)
       opts = { id: id }.merge(opts) if id
       h1 = DrawioDsl::Schema::H1.new(current_page, **opts, &block)

data/lib/drawio_dsl/drawio_shapes.rb

@@ -5,94 +5,114 @@ module DrawioDsl
   # :nocov:
   module DrawioShapes
     def random(**opts)
-      case rand(44)
+      case rand(54)
       when 0
         solid(**opts)
       when 1
-        h1(**opts)
+        dashed(**opts)
       when 2
-        h2(**opts)
+        dotted(**opts)
       when 3
-        h3(**opts)
+        dash_dot(**opts)
       when 4
-        h4(**opts)
+        dash_dot_dot(**opts)
       when 5
-        h5(**opts)
+        dot_dot_dot(**opts)
       when 6
-        h6(**opts)
+        long_dash(**opts)
       when 7
-        p(**opts)
+        dash_long_dash(**opts)
       when 8
-        actor(**opts)
+        dashed24(**opts)
       when 9
-        actor2(**opts)
+        dashed32(**opts)
       when 10
-        callout(**opts)
+        dashed44(**opts)
       when 11
-        callout2(**opts)
+        h1(**opts)
       when 12
-        callout3(**opts)
+        h2(**opts)
       when 13
-        callout4(**opts)
+        h3(**opts)
       when 14
-        circle(**opts)
+        h4(**opts)
       when 15
-        cloud(**opts)
+        h5(**opts)
       when 16
-        container(**opts)
+        h6(**opts)
       when 17
-        container2(**opts)
+        p(**opts)
       when 18
-        container3(**opts)
+        actor(**opts)
       when 19
-        container4(**opts)
+        actor2(**opts)
       when 20
-        cross(**opts)
+        callout(**opts)
       when 21
-        envelop(**opts)
+        callout2(**opts)
       when 22
-        database(**opts)
+        callout3(**opts)
       when 23
-        db_json(**opts)
+        callout4(**opts)
       when 24
-        diamond(**opts)
+        circle(**opts)
       when 25
-        document(**opts)
+        cloud(**opts)
       when 26
-        ellipse(**opts)
+        container(**opts)
       when 27
-        group(**opts)
+        container2(**opts)
       when 28
-        hexagon(**opts)
+        container3(**opts)
       when 29
-        interface(**opts)
+        container4(**opts)
       when 30
-        klass(**opts)
+        cross(**opts)
       when 31
-        note(**opts)
+        envelop(**opts)
       when 32
-        process(**opts)
+        database(**opts)
       when 33
-        rectangle(**opts)
+        db_json(**opts)
       when 34
-        rectangle2(**opts)
+        diamond(**opts)
       when 35
-        square(**opts)
+        document(**opts)
       when 36
-        step(**opts)
+        ellipse(**opts)
       when 37
-        tick(**opts)
+        group(**opts)
       when 38
-        todo(**opts)
+        hexagon(**opts)
       when 39
-        face(**opts)
+        interface(**opts)
       when 40
-        triangle(**opts)
+        klass(**opts)
       when 41
-        embed_row(**opts)
+        note(**opts)
       when 42
-        embed_col50(**opts)
+        process(**opts)
       when 43
+        rectangle(**opts)
+      when 44
+        rectangle2(**opts)
+      when 45
+        square(**opts)
+      when 46
+        step(**opts)
+      when 47
+        tick(**opts)
+      when 48
+        todo(**opts)
+      when 49
+        face(**opts)
+      when 50
+        triangle(**opts)
+      when 51
+        embed_row(**opts)
+      when 52
+        embed_col50(**opts)
+      when 53
         embed_col200(**opts)
       end
     end
@@ -101,6 +121,46 @@ module DrawioDsl
       builder.add_solid(id, **opts, &block)
     end
 
+    def dashed(id = nil, **opts, &block)
+      builder.add_dashed(id, **opts, &block)
+    end
+
+    def dotted(id = nil, **opts, &block)
+      builder.add_dotted(id, **opts, &block)
+    end
+
+    def dash_dot(id = nil, **opts, &block)
+      builder.add_dash_dot(id, **opts, &block)
+    end
+
+    def dash_dot_dot(id = nil, **opts, &block)
+      builder.add_dash_dot_dot(id, **opts, &block)
+    end
+
+    def dot_dot_dot(id = nil, **opts, &block)
+      builder.add_dot_dot_dot(id, **opts, &block)
+    end
+
+    def long_dash(id = nil, **opts, &block)
+      builder.add_long_dash(id, **opts, &block)
+    end
+
+    def dash_long_dash(id = nil, **opts, &block)
+      builder.add_dash_long_dash(id, **opts, &block)
+    end
+
+    def dashed24(id = nil, **opts, &block)
+      builder.add_dashed24(id, **opts, &block)
+    end
+
+    def dashed32(id = nil, **opts, &block)
+      builder.add_dashed32(id, **opts, &block)
+    end
+
+    def dashed44(id = nil, **opts, &block)
+      builder.add_dashed44(id, **opts, &block)
+    end
+
     def h1(id = nil, **opts, &block)
       builder.add_h1(id, **opts, &block)
     end

data/lib/drawio_dsl/schema/_.rb

@@ -56,6 +56,16 @@ require_relative 'elements/embed_col200'
 
 # Connector lines
 require_relative 'lines/solid'
+require_relative 'lines/dashed'
+require_relative 'lines/dotted'
+require_relative 'lines/dash_dot'
+require_relative 'lines/dash_dot_dot'
+require_relative 'lines/dot_dot_dot'
+require_relative 'lines/long_dash'
+require_relative 'lines/dash_long_dash'
+require_relative 'lines/dashed24'
+require_relative 'lines/dashed32'
+require_relative 'lines/dashed44'
 
 # Text elements such as h1, h2, p, etc.
 require_relative 'texts/h1'

data/lib/drawio_dsl/schema/diagram.rb

@@ -15,7 +15,7 @@ module DrawioDsl
       def initialize(**args)
         @host     = args[:host]     || SecureRandom.alphanumeric(3)
         # TODO: assess and resolve this inconsistency
-        @theme    = args[:theme]    || KConfig.configuration.drawio.theme.random_background_type
+        @theme    = args[:theme]    || KConfig.configuration.drawio.theme.random_background_key
         @bg_theme = args[:bg_theme] || :not_set
 
         @style = DrawioDsl::Schema::CommonStyle.new(**args) do

data/lib/drawio_dsl/schema/element.rb

@@ -18,6 +18,10 @@ module DrawioDsl
         @gradient         = args[:gradient]         || theme_palette.gradient
         @font_color       = args[:font_color]       || theme_palette.font_color
       end
+
+      def default_configuration
+        KConfig.configuration.drawio.shape.default_element
+      end
     end
   end
 end