drawio_dsl 0.11.3 → 0.11.6

data/lib/drawio_dsl/drawio_shapes.rb

@@ -5,13 +5,13 @@ module DrawioDsl
   # :nocov:
   module DrawioShapes
     def random(**opts)
-      case rand(54)
+      case rand(57)
       when 0
         solid(**opts)
       when 1
-        dashed(**opts)
+        dash(**opts)
       when 2
-        dotted(**opts)
+        dot(**opts)
       when 3
         dash_dot(**opts)
       when 4
@@ -23,96 +23,102 @@ module DrawioDsl
       when 7
         dash_long_dash(**opts)
       when 8
-        dashed24(**opts)
+        dash24(**opts)
       when 9
-        dashed32(**opts)
+        dash32(**opts)
       when 10
-        dashed44(**opts)
+        dash44(**opts)
       when 11
-        h1(**opts)
+        double(**opts)
       when 12
-        h2(**opts)
+        double_dash(**opts)
       when 13
-        h3(**opts)
+        double_dot(**opts)
       when 14
-        h4(**opts)
+        h1(**opts)
       when 15
-        h5(**opts)
+        h2(**opts)
       when 16
-        h6(**opts)
+        h3(**opts)
       when 17
-        p(**opts)
+        h4(**opts)
       when 18
-        actor(**opts)
+        h5(**opts)
       when 19
-        actor2(**opts)
+        h6(**opts)
       when 20
-        callout(**opts)
+        p(**opts)
       when 21
-        callout2(**opts)
+        actor(**opts)
       when 22
-        callout3(**opts)
+        actor2(**opts)
       when 23
-        callout4(**opts)
+        callout(**opts)
       when 24
-        circle(**opts)
+        callout2(**opts)
       when 25
-        cloud(**opts)
+        callout3(**opts)
       when 26
-        container(**opts)
+        callout4(**opts)
       when 27
-        container2(**opts)
+        circle(**opts)
       when 28
-        container3(**opts)
+        cloud(**opts)
       when 29
-        container4(**opts)
+        container(**opts)
       when 30
-        cross(**opts)
+        container2(**opts)
       when 31
-        envelop(**opts)
+        container3(**opts)
       when 32
-        database(**opts)
+        container4(**opts)
       when 33
-        db_json(**opts)
+        cross(**opts)
       when 34
-        diamond(**opts)
+        envelop(**opts)
       when 35
-        document(**opts)
+        database(**opts)
       when 36
-        ellipse(**opts)
+        db_json(**opts)
       when 37
-        group(**opts)
+        diamond(**opts)
       when 38
-        hexagon(**opts)
+        document(**opts)
       when 39
-        interface(**opts)
+        ellipse(**opts)
       when 40
-        klass(**opts)
+        group(**opts)
       when 41
-        note(**opts)
+        hexagon(**opts)
       when 42
-        process(**opts)
+        interface(**opts)
       when 43
-        rectangle(**opts)
+        klass(**opts)
       when 44
-        rectangle2(**opts)
+        note(**opts)
       when 45
-        square(**opts)
+        process(**opts)
       when 46
-        step(**opts)
+        rectangle(**opts)
       when 47
-        tick(**opts)
+        rectangle2(**opts)
       when 48
-        todo(**opts)
+        square(**opts)
       when 49
-        face(**opts)
+        step(**opts)
       when 50
-        triangle(**opts)
+        tick(**opts)
       when 51
-        embed_row(**opts)
+        todo(**opts)
       when 52
-        embed_col50(**opts)
+        face(**opts)
       when 53
+        triangle(**opts)
+      when 54
+        embed_row(**opts)
+      when 55
+        embed_col50(**opts)
+      when 56
         embed_col200(**opts)
       end
     end
@@ -121,12 +127,12 @@ module DrawioDsl
       builder.add_solid(id, **opts, &block)
     end
 
-    def dashed(id = nil, **opts, &block)
-      builder.add_dashed(id, **opts, &block)
+    def dash(id = nil, **opts, &block)
+      builder.add_dash(id, **opts, &block)
     end
 
