drawio_dsl 0.8.11 → 0.9.0

data/lib/drawio_dsl/schema/elements/rectangle2.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module DrawioDsl
+  module Schema
+    class Rectangle2 < Element
+      configure_as(:rectangle2)
+    end
+  end
+end

data/lib/drawio_dsl/schema/{shapes/cloud.rb → elements/square.rb}

@@ -2,8 +2,8 @@
 
 module DrawioDsl
   module Schema
-    class Cloud < Shape
-      configure_shape(:cloud)
+    class Square < Element
+      configure_as(:square)
     end
   end
 end

data/lib/drawio_dsl/schema/elements/step.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module DrawioDsl
+  module Schema
+    class Step < Element
+      configure_as(:step)
+    end
+  end
+end

data/lib/drawio_dsl/schema/elements/tick.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module DrawioDsl
+  module Schema
+    class Tick < Element
+      configure_as(:tick)
+    end
+  end
+end

data/lib/drawio_dsl/schema/elements/todo.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module DrawioDsl
+  module Schema
+    class Todo < Element
+      configure_as(:todo)
+    end
+  end
+end

data/lib/drawio_dsl/schema/elements/triangle.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module DrawioDsl
+  module Schema
+    class Triangle < Element
+      configure_as(:triangle)
+    end
+  end
+end

data/lib/drawio_dsl/schema/line.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module DrawioDsl
+  module Schema
+    # Text represents lines, usually used for drawing a connection between two elements.
+    class Line < Shape
+      class << self
+        def configure_as(key)
+          configure_shape(key, :line)
+        end
+      end
+
+      attr_accessor :source
+      attr_accessor :target
+
+      def apply_defaults(args)
+        super(args)
+
+        @source = args[:source]
+        @target = args[:target]
+      end
+    end
+  end
+end

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

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

data/lib/drawio_dsl/schema/page.rb

@@ -79,13 +79,11 @@ module DrawioDsl
         end
 
         @palette = DrawioDsl::Schema::DefaultPalette.new(self, **args) do |page|
-          theme_palette = KConfig.configuration.drawio.palette(page.theme)
-
           # Inherit from theme when specific palette options are not specified.
-          @fill_color   ||= theme_palette.fill_color
-          @stroke_color ||= theme_palette.stroke_color
-          @font_color   ||= theme_palette.font_color
-          @gradient     ||= theme_palette.gradient
+          @fill_color   ||= page.theme_palette.fill_color
+          @stroke_color ||= page.theme_palette.stroke_color
+          @font_color   ||= page.theme_palette.element_font_color
+          @gradient     ||= page.theme_palette.gradient
         end
 
         @nodes = NodeList.new # []
@@ -101,6 +99,10 @@ module DrawioDsl
         node
       end
 
+      def theme_palette
+        @theme_palette ||= KConfig.configuration.drawio.palette(theme)
+      end
+
       def as_xml(xml)
         nodes.as_xml(xml)
       end

data/lib/drawio_dsl/schema/{shapes/shape.rb → shape.rb}

@@ -8,22 +8,23 @@ module DrawioDsl
 
       class << self
         attr_reader :shape_key
+        attr_reader :shape_category
         attr_reader :shape_defaults
 
-        def configure_shape(key)
-          unless KConfig.configuration.drawio.shapes.members.include?(key)
-            puts "Shape #{key} not found in configuration"
+        def configure_shape(key, category)
+          item_config = KConfig.configuration.drawio.get_item_by_category(key, category)
+
+          if item_config.nil?
+            puts "#{key} not found in configuration for category: #{category}"
             return
           end
 
           @shape_key = key
-          @shape_defaults = KConfig.configuration.drawio.shapes[key].clone
+          @shape_category = category
+          @shape_defaults = item_config.clone
         end
       end
 
-      configure_shape(:shape)
-
-      attr_accessor :category
       attr_accessor :theme
       attr_accessor :title
       attr_accessor :value
@@ -47,9 +48,6 @@ module DrawioDsl
       attr_accessor :h
       attr_accessor :style_modifiers
 
