drawio_dsl 0.5.5 → 0.6.0

data/lib/drawio_dsl/drawio_extensions_active.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module DrawioDsl
+  module DrawIoExtensionsActive
+    def apply_active_flags
+      sections.each do |section|
+        section[:shapes].each do |shape|
+          shape[:active] = check_if_active(shape)
+        end
+        section[:active] = section[:shapes].any? { |s| s[:active] }
+      end
+    end
+
+    def check_if_active(shape)
+      style = shape[:style]
+
+      ban = %w[
+        mxCompositeShape
+        strokeColor=none;fillColor=none
+        shape=image
+        shadow=1
+        shape=partialRectangle;right=0
+        shape=partialRectangle;right=0;left=0
+      ]
+
+      return false if style.empty?
+      return false if ban.include?(style)
+
+      true
+    end
+  end
+end

data/lib/drawio_dsl/layout_engine.rb

@@ -23,13 +23,23 @@ module DrawioDsl
       page.position_y = page.margin_top
 
       page.nodes.all.each do |node|
-        case node.classification
-        when :layout_rule
-          @current_layout = node
-        when :shape
-          current_layout&.position_shape(node)
-        end
-        # node.debug(format: :row)
+        traverse_node(node)
+      end
+    end
+
+    def traverse_node(node)
+      process_node(node)
+      node.nodes.all.each do |child|
+        traverse_node(child)
+      end
+    end
+
+    def process_node(node)
+      case node.classification
+      when :layout_rule
+        @current_layout = node
+      when :shape
+        current_layout&.position_shape(node)
       end
     end
   end

data/lib/drawio_dsl/schema/_.rb

@@ -49,3 +49,5 @@ require_relative 'shapes/triangle'
 require_relative 'shapes/embed_row'
 require_relative 'shapes/embed_col50'
 require_relative 'shapes/embed_col200'
+
+require_relative 'virtual/anchor'

data/lib/drawio_dsl/schema/diagram.rb

@@ -49,7 +49,7 @@ module DrawioDsl
           theme: theme,
           palette: palette.to_h,
           style: style.to_h,
-          pages: pages.map(&:to_h)
+          pages: pages.select(&:active?).map(&:to_h)
         }
       end
     end

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

@@ -10,13 +10,12 @@ module DrawioDsl
       attr_reader :perpendicular_max
 
       def initialize(page, **args)
-        @type = :flex_layout
         @direction = args[:direction] || :horizontal
         @wrap_at = args[:wrap_at] || (direction == :horizontal ? 1000 : 800)
         @gap = args[:gap] || 20
         @perpendicular_max = 0
 
-        super(page, **args)
+        super(page, **args.merge(type: :flex_layout))
       end
 
       def position_shape(shape)

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

@@ -15,7 +15,6 @@ module DrawioDsl
 
       # rubocop:disable Metrics/CyclomaticComplexity
       def initialize(page, **args)
-        @type       = :grid_layout
         @direction  = args[:direction]  || :horizontal
         @wrap_at    = args[:wrap_at]    || 5
         @grid_size  = args[:grid_size]  || 220
@@ -25,7 +24,7 @@ module DrawioDsl
         @v_align    = args[:v_align]    || :center
         @cell_no    = 1
 
-        super(page, **args)
+        super(page, **args.merge(type: :grid_layout))
       end
       # rubocop:enable Metrics/CyclomaticComplexity
 

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

@@ -4,8 +4,6 @@ module DrawioDsl
   module Schema
     # Provides base configuration for automatic layouts
     class Layout < Node
-      attr_accessor :type
-
       # represents the x coordinate of the top left corner layout area
       # this coordinate is based on the current location of the page
       attr_accessor :anchor_x
@@ -31,7 +29,6 @@ module DrawioDsl
 
       def to_h
         super.merge(
-          type: type,
           anchor_x: anchor_x,
           anchor_y: anchor_y
         )

data/lib/drawio_dsl/schema/node.rb

@@ -7,19 +7,38 @@ module DrawioDsl
     class Node
       attr_accessor :id
       attr_accessor :page
+      attr_accessor :parent
       attr_accessor :classification
