drawio_dsl 0.8.4 → 0.8.7

data/lib/drawio_dsl/configuration_shapes.rb

@@ -31,9 +31,11 @@ module DrawioDsl
       :cross,
       :envelop,
       :database,
+      :db_json,
       :diamond,
       :document,
       :ellipse,
+      :group,
       :hexagon,
       :interface,
       :klass,
@@ -79,9 +81,11 @@ module DrawioDsl
         cross: ShapeDefaults.new(type: :cross, x: 0, category: :element, y: 0, w: 50, h: 50, style_modifiers: 'verticalLabelPosition=bottom;verticalAlign=top;html=1;shape=mxgraph.basic.x'),
         envelop: ShapeDefaults.new(type: :envelop, x: 0, category: :element, y: 0, w: 160, h: 100, style_modifiers: 'shape=message'),
         database: ShapeDefaults.new(type: :database, x: 0, category: :element, y: 0, w: 160, h: 80, style_modifiers: 'shape=mxgraph.flowchart.database;strokeWidth=1'),
+        db_json: ShapeDefaults.new(type: :db_json, x: 0, category: :element, y: 0, w: 160, h: 40, style_modifiers: 'shape=mxgraph.flowchart.database;strokeWidth=1'),
         diamond: ShapeDefaults.new(type: :diamond, x: 0, category: :element, y: 0, w: 100, h: 100, style_modifiers: 'rhombus'),
         document: ShapeDefaults.new(type: :document, x: 0, category: :element, y: 0, w: 160, h: 160, style_modifiers: 'shape=mxgraph.basic.document'),
         ellipse: ShapeDefaults.new(type: :ellipse, x: 0, category: :element, y: 0, w: 200, h: 120, style_modifiers: 'ellipse'),
+        group: ShapeDefaults.new(type: :group, x: 0, category: :element, y: 0, w: 210, h: 210, style_modifiers: 'fontSize=20;verticalAlign=top'),
         hexagon: ShapeDefaults.new(type: :hexagon, x: 0, category: :element, y: 0, w: 200, h: 120, style_modifiers: 'shape=hexagon'),
         interface: ShapeDefaults.new(type: :interface, x: 0, category: :element, y: 0, w: 160, h: 160, style_modifiers: 'align=left;overflow=fill;fontSize=12;fontFamily=Helvetica'),
         klass: ShapeDefaults.new(type: :klass, x: 0, category: :element, y: 0, w: 160, h: 160, style_modifiers: 'align=left;overflow=fill;fontSize=12;fontFamily=Helvetica'),

data/lib/drawio_dsl/dom_builder.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module DrawioDsl
-  # DrawioDsl is a DSL for draw-io diagrams.
+  # Build Document object model to represent DrawioDsl output file.
   class DomBuilder
     include DomBuilderShapes
 

data/lib/drawio_dsl/dom_builder_shapes.rb

@@ -142,6 +142,12 @@ module DrawioDsl
       add_shape(database)
     end
 
+    def add_db_json(id = nil, **opts, &block)
+      opts = { id: id }.merge(opts) if id
+      db_json = DrawioDsl::Schema::DbJson.new(current_page, **opts, &block)
+      add_shape(db_json)
+    end
+
     def add_diamond(id = nil, **opts, &block)
       opts = { id: id }.merge(opts) if id
       diamond = DrawioDsl::Schema::Diamond.new(current_page, **opts, &block)
@@ -160,6 +166,12 @@ module DrawioDsl
       add_shape(ellipse)
     end
 
+    def add_group(id = nil, **opts, &block)
+      opts = { id: id }.merge(opts) if id
+      group = DrawioDsl::Schema::Group.new(current_page, **opts, &block)
+      add_shape(group)
+    end
+
     def add_hexagon(id = nil, **opts, &block)
       opts = { id: id }.merge(opts) if id
       hexagon = DrawioDsl::Schema::Hexagon.new(current_page, **opts, &block)

data/lib/drawio_dsl/drawio.rb

@@ -67,23 +67,4 @@ module DrawioDsl
       self
     end
   end