-    def dotted(id = nil, **opts, &block)
-      builder.add_dotted(id, **opts, &block)
+    def dot(id = nil, **opts, &block)
+      builder.add_dot(id, **opts, &block)
     end
 
     def dash_dot(id = nil, **opts, &block)
@@ -149,16 +155,28 @@ module DrawioDsl
       builder.add_dash_long_dash(id, **opts, &block)
     end
 
-    def dashed24(id = nil, **opts, &block)
-      builder.add_dashed24(id, **opts, &block)
+    def dash24(id = nil, **opts, &block)
+      builder.add_dash24(id, **opts, &block)
+    end
+
+    def dash32(id = nil, **opts, &block)
+      builder.add_dash32(id, **opts, &block)
+    end
+
+    def dash44(id = nil, **opts, &block)
+      builder.add_dash44(id, **opts, &block)
+    end
+
+    def double(id = nil, **opts, &block)
+      builder.add_double(id, **opts, &block)
     end
 
-    def dashed32(id = nil, **opts, &block)
-      builder.add_dashed32(id, **opts, &block)
+    def double_dash(id = nil, **opts, &block)
+      builder.add_double_dash(id, **opts, &block)
     end
 
-    def dashed44(id = nil, **opts, &block)
-      builder.add_dashed44(id, **opts, &block)
+    def double_dot(id = nil, **opts, &block)
+      builder.add_double_dot(id, **opts, &block)
     end
 
     def h1(id = nil, **opts, &block)

data/lib/drawio_dsl/schema/_.rb

@@ -11,6 +11,7 @@ require_relative 'layouts/layout'
 require_relative 'layouts/flex_layout'
 require_relative 'layouts/grid_layout'
 
+require_relative 'style_builder'
 require_relative 'shape'
 require_relative 'element'
 require_relative 'line'
@@ -56,16 +57,19 @@ require_relative 'elements/embed_col200'
 
 # Connector lines
 require_relative 'lines/solid'
-require_relative 'lines/dashed'
-require_relative 'lines/dotted'
+require_relative 'lines/dash'
+require_relative 'lines/dot'
 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'
+require_relative 'lines/dash24'
+require_relative 'lines/dash32'
+require_relative 'lines/dash44'
+require_relative 'lines/double'
+require_relative 'lines/double_dash'
+require_relative 'lines/double_dot'
 
 # Text elements such as h1, h2, p, etc.
 require_relative 'texts/h1'

data/lib/drawio_dsl/schema/diagram.rb

@@ -14,9 +14,8 @@ module DrawioDsl
       # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       def initialize(**args)
         @host     = args[:host]     || SecureRandom.alphanumeric(3)
-        # TODO: assess and resolve this inconsistency
-        @theme    = args[:theme]    || KConfig.configuration.drawio.theme.random_background_key
-        @bg_theme = args[:bg_theme] || :not_set
+        @theme    = args[:theme]    || :style_02
+        @bg_theme = args[:bg_theme] || :snow
 
         @style = DrawioDsl::Schema::CommonStyle.new(**args) do
           default_style = KConfig.configuration.drawio.base_style

data/lib/drawio_dsl/schema/line.rb

@@ -6,27 +6,40 @@ module DrawioDsl
     class Line < Shape
       class << self
         attr_reader :default_stroke
+        attr_reader :default_design
+        attr_reader :default_waypoint
 
-        def configure_as(key, stroke: nil)
+        def configure_as(key, stroke: nil, design: nil, waypoint: :straight)
           configure_shape(key, :line)
+
           @default_stroke = stroke
+          @default_design = design
+          @default_waypoint = waypoint
         end
       end
 
       attr_accessor :source
       attr_accessor :target
-      attr_accessor :c1       # compass_point1 = :n, :ne, :e, :se, :s, :sw, :w, :nw
-      attr_accessor :c2       # compass_point2 = :n, :ne, :e, :se, :s, :sw, :w, :nw
+      attr_accessor :exit_point         # compass_point1 = :n, :ne, :e, :se, :s, :sw, :w, :nw
+      attr_accessor :entry_point        # compass_point2 = :n, :ne, :e, :se, :s, :sw, :w, :nw
+      attr_accessor :start_arrow
+      attr_accessor :end_arrow
       attr_accessor :stroke