-      attr_accessor :source
-      attr_accessor :target
-
       def initialize(page, **args, &block)
         args[:classification] = :shape
         super(page, **args)
@@ -68,7 +66,6 @@ module DrawioDsl
       # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       def apply_defaults(args)
         @theme            = args[:theme] || page.theme # KConfig.configuration.drawio.themes.sample
-        theme_palette     = KConfig.configuration.drawio.palette(theme)
         @title            = args[:title]            || ''
 
         @white_space      = args[:white_space]      || page.style.white_space # wrap or nil
@@ -79,20 +76,11 @@ module DrawioDsl
         @glass            = args[:glass]            || page.style.glass
 
         @type             = args[:type]             || shape_defaults.type
-        @category         = args[:category]         || shape_defaults.category
         @x                = args[:x]                || shape_defaults.x
         @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
-
-        @source           = args[:source]
-        @target           = args[:target]
-
-        @fill_color       = args[:fill_color]       || (category == :text ? nil : theme_palette.fill_color)
-        @stroke_color     = args[:stroke_color]     || (category == :text ? nil : theme_palette.stroke_color)
-        @gradient         = args[:gradient]         || (category == :text ? nil : theme_palette.gradient)
-        @font_color       = args[:font_color]       || theme_palette.font_color
       end
 
       def format(type = nil)
@@ -121,8 +109,8 @@ module DrawioDsl
       def as_xml(xml)
         # log.error category
         # log.error type
-        draw_element(xml) if category == :element
-        draw_line(xml)    if category == :line
+        draw_element(xml) if is_a?(Element) || is_a?(Text)
+        draw_line(xml)    if is_a?(Line)
       end
 
       def draw_element(xml)
@@ -153,6 +141,10 @@ module DrawioDsl
         result
       end
 
+      def theme_palette
+        @theme_palette ||= KConfig.configuration.drawio.palette(theme)
+      end
+
       # :nocov:
       def debug(format: :detail)
         if format == :detail

data/lib/drawio_dsl/schema/text.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module DrawioDsl
+  module Schema
+    # Text represents text shapes such as h1, h2, p, etc.
+    class Text < Shape
+      class << self
+        def configure_as(key)
+          configure_shape(key, :text)
+        end
+      end
+
+      def apply_defaults(args)
+        super(args)
+
+        @fill_color       = args[:fill_color]
+        @stroke_color     = args[:stroke_color]
+        @gradient         = args[:gradient]
+        @font_color       = args[:font_color] || theme_palette.text_font_color
+      end
+    end
+  end
+end

data/lib/drawio_dsl/schema/{shapes → texts}/h1.rb

@@ -2,8 +2,8 @@
 
 module DrawioDsl
   module Schema
-    class H1 < Shape
-      configure_shape(:h1)
+    class H1 < Text
+      configure_as(:h1)
     end
   end
 end

data/lib/drawio_dsl/schema/{shapes → texts}/h2.rb

@@ -2,8 +2,8 @@
 
 module DrawioDsl
   module Schema
-    class H2 < Shape
-      configure_shape(:h2)
+    class H2 < Text
+      configure_as(:h2)
     end
   end
 end

data/lib/drawio_dsl/schema/{shapes → texts}/h3.rb

@@ -2,8 +2,8 @@
 
 module DrawioDsl
   module Schema
-    class H3 < Shape
-      configure_shape(:h3)
+    class H3 < Text
+      configure_as(:h3)
     end
   end
 end

data/lib/drawio_dsl/schema/{shapes → texts}/h4.rb

@@ -2,8 +2,8 @@
 
 module DrawioDsl
   module Schema
-    class H4 < Shape
-      configure_shape(:h4)
+    class H4 < Text
+      configure_as(:h4)
     end
   end
 end

data/lib/drawio_dsl/schema/{shapes → texts}/h5.rb

@@ -2,8 +2,8 @@
 
 module DrawioDsl
   module Schema
-    class H5 < Shape
-      configure_shape(:h5)
+    class H5 < Text
+      configure_as(:h5)
     end
   end
 end