-
-  # DrawioDsl::DrawioPage is created when you call .page on the draw-io DSL.
-  class DrawioPage < KDirector::Directors::ChildDirector
-    include DrawioDsl::DrawioShapes
-
-    def initialize(parent, **opts)
-      super(parent, **opts)
-
-      builder.add_page(**opts)
-    end
-
-    def grid_layout(**opts)
-      builder.add_grid_layout(**opts)
-    end
-
-    def flex_layout(**opts)
-      builder.add_flex_layout(**opts)
-    end
-  end
 end

data/lib/drawio_dsl/drawio_extensions.rb

@@ -2,8 +2,9 @@
 
 module DrawioDsl
   # :nocov:
-  class DrawIoExtensions
-    include DrawioDsl::DrawIoExtensionsActive
+  # 1000's of extension shapes derived from Extensions.js that can be used via the add_shape method
+  class DrawioExtensions
+    include DrawioDsl::DrawioExtensionsActive
 
     attr_reader :sections
     attr_reader :current_section

data/lib/drawio_dsl/drawio_extensions_active.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module DrawioDsl
-  module DrawIoExtensionsActive
+  module DrawioExtensionsActive
     def apply_active_flags
       sections.each do |section|
         section[:shapes].each do |shape|

data/lib/drawio_dsl/drawio_page.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module DrawioDsl
+  # DrawioDsl::DrawioPage is created when you call .page on the draw-io DSL.
+  class DrawioPage < KDirector::Directors::ChildDirector
+    include DrawioDsl::DrawioShapes
+
+    def initialize(parent, **opts)
+      super(parent, **opts)
+
+      builder.add_page(**opts)
+    end
+
+    def grid_layout(**opts)
+      builder.add_grid_layout(**opts)
+    end
+
+    def flex_layout(**opts)
+      builder.add_flex_layout(**opts)
+    end
+  end
+end

data/lib/drawio_dsl/drawio_shapes.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 module DrawioDsl
-  # DrawioDsl::Shapes is a list of DSL methods (one per shape)
+  # List of DSL methods for each common shape
   # :nocov:
   module DrawioShapes
     def random(**opts)
-      case rand(42)
+      case rand(44)
       when 0
         line(**opts)
       when 1
@@ -53,42 +53,46 @@ module DrawioDsl
       when 22
         database(**opts)
       when 23
-        diamond(**opts)
+        db_json(**opts)
       when 24
-        document(**opts)
+        diamond(**opts)
       when 25
-        ellipse(**opts)
+        document(**opts)
       when 26
-        hexagon(**opts)
+        ellipse(**opts)
       when 27
-        interface(**opts)
+        group(**opts)
       when 28
-        klass(**opts)
+        hexagon(**opts)
       when 29
-        note(**opts)
+        interface(**opts)
       when 30
-        process(**opts)
+        klass(**opts)
       when 31
-        rectangle(**opts)
+        note(**opts)
       when 32
-        rectangle2(**opts)
+        process(**opts)
       when 33
-        square(**opts)
+        rectangle(**opts)
       when 34
-        step(**opts)
+        rectangle2(**opts)
       when 35
-        tick(**opts)
+        square(**opts)
       when 36
-        todo(**opts)
+        step(**opts)
       when 37
-        face(**opts)
+        tick(**opts)
       when 38
-        triangle(**opts)
+        todo(**opts)
       when 39
-        embed_row(**opts)
+        face(**opts)
       when 40
-        embed_col50(**opts)
+        triangle(**opts)
       when 41
+        embed_row(**opts)
+      when 42
+        embed_col50(**opts)
+      when 43
         embed_col200(**opts)
       end
     end
@@ -185,6 +189,10 @@ module DrawioDsl
       builder.add_database(id, **opts, &block)
     end
 
+    def db_json(id = nil, **opts, &block)
+      builder.add_db_json(id, **opts, &block)
+    end
+
     def diamond(id = nil, **opts, &block)
       builder.add_diamond(id, **opts, &block)
     end
@@ -197,6 +205,10 @@ module DrawioDsl
       builder.add_ellipse(id, **opts, &block)
     end
 
+    def group(id = nil, **opts, &block)
+      builder.add_group(id, **opts, &block)
+    end
+
     def hexagon(id = nil, **opts, &block)
       builder.add_hexagon(id, **opts, &block)
     end

data/lib/drawio_dsl/formatters/base_formatter.rb