+      attr_accessor :design
+      attr_accessor :waypoint
 
       def apply_defaults(args)
         super(args)
 
         @source           = args[:source]
         @target           = args[:target]
-        @c1               = args[:c1]               || :nw
-        @c2               = args[:c2]               || :ne
+        @exit_point       = args[:exit_point]       || args[:start_point] || :nw
+        @entry_point      = args[:entry_point]      || args[:end_point] || :ne
+        @start_arrow      = args[:start_arrow]      || :none
+        @end_arrow        = args[:end_arrow]        || :simple
         @stroke           = args[:stroke]           || self.class.default_stroke
+        @design           = args[:design]           || self.class.default_design
+        @waypoint         = args[:waypoint]         || self.class.default_waypoint || :straight
         @fill_color       = args[:fill_color]       || theme_palette.fill_color
         @stroke_color     = args[:stroke_color]     || theme_palette.stroke_color
       end
@@ -35,10 +48,16 @@ module DrawioDsl
         KConfig.configuration.drawio.shape.default_line
       end
 
-      def base_modifiers
-        return @base_modifiers if defined? @base_modifiers
+      def add_base_modifiers
+        cfg = KConfig.configuration.drawio
 
-        @base_modifiers = KConfig.configuration.drawio.stroke(stroke)
+        @style_builder.add(cfg.stroke(stroke))
+        @style_builder.add(cfg.connector.waypoint(waypoint))
+        @style_builder.add(cfg.connector.design(design))
+        @style_builder.add(cfg.connector.compass_point(exit_point).exit_modifiers)
+        @style_builder.add(cfg.connector.compass_point(entry_point).entry_modifiers)
+        @style_builder.add(cfg.connector.arrow(start_arrow).start_modifiers)
+        @style_builder.add(cfg.connector.arrow(end_arrow).end_modifiers)
       end
     end
   end

data/lib/drawio_dsl/schema/lines/{dashed.rb → dash.rb}

@@ -2,8 +2,8 @@
 
 module DrawioDsl
   module Schema
-    class Dashed < Line
-      configure_as(:dashed, stroke: :dashed)
+    class Dash < Line
+      configure_as(:dash, stroke: :dash)
     end
   end
 end

data/lib/drawio_dsl/schema/lines/{dotted.rb → dash24.rb}

@@ -2,8 +2,8 @@
 
 module DrawioDsl
   module Schema
-    class Dotted < Line
-      configure_as(:dotted, stroke: :dotted)
+    class Dash24 < Line
+      configure_as(:dash24, stroke: :dash24)
     end
   end
 end

data/lib/drawio_dsl/schema/lines/{dashed32.rb → dash32.rb}

@@ -2,8 +2,8 @@
 
 module DrawioDsl
   module Schema
-    class Dashed32 < Line
-      configure_as(:dashed32, stroke: :dashed32)
+    class Dash32 < Line
+      configure_as(:dash32, stroke: :dash32)
     end
   end
 end

data/lib/drawio_dsl/schema/lines/{dashed44.rb → dash44.rb}

@@ -2,8 +2,8 @@
 
 module DrawioDsl
   module Schema
-    class Dashed44 < Line
-      configure_as(:dashed44, stroke: :dashed44)
+    class Dash44 < Line
+      configure_as(:dash44, stroke: :dash44)
     end
   end
 end

data/lib/drawio_dsl/schema/lines/dot.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module DrawioDsl
+  module Schema
+    class Dot < Line
+      configure_as(:dot, stroke: :dot)
+    end
+  end
+end

data/lib/drawio_dsl/schema/lines/double.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module DrawioDsl
+  module Schema
+    class Double < Line
+      configure_as(:double, design: :double)
+    end
+  end
+end

data/lib/drawio_dsl/schema/lines/double_dash.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module DrawioDsl
+  module Schema
+    class DoubleDash < Line
+      configure_as(:double_dash, stroke: :dash, design: :double)
+    end
+  end
+end

data/lib/drawio_dsl/schema/lines/double_dot.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module DrawioDsl
+  module Schema
+    class DoubleDot < Line
+      configure_as(:double_dot, stroke: :dot, design: :double)
+    end
+  end
+end

