drawio_dsl 0.11.0 → 0.11.1

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/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/elements/.rb

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

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/lines/.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/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

@@ -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
@@ -108,7 +108,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 +130,7 @@ module DrawioDsl
           id: id,
           parent_id: parent&.id,
           classification: classification,
-          type: type,
+          key: key,
           x: x,
           y: y,
           w: w,
@@ -153,9 +153,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/texts/.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module DrawioDsl
+  module Schema
+    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.11.0'
+  VERSION = '0.11.1'
 end

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "drawio_dsl",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "drawio_dsl",
-      "version": "0.11.0",
+      "version": "0.11.1",
       "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.1",
   "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.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - David Cruwys
@@ -303,6 +303,7 @@ files:
 - lib/drawio_dsl/schema/default_palette.rb
 - lib/drawio_dsl/schema/diagram.rb
 - lib/drawio_dsl/schema/element.rb
+- lib/drawio_dsl/schema/elements/.rb
 - lib/drawio_dsl/schema/elements/actor.rb
 - lib/drawio_dsl/schema/elements/actor2.rb
 - lib/drawio_dsl/schema/elements/callout.rb
@@ -343,12 +344,14 @@ 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/.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/text.rb
+- lib/drawio_dsl/schema/texts/.rb
 - lib/drawio_dsl/schema/texts/h1.rb
 - lib/drawio_dsl/schema/texts/h2.rb
 - lib/drawio_dsl/schema/texts/h3.rb