@@ -4,7 +4,7 @@
 module DrawioDsl
   # HTML formatters can be used on shapes to render HTML using a DSL
   module Formatters
-    # Create an instance of a HTML formatter on the shape
+    # Base for any HTML formatter
     class BaseFormatter
       attr_reader :html
 
@@ -12,6 +12,78 @@ module DrawioDsl
         @html = DrawioDsl::Formatters::HtmlBuilder.new(element_style_defaults)
       end
 
+      def hr(size: 1)
+        html.hr(size: size)
+
+        self
+      end
+
+      def b(content, **opts)
+        html.b(content, **opts)
+
+        self
+      end
+
+      def p(content, **opts)
+        html.p(content, **opts)
+
+        self
+      end
+
+      def h1(content, **opts)
+        html.h1(content, **opts)
+
+        self
+      end
+
+      def h2(content, **opts)
+        html.h2(content, **opts)
+
+        self
+      end
+
+      def h3(content, **opts)
+        html.h3(content, **opts)
+
+        self
+      end
+
+      def h4(content, **opts)
+        html.h4(content, **opts)
+
+        self
+      end
+
+      def h5(content, **opts)
+        html.h5(content, **opts)
+
+        self
+      end
+
+      def h6(content, **opts)
+        html.h6(content, **opts)
+
+        self
+      end
+
+      def ul_s(**opts)
+        html.ul_s(**opts)
+
+        self
+      end
+
+      def ul_e(**opts)
+        html.ul_e(**opts)
+
+        self
+      end
+
+      def li(content, **opts)
+        html.li(content, **opts)
+
+        self
+      end
+
       def empty?
         html.empty?
       end
@@ -19,6 +91,54 @@ module DrawioDsl
       def as_html(new_line: false)
         html.as_html(new_line: new_line)
       end
+
+      private
+
+      # useful defaults
+
+      def ratio
+        @ratio ||= 1.2
+      end
+
+      def base_margin_bottom
+        @base_margin_bottom ||= 4
+      end
+
+      def p_margin_bottom
+        @p_margin_bottom ||= base_margin_bottom
+      end
+
+      def b_margin_bottom
+        @b_margin_bottom ||= base_margin_bottom
+      end
+
+      def li_margin_bottom
+        @li_margin_bottom ||= base_margin_bottom
+      end
+
+      def h6_margin_bottom
+        @h6_margin_bottom ||= base_margin_bottom
+      end
+
+      def h5_margin_bottom
+        @h5_margin_bottom ||= h6_margin_bottom * ratio
+      end
+
+      def h4_margin_bottom
+        @h4_margin_bottom ||= h5_margin_bottom * ratio
+      end
+
+      def h3_margin_bottom
+        @h3_margin_bottom ||= h4_margin_bottom * ratio
+      end
+
+      def h2_margin_bottom
+        @h2_margin_bottom ||= h3_margin_bottom * ratio
+      end
+
+      def h1_margin_bottom
+        @h1_margin_bottom ||= h2_margin_bottom * ratio
+      end
     end
   end
 end

data/lib/drawio_dsl/formatters/html_builder.rb

@@ -4,7 +4,7 @@
 module DrawioDsl
   # HTML formatters can be used on shapes to render HTML using a DSL
   module Formatters
-    # Create an instance of a HTML formatter on the shape
+    # HTML builder has methods for common HTML elements that get written sequentially
     class HtmlBuilder
       attr_reader :element_style_defaults
 
@@ -12,6 +12,9 @@ module DrawioDsl
         @element_style_defaults = element_style_defaults
       end
 
+      # Access the default styles for a HTML element
+      #
+      # Formatters can define the defaults styles for HTML elements such as <p>, <h1>, etc.
       def default_for(tag)
         element_style_defaults[tag] || {}
       end
@@ -48,6 +51,42 @@ module DrawioDsl
         add_line("<p#{style_for(:p, **opts)}>#{content}</p>")
       end
 
