drawio_dsl 0.9.0 → 0.10.0

data/lib/drawio_dsl/configuration.rb

@@ -5,14 +5,13 @@ module DrawioDsl
   # Configuration container for the DrawIO DSL
   class Configuration
     include DrawioDsl::ConfigurationShapes
-    include DrawioDsl::ConfigurationThemes
 
     include KLog::Logging
 
-    BaseStyle = Struct.new(:white_space, :html, :rounded, :shadow, :sketch, :glass, keyword_init: true)
+    BaseStyle     = Struct.new(:white_space, :html, :rounded, :shadow, :sketch, :glass, keyword_init: true)
     ElementConfig = Struct.new(:type, :x, :y, :w, :h, :style_modifiers, keyword_init: true)
-    LineConfig = Struct.new(:type, :x, :y, :w, :h, :style_modifiers, keyword_init: true)
-    TextConfig = Struct.new(:type, :x, :y, :w, :h, :style_modifiers, keyword_init: true)
+    LineConfig    = Struct.new(:type, :x, :y, :w, :h, :style_modifiers, keyword_init: true)
+    TextConfig    = Struct.new(:type, :x, :y, :w, :h, :style_modifiers, keyword_init: true)
 
     attr_accessor :base_style
 
@@ -21,16 +20,8 @@ module DrawioDsl
     def initialize
       @base_style = BaseStyle.new(white_space: :wrap, html: 1, rounded: nil, shadow: nil, sketch: nil, glass: nil)
 
+      # TODO: these need to be removed
       add_shapes
-      add_themes
-    end
-
-    def palette(theme)
-      themes[theme]
-    end
-
-    def random_theme
-      themes.keys.sample
     end
 
     def stroke(type)
@@ -130,6 +121,10 @@ module DrawioDsl
       @connector ||= Connector.new(source_config['connector'])
     end
 
+    def theme
+      @theme ||= Theme.new(source_config['theme'])
+    end
+
     def source_config
       return @source_config if defined? @source_config
 
@@ -209,6 +204,83 @@ module DrawioDsl
         @designs
       end
     end
+
+    class Theme
+      attr_reader :source_config
+
+      BackgroundThemeConfig = Struct.new(:type, :bg_color, :font_color, keyword_init: true)
+      ElementThemeConfig = Struct.new(:type, :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,
+          bg_color: '#000000',
+          font_color: '#ffffff'
+        )
+      end
+
+      def backgrounds
+        return @backgrounds if defined? @backgrounds
+
+        @backgrounds = {}
+        source_config['backgrounds'].each do |background|
+          @backgrounds[background['type'].to_sym] = BackgroundThemeConfig.new(
+            type: background['type'].to_sym,
+            bg_color: background['bg_color'],
+            font_color: background['font_color']
+          )
+        end
+
+        @backgrounds
+      end
+
+      def background_types
+        backgrounds.keys
+      end
+
+      def random_background_type
+        backgrounds.values.sample.type
+      end
+
+      def element(type)
+        elements[type] || ElementThemeConfig.new(
+          type: type,
+          fill_color: '#ffffff',
+          stroke_color: '#000000',
+          font_color: '#000000',
+          gradient: nil
+        )
+      end
+
+      def elements
+        return @elements if defined? @elements
+
+        @elements = {}
+        source_config['elements'].each do |element|
+          @elements[element['type'].to_sym] = ElementThemeConfig.new(
+            type: element['type'].to_sym,
+            fill_color: element['fill_color'],
+            stroke_color: element['stroke_color'],
+            font_color: element['font_color'],
+            gradient: element['gradient']
+          )
+        end
+
+        @elements
+      end
+
+      def element_types
+        elements.keys
+      end
+
+      def random_element_type
+        elements.values.sample.type
+      end
+    end
   end
 end
 

data/lib/drawio_dsl/configuration_shapes.rb