data/lib/drawio_dsl/schema/shape.rb

@@ -52,6 +52,8 @@ module DrawioDsl
         args[:classification] = :shape
         super(page, **args)
 
+        @style_builder = DrawioDsl::Schema::StyleBuilder.new
+
         apply_defaults(args)
 
         instance_eval(&block) if block_given?
@@ -80,7 +82,7 @@ module DrawioDsl
         @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
+        @style_modifiers  = args[:style_modifiers]  || shape_defaults.style_modifiers || ''
       end
 
       def format(key = nil)
@@ -89,21 +91,40 @@ module DrawioDsl
       end
 
       def style
-        key_values = []
-        key_values << "whiteSpace=#{white_space}"         if white_space
-        key_values << "html=#{html}"                      if html
-        key_values << "rounded=#{rounded}"                if rounded
-        key_values << "shadow=#{shadow}"                  if shadow
-        key_values << "sketch=#{sketch}"                  if sketch
-        key_values << "glass=#{glass}"                    if glass
-        key_values << "fillColor=#{fill_color}"           if fill_color
-        key_values << "strokeColor=#{stroke_color}"       if stroke_color
-        key_values << "fontColor=#{font_color}"           if font_color
-        key_values << "gradient=#{gradient}"              if gradient
-        key_values << base_modifiers unless base_modifiers.empty?
-        key_values << style_modifiers unless style_modifiers.empty?
-
-        key_values.join(';')
+        return @style if defined? @style
+
+        # key_values = []
+        # key_values << "whiteSpace=#{white_space}"         if white_space
+        # key_values << "html=#{html}"                      if html
+        # key_values << "rounded=#{rounded}"                if rounded
+        # key_values << "shadow=#{shadow}"                  if shadow
+        # key_values << "sketch=#{sketch}"                  if sketch
+        # key_values << "glass=#{glass}"                    if glass
+        # key_values << "fillColor=#{fill_color}"           if fill_color
+        # key_values << "strokeColor=#{stroke_color}"       if stroke_color
+        # key_values << "fontColor=#{font_color}"           if font_color
+        # key_values << "gradient=#{gradient}"              if gradient
+
+        add_base_modifiers
+
+        @style_builder.add_kv('whiteSpace', white_space)      if white_space
+        @style_builder.add_kv('html', html)                   if html
+        @style_builder.add_kv('rounded', rounded)             if rounded
+        @style_builder.add_kv('shadow', shadow)               if shadow
+        @style_builder.add_kv('sketch', sketch)               if sketch
+        @style_builder.add_kv('glass', glass)                 if glass
+        @style_builder.add_kv('fillColor', fill_color)        if fill_color
+        @style_builder.add_kv('strokeColor', stroke_color)    if stroke_color
+        @style_builder.add_kv('fontColor', font_color)        if font_color
+        @style_builder.add_kv('gradient', gradient)           if gradient
+        @style_builder.add(style_modifiers)
+
+        # key_values << base_modifiers unless base_modifiers.empty?
+        # key_values << style_modifiers unless style_modifiers.empty?
+        # @style_builder.add(style_modifiers) unless style_modifiers.empty?
+
+        # key_values.join(';')
+        @style = @style_builder.style
       end
       # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
@@ -142,9 +163,7 @@ module DrawioDsl
         result
       end
 
-      def base_modifiers
-        @base_modifiers ||= ''
-      end
+      def add_base_modifiers; end
 
       def theme_palette
         @theme_palette ||= KConfig.configuration.drawio.theme.element(theme)