+      def h1(content, **opts)
+        add_line("<h1#{style_for(:h1, **opts)}>#{content}</h1>")
+      end
+
+      def h2(content, **opts)
+        add_line("<h2#{style_for(:h2, **opts)}>#{content}</h2>")
+      end
+
+      def h3(content, **opts)
+        add_line("<h3#{style_for(:h3, **opts)}>#{content}</h3>")
+      end
+
+      def h4(content, **opts)
+        add_line("<h4#{style_for(:h4, **opts)}>#{content}</h4>")
+      end
+
+      def h5(content, **opts)
+        add_line("<h5#{style_for(:h5, **opts)}>#{content}</h5>")
+      end
+
+      def h6(content, **opts)
+        add_line("<h6#{style_for(:h6, **opts)}>#{content}</h6>")
+      end
+
+      def li(content, **opts)
+        add_line("<li#{style_for(:li, **opts)}>#{content}</li>")
+      end
+
+      def ul_s(**opts)
+        add_line("<ul#{style_for(:ul, **opts)}>")
+      end
+
+      def ul_e(**_opts)
+        add_line('</ul>')
+      end
+
       def add_line(line)
         lines << line
       end

data/lib/drawio_dsl/formatters/interface_formatter.rb

@@ -4,10 +4,22 @@
 module DrawioDsl
   # HTML formatters can be used on shapes to render HTML using a DSL
   module Formatters
-    # Create an instance of a HTML formatter on the shape
+    # Format the HTML to display an interface on a class diagram
     class InterfaceFormatter < BaseFormatter
       def initialize
-        super({ p: { margin: '0px', margin_left: '4px', margin_top: '4px' } })
+        super(
+          {
+            p: { margin: '0px', margin_left: '4px', margin_bottom: "#{p_margin_bottom}px" },
+            b: { margin: '0px', margin_left: '4px', margin_bottom: "#{b_margin_bottom}px" },
+            h1: { margin: '0px', margin_left: '4px', margin_bottom: "#{h1_margin_bottom}px" },
+            h2: { margin: '0px', margin_left: '4px', margin_bottom: "#{h2_margin_bottom}px" },
+            h3: { margin: '0px', margin_left: '4px', margin_bottom: "#{h3_margin_bottom}px" },
+            h4: { margin: '0px', margin_left: '4px', margin_bottom: "#{h4_margin_bottom}px" },
+            h5: { margin: '0px', margin_left: '4px', margin_bottom: "#{h5_margin_bottom}px" },
+            h6: { margin: '0px', margin_left: '4px', margin_bottom: "#{h6_margin_bottom}px" },
+            li: { margin: '0px', margin_left: '4px', margin_bottom: "#{li_margin_bottom}px" }
+          }
+        )
       end
 
       def header(name, description: nil, interface_type: 'Interface')

data/lib/drawio_dsl/formatters/klass_formatter.rb

@@ -4,10 +4,22 @@
 module DrawioDsl
   # HTML formatters can be used on shapes to render HTML using a DSL
   module Formatters
-    # Create an instance of a HTML formatter on the shape
+    # Format the HTML to display an class on a class diagram
     class KlassFormatter < BaseFormatter
       def initialize
-        super({ p: { margin: '0px', margin_left: '4px', margin_top: '4px' } })
+        super(
+          {
+            p: { margin: '0px', margin_left: '4px', margin_bottom: "#{p_margin_bottom}px" },
+            b: { margin: '0px', margin_left: '4px', margin_bottom: "#{b_margin_bottom}px" },
+            h1: { margin: '0px', margin_left: '4px', margin_bottom: "#{h1_margin_bottom}px" },
+            h2: { margin: '0px', margin_left: '4px', margin_bottom: "#{h2_margin_bottom}px" },
+            h3: { margin: '0px', margin_left: '4px', margin_bottom: "#{h3_margin_bottom}px" },
+            h4: { margin: '0px', margin_left: '4px', margin_bottom: "#{h4_margin_bottom}px" },
+            h5: { margin: '0px', margin_left: '4px', margin_bottom: "#{h5_margin_bottom}px" },
+            h6: { margin: '0px', margin_left: '4px', margin_bottom: "#{h6_margin_bottom}px" },
+            li: { margin: '0px', margin_left: '4px', margin_bottom: "#{li_margin_bottom}px" }
+          }
+        )
       end
 
       def header(name, description: nil)

data/lib/drawio_dsl/formatters/style_builder.rb

@@ -4,7 +4,7 @@
 module DrawioDsl
   # HTML formatters can be used on shapes to render HTML using a DSL
   module Formatters