@@ -59,13 +59,13 @@ module DrawioDsl
       @shapes = Shapes.new(
         shape: ShapeDefaults.new(type: :shape, category: :element, x: 0, y: 0, w: 20, h: 20, style_modifiers: ''),
         solid: ShapeDefaults.new(type: :solid, x: 0, category: :line, 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'),
-        h1: ShapeDefaults.new(type: :h1, x: 0, category: :text, y: 0, w: 100, h: 50, style_modifiers: 'text;fontSize=89;fontColor=#ffffff;fontStyle=1;fillColor=none'),
-        h2: ShapeDefaults.new(type: :h2, x: 0, category: :text, y: 0, w: 100, h: 50, style_modifiers: 'text;fontSize=67;fontColor=#ffffff;fontStyle=1;fillColor=none'),
-        h3: ShapeDefaults.new(type: :h3, x: 0, category: :text, y: 0, w: 100, h: 50, style_modifiers: 'text;fontSize=50;fontColor=#ffffff;fontStyle=1;fillColor=none'),
-        h4: ShapeDefaults.new(type: :h4, x: 0, category: :text, y: 0, w: 100, h: 50, style_modifiers: 'text;fontSize=37;fontColor=#ffffff;fontStyle=1;fillColor=none'),
-        h5: ShapeDefaults.new(type: :h5, x: 0, category: :text, y: 0, w: 100, h: 50, style_modifiers: 'text;fontSize=28;fontColor=#ffffff;fontStyle=1;fillColor=none'),
-        h6: ShapeDefaults.new(type: :h6, x: 0, category: :text, y: 0, w: 100, h: 50, style_modifiers: 'text;fontSize=21;fontColor=#ffffff;fontStyle=1;fillColor=none'),
-        p: ShapeDefaults.new(type: :p, x: 0, category: :text, y: 0, w: 100, h: 50, style_modifiers: 'text;fontSize=16;fontColor=#ffffff;fontStyle=1;fillColor=none'),
+        h1: ShapeDefaults.new(type: :h1, x: 0, category: :text, y: 0, w: 100, h: 50, style_modifiers: 'text;fontSize=89;fontStyle=1;fillColor=none'),
+        h2: ShapeDefaults.new(type: :h2, x: 0, category: :text, y: 0, w: 100, h: 50, style_modifiers: 'text;fontSize=67;fontStyle=1;fillColor=none'),
+        h3: ShapeDefaults.new(type: :h3, x: 0, category: :text, y: 0, w: 100, h: 50, style_modifiers: 'text;fontSize=50;fontStyle=1;fillColor=none'),
+        h4: ShapeDefaults.new(type: :h4, x: 0, category: :text, y: 0, w: 100, h: 50, style_modifiers: 'text;fontSize=37;fontStyle=1;fillColor=none'),
+        h5: ShapeDefaults.new(type: :h5, x: 0, category: :text, y: 0, w: 100, h: 50, style_modifiers: 'text;fontSize=28;fontStyle=1;fillColor=none'),
+        h6: ShapeDefaults.new(type: :h6, x: 0, category: :text, y: 0, w: 100, h: 50, style_modifiers: 'text;fontSize=21;fontStyle=1;fillColor=none'),
+        p: ShapeDefaults.new(type: :p, x: 0, category: :text, y: 0, w: 100, h: 50, style_modifiers: 'text;fontSize=16;fontStyle=1;fillColor=none'),
         actor: ShapeDefaults.new(type: :actor, x: 0, category: :element, y: 0, w: 40, h: 50, style_modifiers: 'shape=actor'),
         actor2: ShapeDefaults.new(type: :actor2, x: 0, category: :element, y: 0, w: 30, h: 50, style_modifiers: 'shape=umlActor;verticalLabelPosition=bottom;outlineConnect=1'),
         callout: ShapeDefaults.new(type: :callout, x: 0, category: :element, y: 0, w: 160, h: 120, style_modifiers: 'shape=callout'),

data/lib/drawio_dsl/schema/diagram.rb

@@ -6,16 +6,17 @@ module DrawioDsl
     class Diagram
       attr_accessor :host
       attr_accessor :theme
+      attr_accessor :bg_theme
       attr_accessor :style
       attr_accessor :palette
       attr_accessor :pages
 
       # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       def initialize(**args)
-        @host = args[:host]   || SecureRandom.alphanumeric(3)
-
-        # Apply a random theme to the diagram if none is specified.
-        @theme = args[:theme] || KConfig.configuration.drawio.random_theme
+        @host     = args[:host]     || SecureRandom.alphanumeric(3)
+        # TODO: assess and resolve this inconsistency
+        @theme    = args[:theme]    || KConfig.configuration.drawio.theme.random_background_type
+        @bg_theme = args[:bg_theme] || :not_set
 
         @style = DrawioDsl::Schema::CommonStyle.new(**args) do
           default_style = KConfig.configuration.drawio.base_style
@@ -30,19 +31,24 @@ module DrawioDsl
         end
 
         @palette = DrawioDsl::Schema::DefaultPalette.new(self, **args) do |diagram|
-          theme_palette = KConfig.configuration.drawio.palette(diagram.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.element_font_color
-          @gradient     ||= theme_palette.gradient
+          @fill_color   ||= diagram.theme_palette.fill_color
+          @stroke_color ||= diagram.theme_palette.stroke_color
+          @font_color   ||= diagram.theme_palette.font_color
+          @gradient     ||= diagram.theme_palette.gradient
         end
 
         @pages = args[:pages] || []
       end
       # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
+      def theme_palette
+        @theme_palette ||= KConfig.configuration.drawio.theme.element(theme)
+      end
+
+      def bg_theme_palette
+        @bg_theme_palette ||= KConfig.configuration.drawio.theme.background(bg_theme)
+      end
+
       def to_h
         {
           host: host,

data/lib/drawio_dsl/schema/element.rb

@@ -16,7 +16,7 @@ module DrawioDsl
         @fill_color       = args[:fill_color]       || theme_palette.fill_color
         @stroke_color     = args[:stroke_color]     || theme_palette.stroke_color
         @gradient         = args[:gradient]         || theme_palette.gradient
-        @font_color       = args[:font_color]       || theme_palette.element_font_color
+        @font_color       = args[:font_color]       || theme_palette.font_color
       end
     end
   end

data/lib/drawio_dsl/schema/page.rb

@@ -14,6 +14,7 @@ module DrawioDsl
       attr_accessor :active
       attr_reader :name
       attr_reader :theme
+      attr_reader :bg_theme
       attr_reader :style
       attr_reader :palette
       attr_reader :margin_left
@@ -43,7 +44,9 @@ module DrawioDsl
         @active       = args[:active].nil? ? true : !args[:active].nil?
         @name         = args[:name]
         @theme        = args[:theme] || diagram.theme
+        @bg_theme     = args[:bg_theme] || diagram.bg_theme
 
+        puts "Page has theme: #{theme}"
         # cursor positioning is used by the layout engine
         @position_x   = 0
         @position_y   = 0
@@ -64,7 +67,7 @@ module DrawioDsl
         @page_scale   = args[:page_scale]   || 1
         @page_width   = args[:page_width]   || 1169 # A4
         @page_height  = args[:page_height]  || 827  # A4
-        @background   = args[:background]   || '#FFFACD'
+        @background   = args[:background]   || bg_theme_palette.bg_color
         @page_shadow  = args[:page_shadow]  || 0
         @math         = args[:math]         || 0
 
@@ -82,7 +85,7 @@ module DrawioDsl
           # Inherit from theme when specific palette options are not specified.
           @fill_color   ||= page.theme_palette.fill_color
           @stroke_color ||= page.theme_palette.stroke_color
-          @font_color   ||= page.theme_palette.element_font_color
+          @font_color   ||= page.theme_palette.font_color
           @gradient     ||= page.theme_palette.gradient
         end
 
@@ -100,7 +103,11 @@ module DrawioDsl
       end
 
       def theme_palette
-        @theme_palette ||= KConfig.configuration.drawio.palette(theme)
+        @theme_palette ||= KConfig.configuration.drawio.theme.element(theme)
+      end
+
+      def bg_theme_palette
+        @bg_theme_palette ||= KConfig.configuration.drawio.theme.background(bg_theme)
       end
 
       def as_xml(xml)

data/lib/drawio_dsl/schema/shape.rb

@@ -142,7 +142,12 @@ module DrawioDsl
       end
 
       def theme_palette
-        @theme_palette ||= KConfig.configuration.drawio.palette(theme)
+        @theme_palette ||= KConfig.configuration.drawio.theme.element(theme)
+      end
+
+      # TODO: test
+      def bg_theme_palette
+        @bg_theme_palette ||= KConfig.configuration.drawio.theme.background(bg_theme)
       end
 
       # :nocov:

data/lib/drawio_dsl/schema/text.rb

@@ -16,7 +16,7 @@ module DrawioDsl
         @fill_color       = args[:fill_color]
         @stroke_color     = args[:stroke_color]
         @gradient         = args[:gradient]
-        @font_color       = args[:font_color] || theme_palette.text_font_color
+        @font_color       = args[:font_color] || page.bg_theme_palette.font_color
       end
     end
   end

data/lib/drawio_dsl/version.rb

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

data/lib/drawio_dsl.rb

@@ -16,7 +16,6 @@ end
 
 require_relative 'drawio_dsl/configuration_extension'
 require_relative 'drawio_dsl/configuration_shapes'
-require_relative 'drawio_dsl/configuration_themes'
 require_relative 'drawio_dsl/configuration'
 require_relative 'drawio_dsl/version'
 require_relative 'drawio_dsl/formatters/_'

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "drawio_dsl",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "drawio_dsl",
-      "version": "0.9.0",
+      "version": "0.10.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.9.0",
+  "version": "0.10.0",
   "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.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - David Cruwys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-23 00:00:00.000000000 Z
+date: 2022-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: k_config
@@ -282,7 +282,6 @@ files:
 - lib/drawio_dsl/configuration.rb
 - lib/drawio_dsl/configuration_extension.rb
 - lib/drawio_dsl/configuration_shapes.rb
-- lib/drawio_dsl/configuration_themes.rb
 - lib/drawio_dsl/dom_builder.rb
 - lib/drawio_dsl/dom_builder_shapes.rb
 - lib/drawio_dsl/drawio.rb

data/lib/drawio_dsl/configuration_themes.rb

@@ -1,63 +0,0 @@
-# frozen_string_literal: true
-
-# Attach configuration to the DrawIO DSL module
-module DrawioDsl
-  # Configuration for each theme
-  module ConfigurationThemes
-    ShapeThemeStyle = Struct.new(:fill_color, :stroke_color, :gradient, :element_font_color, :text_font_color, keyword_init: true)
-
-    attr_accessor :themes
-
-    def add_theme(name, **opts)
-      @themes[name] = ShapeThemeStyle.new(**opts)
-    end
-
-    def add_themes
-      @themes = {}
-
-      add_theme(:style_01         , fill_color: '#f5f5f5', stroke_color: '#666666', gradient: nil      , element_font_color: '#333333', text_font_color: '#aaaaaa')
-      add_theme(:style_02         , fill_color: '#dae8fc', stroke_color: '#6c8ebf', gradient: nil      , element_font_color: '#333333', text_font_color: '#aaaaaa')
-      add_theme(:style_03         , fill_color: '#d5e8d4', stroke_color: '#82b366', gradient: nil      , element_font_color: '#333333', text_font_color: '#aaaaaa')
-      add_theme(:style_04         , fill_color: '#ffe6cc', stroke_color: '#d79b00', gradient: nil      , element_font_color: '#333333', text_font_color: '#aaaaaa')
-      add_theme(:style_05         , fill_color: '#fff2cc', stroke_color: '#d6b656', gradient: nil      , element_font_color: '#333333', text_font_color: '#aaaaaa')
-      add_theme(:style_06         , fill_color: '#f8cecc', stroke_color: '#b85450', gradient: nil      , element_font_color: '#333333', text_font_color: '#aaaaaa')
-      add_theme(:style_07         , fill_color: '#e1d5e7', stroke_color: '#9673a6', gradient: nil      , element_font_color: '#333333', text_font_color: '#aaaaaa')
-      add_theme(:style_08         , fill_color: '#60a917', stroke_color: '#2D7600', gradient: nil      , element_font_color: '#ffffff', text_font_color: '#aaaaaa')
-      add_theme(:style_09         , fill_color: '#008a00', stroke_color: '#005700', gradient: nil      , element_font_color: '#ffffff', text_font_color: '#aaaaaa')
-      add_theme(:style_10         , fill_color: '#1ba1e2', stroke_color: '#006EAF', gradient: nil      , element_font_color: '#ffffff', text_font_color: '#aaaaaa')
-      add_theme(:style_11         , fill_color: '#0050ef', stroke_color: '#001DBC', gradient: nil      , element_font_color: '#ffffff', text_font_color: '#aaaaaa')
-      add_theme(:style_12         , fill_color: '#6a00ff', stroke_color: '#3700CC', gradient: nil      , element_font_color: '#ffffff', text_font_color: '#aaaaaa')
-      add_theme(:style_13         , fill_color: '#aa00ff', stroke_color: '#7700CC', gradient: nil      , element_font_color: '#ffffff', text_font_color: '#aaaaaa')
-      add_theme(:style_14         , fill_color: '#d80073', stroke_color: '#A50040', gradient: nil      , element_font_color: '#ffffff', text_font_color: '#aaaaaa')
-      add_theme(:style_15         , fill_color: '#a20025', stroke_color: '#6F0000', gradient: nil      , element_font_color: '#ffffff', text_font_color: '#aaaaaa')
-      add_theme(:style_16         , fill_color: '#e51400', stroke_color: '#B20000', gradient: nil      , element_font_color: '#ffffff', text_font_color: '#aaaaaa')
-      add_theme(:style_17         , fill_color: '#fa6800', stroke_color: '#C73500', gradient: nil      , element_font_color: '#000000', text_font_color: '#aaaaaa')
-      add_theme(:style_18         , fill_color: '#f0a30a', stroke_color: '#BD7000', gradient: nil      , element_font_color: '#000000', text_font_color: '#aaaaaa')
-      add_theme(:style_19         , fill_color: '#e3c800', stroke_color: '#B09500', gradient: nil      , element_font_color: '#000000', text_font_color: '#aaaaaa')
-      add_theme(:style_20         , fill_color: '#6d8764', stroke_color: '#3A5431', gradient: nil      , element_font_color: '#ffffff', text_font_color: '#aaaaaa')
-      add_theme(:style_21         , fill_color: '#647687', stroke_color: '#314354', gradient: nil      , element_font_color: '#ffffff', text_font_color: '#aaaaaa')
-      add_theme(:style_22         , fill_color: '#76608a', stroke_color: '#432D57', gradient: nil      , element_font_color: '#ffffff', text_font_color: '#aaaaaa')
-      add_theme(:style_23         , fill_color: '#a0522d', stroke_color: '#6D1F00', gradient: nil      , element_font_color: '#ffffff', text_font_color: '#aaaaaa')
-      add_theme(:style_24         , fill_color: '#fad7ac', stroke_color: '#b46504', gradient: nil      , element_font_color: '#333333', text_font_color: '#aaaaaa')
-      add_theme(:style_25         , fill_color: '#fad9d5', stroke_color: '#ae4132', gradient: nil      , element_font_color: '#333333', text_font_color: '#aaaaaa')
-      add_theme(:style_26         , fill_color: '#b0e3e6', stroke_color: '#0e8088', gradient: nil      , element_font_color: '#000000', text_font_color: '#aaaaaa')
-      add_theme(:style_27         , fill_color: '#b1ddf0', stroke_color: '#10739e', gradient: nil      , element_font_color: '#000000', text_font_color: '#aaaaaa')
-      add_theme(:style_28         , fill_color: '#d0cee2', stroke_color: '#56517e', gradient: nil      , element_font_color: '#000000', text_font_color: '#aaaaaa')
-      add_theme(:style_29         , fill_color: '#bac8d3', stroke_color: '#23445d', gradient: nil      , element_font_color: '#000000', text_font_color: '#aaaaaa')
-      add_theme(:style_30         , fill_color: '#f5f5f5', stroke_color: '#666666', gradient: '#b3b3b3', element_font_color: '#000000', text_font_color: '#aaaaaa')
-      add_theme(:style_31         , fill_color: '#dae8fc', stroke_color: '#6c8ebf', gradient: '#7ea6e0', element_font_color: '#000000', text_font_color: '#aaaaaa')
-      add_theme(:style_32         , fill_color: '#d5e8d4', stroke_color: '#82b366', gradient: '#97d077', element_font_color: '#000000', text_font_color: '#aaaaaa')
-      add_theme(:style_33         , fill_color: '#ffcd28', stroke_color: '#d79b00', gradient: '#ffa500', element_font_color: '#000000', text_font_color: '#aaaaaa')
-      add_theme(:style_34         , fill_color: '#fff2cc', stroke_color: '#d6b656', gradient: '#ffd966', element_font_color: '#000000', text_font_color: '#aaaaaa')
-      add_theme(:style_35         , fill_color: '#f8cecc', stroke_color: '#b85450', gradient: '#ea6b66', element_font_color: '#000000', text_font_color: '#aaaaaa')
-      add_theme(:style_36         , fill_color: '#e6d0de', stroke_color: '#996185', gradient: '#d5739d', element_font_color: '#000000', text_font_color: '#aaaaaa')
-      add_theme(:style_37         , fill_color: '#eeeeee', stroke_color: '#36393d', gradient: nil      , element_font_color: '#000000', text_font_color: '#aaaaaa')
-      add_theme(:style_38         , fill_color: '#f9f7ed', stroke_color: '#36393d', gradient: nil      , element_font_color: '#000000', text_font_color: '#aaaaaa')
-      add_theme(:style_39         , fill_color: '#ffcc99', stroke_color: '#36393d', gradient: nil      , element_font_color: '#000000', text_font_color: '#aaaaaa')
-      add_theme(:style_40         , fill_color: '#cce5ff', stroke_color: '#36393d', gradient: nil      , element_font_color: '#000000', text_font_color: '#aaaaaa')
-      add_theme(:style_41         , fill_color: '#ffff88', stroke_color: '#36393d', gradient: nil      , element_font_color: '#000000', text_font_color: '#aaaaaa')
-      add_theme(:style_42         , fill_color: '#cdeb8b', stroke_color: '#36393d', gradient: nil      , element_font_color: '#000000', text_font_color: '#aaaaaa')
-      add_theme(:style_43         , fill_color: '#ffcccc', stroke_color: '#36393d', gradient: nil      , element_font_color: '#000000', text_font_color: '#aaaaaa')
-    end
-  end
-end