drawio_dsl 0.4.1 → 0.5.2

data/lib/drawio_dsl/xml_builder.rb

@@ -52,23 +52,13 @@ module DrawioDsl
           xml.root do
             xml.mxCell(id: "#{page.id}-A")
             xml.mxCell(id: "#{page.id}-B", parent: "#{page.id}-A")
-            page.nodes.each do |node|
-              build_shape(xml, node) if node.classification == :shape
+            page.nodes.all.each do |node|
+              node.as_xml(xml) if node.classification == :shape
             end
           end
         end
       end
     end
     # rubocop:enable  Metrics/MethodLength, Metrics/AbcSize, Metrics/BlockLength
-
-    def build_shape(xml, shape)
-      # puts "opts: #{opts}"
-      # puts shape.x
-      # puts shape.y
-
-      xml.mxCell(id: shape.id, value: shape.title, style: shape.style, vertex: 1, parent: "#{shape.page.id}-B") do
-        xml.mxGeometry(x: shape.x, y: shape.y, width: shape.w, height: shape.h, as: 'geometry')
-      end
-    end
   end
 end

data/lib/drawio_dsl.rb

@@ -7,12 +7,17 @@ require 'k_config'
 require 'k_log'
 require 'k_director'
 
+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/schema/_'
+require_relative 'drawio_dsl/dom_builder_shapes'
 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'
 
 module DrawioDsl

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "drawio_dsl",
-  "version": "0.4.1",
+  "version": "0.5.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "drawio_dsl",
-      "version": "0.4.1",
+      "version": "0.5.2",
       "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.4.1",
+  "version": "0.5.2",
   "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.4.1
+  version: 0.5.2
 platform: ruby
 authors:
 - David Cruwys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-06 00:00:00.000000000 Z
+date: 2022-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: k_config
@@ -74,19 +74,24 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".builders/.data/shapes.json"
+- ".builders/.templates/basic/configuration_shapes.rb"
+- ".builders/.templates/basic/dom_builder_shapes.rb"
+- ".builders/.templates/basic/drawio_shapes.rb"
 - ".builders/.templates/basic/schema_require.rb"
-- ".builders/.templates/schema_shape.rb"
-- ".builders/.templates/schema_shape_spec.rb"
+- ".builders/.templates/basic/schema_shape.rb"
+- ".builders/.templates/basic/schema_shape_spec.rb"
 - ".builders/_.rb"
 - ".builders/blueprint/shapes.rb"
 - ".builders/boot.rb"
 - ".builders/generators/01-bootstrap.rb"
-- ".builders/generators/90-requires.rb"
+- ".builders/generators/02-generate-app.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"
 - ".rubocop.yml"
@@ -102,8 +107,13 @@ files:
 - bin/setup
 - lib/drawio_dsl.rb
 - 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
+- lib/drawio_dsl/drawio_shapes.rb
 - lib/drawio_dsl/layout_engine.rb
 - lib/drawio_dsl/schema/_.rb
 - lib/drawio_dsl/schema/common_style.rb
@@ -113,18 +123,39 @@ files:
 - lib/drawio_dsl/schema/layouts/grid_layout.rb
 - lib/drawio_dsl/schema/layouts/layout.rb
 - lib/drawio_dsl/schema/node.rb
+- lib/drawio_dsl/schema/node_list.rb
 - lib/drawio_dsl/schema/page.rb
+- lib/drawio_dsl/schema/shapes/actor.rb
+- lib/drawio_dsl/schema/shapes/actor2.rb
 - lib/drawio_dsl/schema/shapes/callout.rb
+- lib/drawio_dsl/schema/shapes/callout2.rb
+- lib/drawio_dsl/schema/shapes/callout3.rb
+- lib/drawio_dsl/schema/shapes/callout4.rb
 - lib/drawio_dsl/schema/shapes/circle.rb
 - lib/drawio_dsl/schema/shapes/cloud.rb
+- lib/drawio_dsl/schema/shapes/container.rb
+- lib/drawio_dsl/schema/shapes/container2.rb
+- lib/drawio_dsl/schema/shapes/container3.rb
+- lib/drawio_dsl/schema/shapes/container4.rb
+- lib/drawio_dsl/schema/shapes/cross.rb
 - lib/drawio_dsl/schema/shapes/diamond.rb
+- lib/drawio_dsl/schema/shapes/document.rb
 - lib/drawio_dsl/schema/shapes/ellipse.rb
+- lib/drawio_dsl/schema/shapes/embed_col200.rb
+- lib/drawio_dsl/schema/shapes/embed_col50.rb
+- 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/hexagon.rb
 - lib/drawio_dsl/schema/shapes/note.rb
 - lib/drawio_dsl/schema/shapes/process.rb
 - lib/drawio_dsl/schema/shapes/rectangle.rb
+- lib/drawio_dsl/schema/shapes/rectangle2.rb
 - lib/drawio_dsl/schema/shapes/shape.rb
 - lib/drawio_dsl/schema/shapes/square.rb
+- lib/drawio_dsl/schema/shapes/step.rb
+- lib/drawio_dsl/schema/shapes/tick.rb
+- lib/drawio_dsl/schema/shapes/triangle.rb
 - lib/drawio_dsl/version.rb
 - lib/drawio_dsl/xml_builder.rb
 - package-lock.json

data/.builders/generators/90-requires.rb

@@ -1,35 +0,0 @@
-KManager.action :requires do
-  # NOT yet working on file change
-  # depend_on(:domain_shapes_kdoc)
-
-  # init do
-  #   # context.shapes = import_data(:domain_shapes_kdoc, as: :ostruct)
-  # end
-
-  action do
-    shapes_file = k_builder.target_folders.get_filename(:data, 'shapes.json')
-    shapes = JSON.parse(File.read(shapes_file))
-    puts 'david'
-    KDirector::Dsls::BasicDsl
-      .init(k_builder,
-        on_exist:                   :write,                      # %i[skip write compare]
-        on_action:                  :execute                    # %i[queue execute]
-      )
-      .blueprint(
-        active: true,
-        name: :bin_hook,
-        description: 'initialize repository',
-        on_exist: :write) do
-
-        cd(:lib)
-
-        add('schema/_.rb.txt', template_file: 'schema_require.rb', shapes: shapes)
-      end
-
-
-    # # director.play_actions
-    # director.builder.debug
-    # director.debug
-    # director.k_builder.debug
-  end
-end