-    # Create an instance of a HTML formatter on the shape
+    # Build the style attribute for a HTML element
     class StyleBuilder
       MAPPINGS = {
         margin: 'margin',

data/lib/drawio_dsl/schema/_.rb

@@ -35,9 +35,11 @@ require_relative 'shapes/container4'
 require_relative 'shapes/cross'
 require_relative 'shapes/envelop'
 require_relative 'shapes/database'
+require_relative 'shapes/db_json'
 require_relative 'shapes/diamond'
 require_relative 'shapes/document'
 require_relative 'shapes/ellipse'
+require_relative 'shapes/group'
 require_relative 'shapes/hexagon'
 require_relative 'shapes/interface'
 require_relative 'shapes/klass'

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

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

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

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

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

@@ -119,8 +119,8 @@ module DrawioDsl
       # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
       def as_xml(xml)
-        log.error category
-        log.error type
+        # log.error category
+        # log.error type
         draw_element(xml) if category == :element
         draw_line(xml)    if category == :line
       end

data/lib/drawio_dsl/version.rb

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

data/lib/drawio_dsl/xml_builder.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module DrawioDsl
-  # DrawioDsl is a DSL for draw-io diagrams.
+  # Build the DrawioDsl XML file that is the basis of any draw-io diagrams.
   class XmlBuilder
     include KLog::Logging
 

data/lib/drawio_dsl.rb

@@ -21,6 +21,7 @@ require_relative 'drawio_dsl/layout_engine'
 require_relative 'drawio_dsl/drawio_shapes'
 require_relative 'drawio_dsl/drawio_extensions_active'
 require_relative 'drawio_dsl/drawio_extensions'
+require_relative 'drawio_dsl/drawio_page'
 require_relative 'drawio_dsl/drawio'
 
 module DrawioDsl

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "drawio_dsl",
-  "version": "0.8.4",
+  "version": "0.8.7",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "drawio_dsl",
-      "version": "0.8.4",
+      "version": "0.8.7",
       "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.4",
+  "version": "0.8.7",
   "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.8.4
+  version: 0.8.7
 platform: ruby
 authors:
 - David Cruwys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-17 00:00:00.000000000 Z
+date: 2022-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: k_config
@@ -89,6 +89,8 @@ files:
 - ".builders/generators/10-transform-drawio-js.rb"
 - ".builders/generators/20-drawio-extensions.rb"
 - ".builders/generators/domain_diagram.rb"
+- ".builders/generators/parking-map.png"
+- ".builders/generators/parking_app.rb"
 - ".builders/generators/printspeak-architecture-generator.rb"
 - ".builders/generators/project-plan.rb"
 - ".builders/generators/sample_diagrams/05-samples.rb"
@@ -113,8 +115,11 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- docs/domain.drawio
-- docs/domain_model.svg
+- docs/domain-modal.md
+- docs/domain-modal/domain_model.drawio
+- docs/domain-modal/domain_model.svg
+- docs/domain-modal/domain_model_custom.drawio
+- docs/domain-modal/domain_model_custom.svg
 - docs/extensions.md
 - docs/extensions/analyti_cs.svg
 - docs/extensions/android_inputs.svg
@@ -269,6 +274,10 @@ files:
 - docs/extensions/venn_gradient.svg
 - docs/extensions/venn_plain.svg
 - docs/extensions/vessels.svg
+- docs/parking_app.drawio
+- docs/parking_app.svg
+- docs/printspeak-architecture-generator.drawio
+- docs/printspeak-architecture-generator.svg
 - docs/project-plan.md
 - docs/project-plan/project.drawio
 - docs/project-plan/project_done.svg
@@ -301,6 +310,7 @@ files:
 - lib/drawio_dsl/drawio_extensions.json
 - lib/drawio_dsl/drawio_extensions.rb
 - lib/drawio_dsl/drawio_extensions_active.rb
+- lib/drawio_dsl/drawio_page.rb
 - lib/drawio_dsl/drawio_shapes.rb
 - lib/drawio_dsl/formatters/_.rb
 - lib/drawio_dsl/formatters/base_formatter.rb
@@ -334,6 +344,7 @@ files:
 - 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
@@ -342,6 +353,7 @@ files:
 - 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