data/lib/drawio_dsl/schema/{shapes → texts}/h6.rb

@@ -2,8 +2,8 @@
 
 module DrawioDsl
   module Schema
-    class H6 < Shape
-      configure_shape(:h6)
+    class H6 < Text
+      configure_as(:h6)
     end
   end
 end

data/lib/drawio_dsl/schema/{shapes → texts}/p.rb

@@ -2,8 +2,8 @@
 
 module DrawioDsl
   module Schema
-    class P < Shape
-      configure_shape(:p)
+    class P < Text
+      configure_as(:p)
     end
   end
 end

data/lib/drawio_dsl/version.rb

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

data/lib/drawio_dsl.rb

@@ -7,6 +7,13 @@ require 'k_config'
 require 'k_log'
 require 'k_director'
 
+module DrawioDsl
+  # raise DrawioDsl::Error, 'Sample message'
+  Error = Class.new(StandardError)
+
+  ROOT_PATH = File.expand_path('..', __dir__)
+end
+
 require_relative 'drawio_dsl/configuration_extension'
 require_relative 'drawio_dsl/configuration_shapes'
 require_relative 'drawio_dsl/configuration_themes'
@@ -24,15 +31,6 @@ require_relative 'drawio_dsl/drawio_extensions'
 require_relative 'drawio_dsl/drawio_page'
 require_relative 'drawio_dsl/drawio'
 
-module DrawioDsl
-  # raise DrawioDsl::Error, 'Sample message'
-  Error = Class.new(StandardError)
-
-  ROOT_PATH = File.expand_path('..', __dir__)
-
-  # Your code goes here...
-end
-
 if ENV['KLUE_DEBUG']&.to_s&.downcase == 'true'
   namespace = 'DrawioDsl::Version'
   file_path = $LOADED_FEATURES.find { |f| f.include?('drawio_dsl/version') }

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "drawio_dsl",
-  "version": "0.8.11",
+  "version": "0.9.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "drawio_dsl",
-      "version": "0.8.11",
+      "version": "0.9.0",
       "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.8.11",
+  "version": "0.9.0",
   "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.8.11
+  version: 0.9.0
 platform: ruby
 authors:
 - David Cruwys
@@ -303,57 +303,60 @@ files:
 - lib/drawio_dsl/schema/common_style.rb
 - lib/drawio_dsl/schema/default_palette.rb
 - lib/drawio_dsl/schema/diagram.rb
+- lib/drawio_dsl/schema/element.rb
+- lib/drawio_dsl/schema/elements/actor.rb
+- lib/drawio_dsl/schema/elements/actor2.rb
+- lib/drawio_dsl/schema/elements/callout.rb
+- lib/drawio_dsl/schema/elements/callout2.rb
+- lib/drawio_dsl/schema/elements/callout3.rb
+- lib/drawio_dsl/schema/elements/callout4.rb
+- lib/drawio_dsl/schema/elements/circle.rb
+- lib/drawio_dsl/schema/elements/cloud.rb
+- lib/drawio_dsl/schema/elements/container.rb
+- lib/drawio_dsl/schema/elements/container2.rb
+- lib/drawio_dsl/schema/elements/container3.rb
+- lib/drawio_dsl/schema/elements/container4.rb
+- lib/drawio_dsl/schema/elements/cross.rb
+- lib/drawio_dsl/schema/elements/database.rb
+- lib/drawio_dsl/schema/elements/db_json.rb
+- lib/drawio_dsl/schema/elements/diamond.rb
+- lib/drawio_dsl/schema/elements/document.rb
+- lib/drawio_dsl/schema/elements/ellipse.rb
+- lib/drawio_dsl/schema/elements/embed_col200.rb
+- lib/drawio_dsl/schema/elements/embed_col50.rb
+- lib/drawio_dsl/schema/elements/embed_row.rb
+- lib/drawio_dsl/schema/elements/envelop.rb
+- lib/drawio_dsl/schema/elements/face.rb
+- lib/drawio_dsl/schema/elements/group.rb
+- lib/drawio_dsl/schema/elements/hexagon.rb
+- lib/drawio_dsl/schema/elements/interface.rb
+- lib/drawio_dsl/schema/elements/klass.rb
+- lib/drawio_dsl/schema/elements/note.rb
+- lib/drawio_dsl/schema/elements/process.rb
+- lib/drawio_dsl/schema/elements/rectangle.rb
+- lib/drawio_dsl/schema/elements/rectangle2.rb
+- lib/drawio_dsl/schema/elements/square.rb
+- lib/drawio_dsl/schema/elements/step.rb
+- lib/drawio_dsl/schema/elements/tick.rb
+- lib/drawio_dsl/schema/elements/todo.rb
+- lib/drawio_dsl/schema/elements/triangle.rb
 - lib/drawio_dsl/schema/layouts/flex_layout.rb
 - 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/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/shapes/actor.rb
