drawio_dsl 0.11.0 → 0.11.3

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

@@ -15,7 +15,7 @@ module DrawioDsl
         @gap = args[:gap] || 20
         @perpendicular_max = 0
 
-        super(page, **args.merge(type: :flex_layout))
+        super(page, **args.merge(key: :flex_layout))
       end
 
       def position_shape(shape)

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

@@ -24,7 +24,7 @@ module DrawioDsl
         @v_align    = args[:v_align]    || :center
         @cell_no    = 1
 
-        super(page, **args.merge(type: :grid_layout))
+        super(page, **args.merge(key: :grid_layout))
       end
       # rubocop:enable Metrics/CyclomaticComplexity
 

data/lib/drawio_dsl/schema/line.rb

@@ -5,19 +5,40 @@ module DrawioDsl
     # Text represents lines, usually used for drawing a connection between two elements.
     class Line < Shape
       class << self
-        def configure_as(key)
+        attr_reader :default_stroke
+
+        def configure_as(key, stroke: nil)
           configure_shape(key, :line)
+          @default_stroke = stroke
         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 :stroke
 
       def apply_defaults(args)
         super(args)
 
-        @source = args[:source]
-        @target = args[:target]
+        @source           = args[:source]
+        @target           = args[:target]
+        @c1               = args[:c1]               || :nw
+        @c2               = args[:c2]               || :ne
+        @stroke           = args[:stroke]           || self.class.default_stroke
+        @fill_color       = args[:fill_color]       || theme_palette.fill_color
+        @stroke_color     = args[:stroke_color]     || theme_palette.stroke_color
+      end
+
+      def default_configuration
+        KConfig.configuration.drawio.shape.default_line
+      end
+
+      def base_modifiers
+        return @base_modifiers if defined? @base_modifiers
+
+        @base_modifiers = KConfig.configuration.drawio.stroke(stroke)
       end
     end
   end

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

data/lib/drawio_dsl/schema/node.rb

@@ -9,7 +9,7 @@ module DrawioDsl
       attr_accessor :page
       attr_accessor :parent
       attr_accessor :classification
-      attr_accessor :type
+      attr_accessor :key
       attr_accessor :nodes
 
       def initialize(page, **args)
@@ -17,7 +17,7 @@ module DrawioDsl
         @id = args[:id]
         @parent = args[:parent]
         @classification = args[:classification] || :unknown
-        @type = args[:type] || :unknown
+        @key = args[:key] || :unknown
         @nodes = NodeList.new
       end
 
@@ -26,7 +26,7 @@ module DrawioDsl
           id: id,
           parent_id: parent&.id,
           classification: classification,
-          type: type
+          key: key
         }
         result[:nodes] = nodes.to_h if nodes.any?
         result
@@ -58,11 +58,11 @@ module DrawioDsl
       end
 
       # rubocop:disable Metrics/ParameterLists
-      def debug_row(classification, id, type = nil, x = nil, y = nil, width = nil, height = nil)
+      def debug_row(classification, id, key = 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 << (key.nil? ? '' : key).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)

data/lib/drawio_dsl/schema/shape.rb

@@ -60,7 +60,7 @@ module DrawioDsl
       end
 
       def shape_defaults
-        @shape_defaults ||= self.class.shape_defaults.clone
+        @shape_defaults ||= self.class.shape_defaults || default_configuration
       end
 
       # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
@@ -75,7 +75,7 @@ module DrawioDsl
         @sketch           = args[:sketch]           || page.style.sketch
         @glass            = args[:glass]            || page.style.glass
 
-        @type             = args[:type]             || shape_defaults.type
+        @key              = args[:key]              || shape_defaults.key
         @x                = args[:x]                || shape_defaults.x
         @y                = args[:y]                || shape_defaults.y
         @w                = args[:w]                || shape_defaults.w
@@ -83,9 +83,9 @@ module DrawioDsl
         @style_modifiers  = args[:style_modifiers]  || shape_defaults.style_modifiers
       end
 
-      def format(type = nil)
-        type ||= self.class.shape_key
-        format_instance(type)
+      def format(key = nil)
+        key ||= self.class.shape_key
+        format_instance(key)
       end
 
       def style
@@ -100,6 +100,7 @@ module DrawioDsl
         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(';')
@@ -108,7 +109,7 @@ module DrawioDsl
 
       def as_xml(xml)
         # log.error category
-        # log.error type
+        # log.error key
         draw_element(xml) if is_a?(Element) || is_a?(Text)
         draw_line(xml)    if is_a?(Line)
       end
@@ -130,7 +131,7 @@ module DrawioDsl
           id: id,
           parent_id: parent&.id,
           classification: classification,
-          type: type,
+          key: key,
           x: x,
           y: y,
           w: w,
@@ -141,6 +142,10 @@ module DrawioDsl
         result
       end
 
+      def base_modifiers
+        @base_modifiers ||= ''
+      end
+
       def theme_palette
         @theme_palette ||= KConfig.configuration.drawio.theme.element(theme)
       end
@@ -153,9 +158,9 @@ module DrawioDsl
       # :nocov:
       def debug(format: :detail)
         if format == :detail
-          debug_detail({ id: id, classification: classification, type: type })
+          debug_detail({ id: id, classification: classification, key: key })
         else
-          debug_row(classification, id, type, x, y, w, h)
+          debug_row(classification, id, key, x, y, w, h)
         end
       end
       # :nocov:

data/lib/drawio_dsl/schema/text.rb

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

data/lib/drawio_dsl/version.rb

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

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "drawio_dsl",
-  "version": "0.11.0",
+  "version": "0.11.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "drawio_dsl",
-      "version": "0.11.0",
+      "version": "0.11.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.11.0",
+  "version": "0.11.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.11.0
+  version: 0.11.3
 platform: ruby
 authors:
 - David Cruwys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-25 00:00:00.000000000 Z
+date: 2022-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: k_config
@@ -257,6 +257,7 @@ files:
 - docs/printspeak-architecture-controllers.drawio
 - docs/printspeak-architecture-generator-custom.drawio
 - docs/printspeak-architecture-generator-custom.png
+- docs/printspeak-architecture-generator.drawio
 - docs/printspeak-architecture-generator.svg
 - docs/project-plan.md
 - docs/project-plan/project.drawio
@@ -279,6 +280,9 @@ files:
 - docs/samples/themes-random.svg
 - docs/samples/themes-square.svg
 - docs/samples/willoughby-council.svg
+- docs/tailwind_domain_model-custom.drawio
+- docs/tailwind_domain_model.json
+- docs/tailwind_domain_model.svg
 - lib/drawio_dsl.rb
 - lib/drawio_dsl/configuration.rb
 - lib/drawio_dsl/configuration_extension.rb
@@ -343,6 +347,16 @@ 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_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_dot_dot.rb
+- lib/drawio_dsl/schema/lines/dotted.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