drawio_dsl 0.5.4 → 0.5.7

data/lib/drawio_dsl/drawio.rb

@@ -27,6 +27,7 @@ module DrawioDsl
 
       add(file_name, content: diagram.build, **opts)
 
+      # if last_save_file_name is nil then you are not in execute mode
       @last_save_file_name = k_builder.last_output_file
 
       self
@@ -50,6 +51,21 @@ module DrawioDsl
 
       self
     end
+
+    def export_png(output_file_name, page: 1)
+      return unless last_save_file_name
+      return unless File.exist?(last_save_file_name)
+
+      page -= 1 # use zero based index
+
+      output_file_name = "#{output_file_name}.png" unless output_file_name.end_with?('.png')
+
+      command = "/Applications/draw.io.app/Contents/MacOS/draw.io '#{last_save_file_name}' -p #{page} -x -o #{output_file_name}"
+
+      run_command(command)
+
+      self
+    end
   end
 
   # DrawioDsl::DrawioPage is created when you call .page on the draw-io DSL.

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

@@ -7,11 +7,13 @@ module DrawioDsl
     class Node
       attr_accessor :id
       attr_accessor :page
+      attr_accessor :parent
       attr_accessor :classification
 
       def initialize(page, **args)
         @page = page
         @id = args[:id]
+        @parent = args[:parent]
         @classification = args[:classification] || :unknown
       end
 
@@ -22,6 +24,10 @@ module DrawioDsl
         }
       end
 
+      def root?
+        parent.nil?
+      end
+
       # :nocov:
       # rubocop:disable Metrics/AbcSize
       def debug(format: :detail)

data/lib/drawio_dsl/schema/page.rb

@@ -87,6 +87,10 @@ module DrawioDsl
         end
 
         @nodes = NodeList.new # []
+
+        # add anchor nodes
+        @nodes.add(DrawioDsl::Schema::Anchor.new(self, id: "page_root_#{id}"))
+        @nodes.add(DrawioDsl::Schema::Anchor.new(self, id: "node_root_#{id}"))
       end
       # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/MethodLength
 

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

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

data/lib/drawio_dsl/version.rb

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

data/lib/drawio_dsl/xml_builder.rb

@@ -28,7 +28,7 @@ module DrawioDsl
       end
     end
 
-    # rubocop:disable  Metrics/MethodLength, Metrics/AbcSize, Metrics/BlockLength
+    # rubocop:disable  Metrics/MethodLength, Metrics/AbcSize
     def build_page(xml, page)
       xml.diagram(id: page.id, name: page.name) do
         xml.mxGraphModel(
@@ -50,15 +50,16 @@ 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")
+            # 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
+              # puts node.classification
+              node.as_xml(xml) if %i[shape anchor].include?(node.classification)
             end
           end
         end
       end
     end
-    # rubocop:enable  Metrics/MethodLength, Metrics/AbcSize, Metrics/BlockLength
+    # rubocop:enable  Metrics/MethodLength, Metrics/AbcSize
   end
 end

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "drawio_dsl",
-  "version": "0.5.4",
+  "version": "0.5.7",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "drawio_dsl",
-      "version": "0.5.4",
+      "version": "0.5.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.5.4",
+  "version": "0.5.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.5.4
+  version: 0.5.7
 platform: ruby
 authors:
 - David Cruwys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-08 00:00:00.000000000 Z
+date: 2022-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: k_config
@@ -86,12 +86,13 @@ files:
 - ".builders/generators/01-bootstrap.rb"
 - ".builders/generators/02-generate-app.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"
 - ".builders/generators/sample_diagrams/20-styles.rb"
 - ".builders/generators/sample_diagrams/25-themes.rb"
-- ".builders/generators/sample_diagrams/30-shapes.rb"
 - ".builders/generators/sample_diagrams/50-willoughby-council.rb"
 - ".releaserc.json"
 - ".rspec"
@@ -110,6 +111,21 @@ files:
 - docs/project_done.svg
 - docs/project_in_progress.svg
 - docs/project_todo.svg
+- docs/samples/grid-alignment-center.svg
+- docs/samples/grid-alignment.svg
+- 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
+- docs/samples/styles-shadow.svg
+- docs/samples/styles-sketch.svg
+- docs/samples/themes-circle.svg
+- docs/samples/themes-random.svg
+- docs/samples/themes-square.svg
+- docs/samples/willoughby-council.svg
 - lib/drawio_dsl.rb
 - lib/drawio_dsl/configuration.rb
 - lib/drawio_dsl/configuration_extension.rb
@@ -168,6 +184,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

data/.builders/generators/sample_diagrams/30-shapes.rb

@@ -1,23 +0,0 @@
-KManager.action :bootstrap do
-  action do
-
-    # :rounded, :shadow, :sketch, :glass
-    director = DrawioDsl::Drawio
-      .init(k_builder)
-      .diagram(theme: :style_06)
-      .page('Shapes', margin_left: 0, margin_top: 0) do
-        grid_layout(wrap_at: 5)
-
-        KConfig.configuration.drawio.shapes.members.each do |shape|
-          next if shape == :shape
-
-          send(shape, title: shape.to_s, shape: shape)
-        end
-      end
-
-    diagram = DrawioDsl::XmlBuilder.new(director.builder.diagram)
-
-    File.write('../spec/.samples/drawio/30-shapes.xml', diagram.build)
-    File.write('../spec/.samples/drawio/30-shapes.drawio', diagram.build)
-  end
-end