data/lib/drawio_dsl/schema/style_builder.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+module DrawioDsl
+  module Schema
+    # Build the style attribute for shape elements
+    #
+    # Requirements:
+    #   Need to be able to take a string and break it up into style parts
+    #   A style part is usually a lowerCamel equals value pair (e.g. fontSize=12)
+    #   but sometimes it is just a singular value, (e.g. ellipse)
+    #   A string may also contain more then one style part separated by semi-colons
+    #   e.g. overflow=fill;fontSize=12;fontFamily=Helvetica
+    #
+    #   The purpose of this class is to build a style attribute with unique values and
+    #   to take inputs from either single key/value pairs or string following the
+    #   pattern previously described.
+    class StyleBuilder
+      def initialize
+        @style_parts = []
+      end
+
+      def add(value)
+        return if value.nil?
+
+        if value.is_a?(Symbol)
+          set(value)
+          return
+        end
+
+        value.split(';') do |v|
+          kv = v.to_s.split('=')
+
+          if kv.length == 1
+            set(v.to_s)
+          else
+            set_kv(kv[0], kv[1])
+          end
+        end
+      end
+
+      def add_kv(key, value)
+        key = camel_case_lower(key) if key.is_a?(Symbol)
+
+        set_kv(key, value)
+      end
+
+      def style
+        @style_parts.join(';')
+      end
+
+      # def style_attribute
+      #   style_value = style
+      #   style_value.empty? ? nil : " style=\"#{style_value}\""
+      # end
+
+      private
+
+      def camel_case_lower(key)
+        key.to_s.split('_').inject([]) { |buffer, e| buffer.push(buffer.empty? ? e : e.capitalize) }.join
+      end
+
+      def set(value)
+        value = value.to_s.strip
+        index = @style_parts.index { |part| part == value }
+
+        @style_parts << value if index.nil?
+      end
+
+      def set_kv(key, value)
+        key = key.to_s.strip
+        value = value.to_s.strip
+        index = @style_parts.index { |part| part.start_with?("#{key}=") }
+
+        if index.nil?
+          @style_parts << "#{key}=#{value}"
+        else
+          @style_parts[index] = "#{key}=#{value}"
+        end
+      end
+    end
+  end
+end

data/lib/drawio_dsl/version.rb

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

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "drawio_dsl",
-  "version": "0.11.3",
+  "version": "0.11.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "drawio_dsl",
-      "version": "0.11.3",
+      "version": "0.11.6",
       "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.11.3",
+  "version": "0.11.6",
   "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.11.3
+  version: 0.11.6
 platform: ruby
 authors:
 - David Cruwys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-28 00:00:00.000000000 Z
+date: 2022-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: k_config
@@ -347,21 +347,25 @@ files:
 - lib/drawio_dsl/schema/layouts/grid_layout.rb
 - lib/drawio_dsl/schema/layouts/layout.rb
 - lib/drawio_dsl/schema/line.rb
+- lib/drawio_dsl/schema/lines/dash.rb
+- lib/drawio_dsl/schema/lines/dash24.rb
+- lib/drawio_dsl/schema/lines/dash32.rb
+- lib/drawio_dsl/schema/lines/dash44.rb
 - lib/drawio_dsl/schema/lines/dash_dot.rb
 - lib/drawio_dsl/schema/lines/dash_dot_dot.rb
 - lib/drawio_dsl/schema/lines/dash_long_dash.rb
-- lib/drawio_dsl/schema/lines/dashed.rb
-- lib/drawio_dsl/schema/lines/dashed24.rb
-- lib/drawio_dsl/schema/lines/dashed32.rb
-- lib/drawio_dsl/schema/lines/dashed44.rb
+- lib/drawio_dsl/schema/lines/dot.rb
 - lib/drawio_dsl/schema/lines/dot_dot_dot.rb
-- lib/drawio_dsl/schema/lines/dotted.rb
+- lib/drawio_dsl/schema/lines/double.rb
+- lib/drawio_dsl/schema/lines/double_dash.rb
+- lib/drawio_dsl/schema/lines/double_dot.rb
 - lib/drawio_dsl/schema/lines/long_dash.rb
 - lib/drawio_dsl/schema/lines/solid.rb
 - lib/drawio_dsl/schema/node.rb
 - lib/drawio_dsl/schema/node_list.rb
 - lib/drawio_dsl/schema/page.rb
 - lib/drawio_dsl/schema/shape.rb
+- lib/drawio_dsl/schema/style_builder.rb
 - lib/drawio_dsl/schema/text.rb
 - lib/drawio_dsl/schema/texts/h1.rb
 - lib/drawio_dsl/schema/texts/h2.rb