-- lib/drawio_dsl/schema/shapes/actor2.rb
-- lib/drawio_dsl/schema/shapes/callout.rb
-- lib/drawio_dsl/schema/shapes/callout2.rb
-- lib/drawio_dsl/schema/shapes/callout3.rb
-- lib/drawio_dsl/schema/shapes/callout4.rb
-- lib/drawio_dsl/schema/shapes/circle.rb
-- lib/drawio_dsl/schema/shapes/cloud.rb
-- lib/drawio_dsl/schema/shapes/container.rb
-- lib/drawio_dsl/schema/shapes/container2.rb
-- lib/drawio_dsl/schema/shapes/container3.rb
-- lib/drawio_dsl/schema/shapes/container4.rb
-- lib/drawio_dsl/schema/shapes/cross.rb
-- lib/drawio_dsl/schema/shapes/database.rb
-- lib/drawio_dsl/schema/shapes/db_json.rb
-- 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/group.rb
-- lib/drawio_dsl/schema/shapes/h1.rb
-- lib/drawio_dsl/schema/shapes/h2.rb
-- lib/drawio_dsl/schema/shapes/h3.rb
-- lib/drawio_dsl/schema/shapes/h4.rb
-- lib/drawio_dsl/schema/shapes/h5.rb
-- lib/drawio_dsl/schema/shapes/h6.rb
-- lib/drawio_dsl/schema/shapes/hexagon.rb
-- lib/drawio_dsl/schema/shapes/interface.rb
-- lib/drawio_dsl/schema/shapes/klass.rb
-- lib/drawio_dsl/schema/shapes/line.rb
-- lib/drawio_dsl/schema/shapes/note.rb
-- lib/drawio_dsl/schema/shapes/p.rb
-- lib/drawio_dsl/schema/shapes/process.rb
-- lib/drawio_dsl/schema/shapes/rectangle.rb
-- lib/drawio_dsl/schema/shapes/rectangle2.rb
-- lib/drawio_dsl/schema/shapes/shape.rb
-- lib/drawio_dsl/schema/shapes/square.rb
-- lib/drawio_dsl/schema/shapes/step.rb
-- lib/drawio_dsl/schema/shapes/tick.rb
-- lib/drawio_dsl/schema/shapes/todo.rb
-- lib/drawio_dsl/schema/shapes/triangle.rb
+- lib/drawio_dsl/schema/shape.rb
+- lib/drawio_dsl/schema/text.rb
+- lib/drawio_dsl/schema/texts/h1.rb
+- lib/drawio_dsl/schema/texts/h2.rb
+- lib/drawio_dsl/schema/texts/h3.rb
+- lib/drawio_dsl/schema/texts/h4.rb
+- lib/drawio_dsl/schema/texts/h5.rb
+- lib/drawio_dsl/schema/texts/h6.rb
+- lib/drawio_dsl/schema/texts/p.rb
 - lib/drawio_dsl/schema/virtual/anchor.rb
 - lib/drawio_dsl/version.rb
 - lib/drawio_dsl/xml_builder.rb

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,9 +0,0 @@
-# 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

@@ -1,9 +0,0 @@
-# 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

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