+      attr_accessor :type
+      attr_accessor :nodes
 
       def initialize(page, **args)
         @page = page
         @id = args[:id]
+        @parent = args[:parent]
         @classification = args[:classification] || :unknown
+        @type = args[:type] || :unknown
+        @nodes = NodeList.new
       end
 
       def to_h
-        {
+        result = {
           id: id,
-          classification: classification
+          parent_id: parent&.id,
+          classification: classification,
+          type: type
         }
+        result[:nodes] = nodes.to_h if nodes.any?
+        result
+      end
+
+      def root?
+        parent.nil? || parent.is_a?(DrawioDsl::Schema::Page)
+      end
+
+      def add_node(node)
+        @nodes.add(self, node)
+        node
       end
 
       # :nocov:

data/lib/drawio_dsl/schema/node_list.rb

@@ -9,7 +9,8 @@ module DrawioDsl
         @nodes = []
       end
 
-      def add(node)
+      def add(parent, node)
+        node.parent = parent
         @nodes << node
       end
 
@@ -29,6 +30,24 @@ module DrawioDsl
         @nodes.length
       end
 
+      def empty?
+        @nodes.empty?
+      end
+
+      def any?
+        @nodes.any?
+      end
+
+      def first
+        @nodes.first
+      end
+
+      def as_xml(xml)
+        nodes.each do |node|
+          node.as_xml(xml) if node.respond_to?(:as_xml)
+        end
+      end
+
       def to_h
         @nodes.map(&:to_h)
       end

data/lib/drawio_dsl/schema/page.rb

@@ -11,6 +11,7 @@ module DrawioDsl
       attr_accessor :position_y
 
       attr_accessor :id
+      attr_accessor :active
       attr_reader :name
       attr_reader :theme
       attr_reader :style
@@ -39,6 +40,7 @@ module DrawioDsl
         @diagram = diagram
 
         @id           = args[:id]
+        @active       = args[:active].nil? ? true : !args[:active].nil?
         @name         = args[:name]
         @theme        = args[:theme] || diagram.theme
 
@@ -90,9 +92,18 @@ module DrawioDsl
       end
       # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/MethodLength
 
-      # def shapes
-      #   nodes.shapes
-      # end
+      def active?
+        !!@active
+      end
+
+      def add_node(node)
+        @nodes.add(self, node)
+        node
+      end
+
+      def as_xml(xml)
+        nodes.as_xml(xml)
+      end
 
       def to_h
         {

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

@@ -37,7 +37,6 @@ module DrawioDsl
       attr_accessor :font_color
       attr_accessor :gradient
 
-      attr_accessor :type
       attr_accessor :text_only
       attr_accessor :x
       attr_accessor :y
@@ -85,7 +84,6 @@ module DrawioDsl
 
       def style
         key_values = []
-        key_values << style_modifiers unless style_modifiers.empty?
         key_values << "whiteSpace=#{white_space}"         if white_space
         key_values << "html=#{html}"                      if html
         key_values << "rounded=#{rounded}"                if rounded
@@ -96,20 +94,22 @@ 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 << style_modifiers unless style_modifiers.empty?
 
         key_values.join(';')
       end
       # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
       def as_xml(xml)
-        xml.mxCell(id: id, value: title, style: style, vertex: 1, parent: "#{page.id}-B") do
+        xml.mxCell(id: id, value: title, style: style, vertex: 1, parent: parent&.id) do
           xml.mxGeometry(x: x, y: y, width: w, height: h, as: 'geometry')
         end
       end
 
       def to_h
-        {
+        result = {
           id: id,
+          parent_id: parent&.id,
           classification: classification,
           type: type,
           x: x,
@@ -118,6 +118,8 @@ module DrawioDsl
           h: h,
           style: style
         }
+        result[:nodes] = nodes.to_h if nodes.any?
+        result
       end
 
       # :nocov:

data/lib/drawio_dsl/schema/virtual/anchor.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module DrawioDsl
+  module Schema
+    # Provides an anchor point on the page for elements to hang from
+    class Anchor < Node
+      def initialize(page, **args)
+        args[:classification] = :anchor
+        super(page, **args)
+      end
+
+      # xml.mxCell(id: "#{page.id}-A")
+      # xml.mxCell(id: "#{page.id}-B", parent: "#{page.id}-A")
+
+      def as_xml(xml)
+        if parent
+          xml.mxCell(id: id, parent: parent.id)
+        else
+          xml.mxCell(id: id)
+        end
+
+        nodes.as_xml(xml)
+      end
+    end
+  end
+end

data/lib/drawio_dsl/version.rb

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

data/lib/drawio_dsl/xml_builder.rb

@@ -22,13 +22,13 @@ module DrawioDsl
 
     def build_diagram(xml)
       xml.mxfile(host: diagram.host) do
-        diagram.pages.each do |page|
+        diagram.pages.select(&:active?).each do |page|
           build_page(xml, page)
         end
       end
     end
 
-    # rubocop:disable  Metrics/MethodLength, Metrics/AbcSize, Metrics/BlockLength
+    # rubocop:disable  Metrics/AbcSize
     def build_page(xml, page)
       xml.diagram(id: page.id, name: page.name) do
         xml.mxGraphModel(
@@ -50,15 +50,11 @@ module DrawioDsl
           shadow: page.page_shadow
         ) do
           xml.root do
-            xml.mxCell(id: "#{page.id}-A")
-            xml.mxCell(id: "#{page.id}-B", parent: "#{page.id}-A")
-            page.nodes.all.each do |node|
-              node.as_xml(xml) if node.classification == :shape
-            end
+            page.as_xml(xml)
           end
         end
       end
     end
-    # rubocop:enable  Metrics/MethodLength, Metrics/AbcSize, Metrics/BlockLength
+    # rubocop:enable Metrics/AbcSize
   end
 end

data/lib/drawio_dsl.rb

@@ -18,6 +18,8 @@ require_relative 'drawio_dsl/dom_builder'
 require_relative 'drawio_dsl/xml_builder'
 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'
 
 module DrawioDsl

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "drawio_dsl",
-  "version": "0.5.5",
+  "version": "0.6.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "drawio_dsl",
-      "version": "0.5.5",
+      "version": "0.6.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.5.5",
+  "version": "0.6.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.5.5
+  version: 0.6.0
 platform: ruby
 authors:
 - David Cruwys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-08 00:00:00.000000000 Z
+date: 2022-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: k_config
@@ -76,6 +76,7 @@ files:
 - ".builders/.data/shapes.json"
 - ".builders/.templates/basic/configuration_shapes.rb"
 - ".builders/.templates/basic/dom_builder_shapes.rb"
+- ".builders/.templates/basic/drawio_extensions.rb"
 - ".builders/.templates/basic/drawio_shapes.rb"
 - ".builders/.templates/basic/schema_require.rb"
 - ".builders/.templates/basic/schema_shape.rb"
@@ -85,7 +86,11 @@ files:
 - ".builders/boot.rb"
 - ".builders/generators/01-bootstrap.rb"
 - ".builders/generators/02-generate-app.rb"
+- ".builders/generators/10-transform-drawio-js.rb"
+- ".builders/generators/20-drawio-extensions.rb"
 - ".builders/generators/project_plans/drawio_dsl.rb"
+- ".builders/generators/project_plans/k_doc.rb"
+- ".builders/generators/sample_diagrams/05-samples.rb"
 - ".builders/generators/sample_diagrams/10-page-margin.rb"
 - ".builders/generators/sample_diagrams/15-grid-direction.rb"
 - ".builders/generators/sample_diagrams/16-grid-alignment.rb"
@@ -105,6 +110,160 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- docs/extensions.md
+- docs/extensions/analyti_cs.svg
+- docs/extensions/android_inputs.svg
+- docs/extensions/app_services.svg
+- docs/extensions/appliances.svg
+- docs/extensions/arrows.svg
+- docs/extensions/aws_17___analyti_cs.svg
+- docs/extensions/aws_17___application_services.svg
+- docs/extensions/aws_17___artificial_intelligence.svg
+- docs/extensions/aws_17___business_productivity.svg
+- docs/extensions/aws_17___compute.svg
+- docs/extensions/aws_17___contact_center.svg
+- docs/extensions/aws_17___containers.svg
+- docs/extensions/aws_17___database.svg
+- docs/extensions/aws_17___desktop_app_straning.svg
+- docs/extensions/aws_17___developer_tools.svg
+- docs/extensions/aws_17___game_development.svg
+- docs/extensions/aws_17___general.svg
+- docs/extensions/aws_17___io_t.svg
+- docs/extensions/aws_17___management.svg
+- docs/extensions/aws_17___messaging.svg
+- docs/extensions/aws_17___migration.svg
+- docs/extensions/aws_17___mobile_services.svg
+- docs/extensions/aws_17___networking_content_delivery.svg
+- docs/extensions/aws_17___on_demand_workforce.svg
+- docs/extensions/aws_17___sdks.svg
+- docs/extensions/aws_17___serurity_identity_and_compliance.svg
+- docs/extensions/aws_17___storage.svg
+- docs/extensions/aws_19___application_integration.svg
+- docs/extensions/aws_19___ar_vr.svg
+- docs/extensions/aws_19___blockchain.svg
+- docs/extensions/aws_19___business_applications.svg
+- docs/extensions/aws_19___compute.svg
+- docs/extensions/aws_19___cost_management.svg
+- docs/extensions/aws_19___customer_engagement.svg
+- docs/extensions/aws_19___database.svg
+- docs/extensions/aws_19___desktop_app_streaming.svg
+- docs/extensions/aws_19___developer_tools.svg
+- docs/extensions/aws_19___ec2_instance_types.svg
+- docs/extensions/aws_19___game_tech.svg
+- docs/extensions/aws_19___general.svg
+- docs/extensions/aws_19___groups_note_repeated_below_without_v2.svg
+- docs/extensions/aws_19___internet_of_things.svg
+- docs/extensions/aws_19___machine_learning.svg
+- docs/extensions/aws_19___management_governance.svg
+- docs/extensions/aws_19___media_services.svg
+- docs/extensions/aws_19___migration_transfer.svg
+- docs/extensions/aws_19___mobile.svg
+- docs/extensions/aws_19___networking_content_delivery.svg
+- docs/extensions/aws_19___roboti_cs.svg
+- docs/extensions/aws_19___satellite.svg
+- docs/extensions/aws_19___security_identity_compliance.svg
+- docs/extensions/aws_19___storage.svg
+- docs/extensions/aws_19_analyti_cs.svg
+- docs/extensions/aws_general.svg
+- docs/extensions/azure2019.svg
+- docs/extensions/azure_cloud.svg
+- docs/extensions/azure_enterprise.svg
+- docs/extensions/azure_vms.svg
+- docs/extensions/basic_network_shapes.svg
+- docs/extensions/beds.svg
+- docs/extensions/bpmn_2_0.svg
+- docs/extensions/cisco_basic.svg
+- docs/extensions/cisco_extended.svg
+- docs/extensions/common_elements.svg
+- docs/extensions/computers_and_monitors.svg
+- docs/extensions/containers.svg
+- docs/extensions/content_delivery.svg
+- docs/extensions/couches.svg
+- docs/extensions/cubicle_walls.svg
+- docs/extensions/data_flow.svg
+- docs/extensions/database.svg
+- docs/extensions/deployment.svg
+- docs/extensions/desks.svg
+- docs/extensions/detailed_network_diagrams.svg
+- docs/extensions/developer_tools.svg
+- docs/extensions/doors_windows.svg
+- docs/extensions/ec2.svg
+- docs/extensions/electrical.svg
+- docs/extensions/electroni_cs.svg
+- docs/extensions/enterprise_application.svg
+- docs/extensions/equipment.svg
+- docs/extensions/ext_shapes.svg
+- docs/extensions/flowchart.svg
+- docs/extensions/geometric_shapes.svg
+- docs/extensions/google_cloud_platform.svg
+- docs/extensions/heat_exchangers.svg
+- docs/extensions/i_os_6_i_pad_controls.svg
+- docs/extensions/i_os_6_i_pad_elements.svg
+- docs/extensions/i_os_6_i_pad_icons.svg
+- docs/extensions/i_os_6_i_phone_controls.svg
+- docs/extensions/i_os_6_i_phone_elements.svg
+- docs/extensions/i_os_6_i_phone_icons.svg
+- docs/extensions/i_os_devices.svg
+- docs/extensions/i_os_icons.svg
+- docs/extensions/i_os_mockups.svg
+- docs/extensions/i_os_ui_components.svg
+- docs/extensions/i_pad_elements.svg
+- docs/extensions/i_phone_elements.svg
+- docs/extensions/information.svg
+- docs/extensions/instruments.svg
+- docs/extensions/internet_of_things.svg
+- docs/extensions/kanban.svg
+- docs/extensions/kitchen.svg
+- docs/extensions/kubernetes_icons.svg
+- docs/extensions/logic_gates.svg
+- docs/extensions/materials.svg
+- docs/extensions/message_routing.svg
+- docs/extensions/message_transformation.svg
+- docs/extensions/messaging_channels.svg
+- docs/extensions/messaging_endpoints.svg
+- docs/extensions/messaging_systems.svg
+- docs/extensions/mind_map.svg
+- docs/extensions/misc.svg
+- docs/extensions/misc_floorplan.svg
+- docs/extensions/miscellaneous.svg
+- docs/extensions/mobile_services.svg
+- docs/extensions/network.svg
+- docs/extensions/networking.svg
+- docs/extensions/on_demand.svg
+- docs/extensions/piping.svg
+- docs/extensions/power_sources.svg
+- docs/extensions/processes.svg
+- docs/extensions/pumps.svg
+- docs/extensions/repeated_from_the_above.svg
+- docs/extensions/restroom.svg
+- docs/extensions/s3.svg
+- docs/extensions/sdks.svg
+- docs/extensions/security_identity.svg
+- docs/extensions/server_racks.svg
+- docs/extensions/shipments.svg
+- docs/extensions/site_map.svg
+- docs/extensions/stairs.svg
+- docs/extensions/standard.svg
+- docs/extensions/system_management.svg
+- docs/extensions/tables_chairs.svg
+- docs/extensions/technology.svg
+- docs/extensions/transistors.svg
+- docs/extensions/ui_containers.svg
+- docs/extensions/ui_input.svg
+- docs/extensions/ui_menus.svg
+- docs/extensions/ui_misc.svg
+- docs/extensions/ui_widgets.svg
+- docs/extensions/uml_class_diagram.svg
+- docs/extensions/uml_component.svg
+- docs/extensions/uml_entity_relationship.svg
+- docs/extensions/uml_sequence.svg
+- docs/extensions/uml_state_activity.svg
+- docs/extensions/uml_use_case.svg
+- docs/extensions/value_stream_mapping.svg
+- docs/extensions/valves.svg
+- docs/extensions/venn_gradient.svg
+- docs/extensions/venn_plain.svg
+- docs/extensions/vessels.svg
 - docs/project-plan.md
 - docs/project_done.svg
 - docs/project_in_progress.svg
@@ -114,6 +273,7 @@ files:
 - docs/samples/grid-direction-horizontal.svg
 - docs/samples/grid-direction-vertical.svg
 - docs/samples/samples.md
+- docs/samples/samples.svg
 - docs/samples/styles-glass.svg
 - docs/samples/styles-plain.svg
 - docs/samples/styles-rounded.svg
@@ -131,6 +291,9 @@ files:
 - lib/drawio_dsl/dom_builder.rb
 - lib/drawio_dsl/dom_builder_shapes.rb
 - lib/drawio_dsl/drawio.rb
+- lib/drawio_dsl/drawio_extensions.json
+- lib/drawio_dsl/drawio_extensions.rb
+- lib/drawio_dsl/drawio_extensions_active.rb
 - lib/drawio_dsl/drawio_shapes.rb
 - lib/drawio_dsl/layout_engine.rb
 - lib/drawio_dsl/schema/_.rb
@@ -181,6 +344,7 @@ files:
 - lib/drawio_dsl/schema/shapes/step.rb
 - lib/drawio_dsl/schema/shapes/tick.rb
 - lib/drawio_dsl/schema/shapes/triangle.rb
+- lib/drawio_dsl/schema/virtual/anchor.rb
 - lib/drawio_dsl/version.rb
 - lib/drawio_dsl/xml_builder.rb
 - package-lock.json