drawio_dsl 0.5.0 → 0.5.3

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -8,7 +8,10 @@ module DrawioDsl
         attr_reader :shape_defaults
 
         def configure_shape(name)
-          raise "Shape #{name} not found in configuration" unless KConfig.configuration.drawio.shapes.members.include?(name)
+          unless KConfig.configuration.drawio.shapes.members.include?(name)
+            puts "Shape #{name} not found in configuration"
+            return
+          end
 
           config = KConfig.configuration.drawio.shapes[name]
 
@@ -35,6 +38,7 @@ module DrawioDsl
       attr_accessor :gradient
 
       attr_accessor :type
+      attr_accessor :text_only
       attr_accessor :x
       attr_accessor :y
       attr_accessor :w
@@ -66,16 +70,17 @@ module DrawioDsl
         @glass            = args[:glass]            || page.style.glass
 
         @type             = args[:type]             || shape_defaults.type
+        @text_only        = args[:text_only]        || shape_defaults.text_only
         @x                = args[:x]                || shape_defaults.x
         @y                = args[:y]                || shape_defaults.y
         @w                = args[:w]                || shape_defaults.w
         @h                = args[:h]                || shape_defaults.h
         @style_modifiers  = args[:style_modifiers]  || shape_defaults.style_modifiers
 
-        @fill_color       = args[:fill_color]       || theme_palette.fill_color
-        @stroke_color     = args[:stroke_color]     || theme_palette.stroke_color
+        @fill_color       = args[:fill_color]       || (text_only ? nil : theme_palette.fill_color)
+        @stroke_color     = args[:stroke_color]     || (text_only ? nil : theme_palette.stroke_color)
+        @gradient         = args[:gradient]         || (text_only ? nil : theme_palette.gradient)
         @font_color       = args[:font_color]       || theme_palette.font_color
-        @gradient         = args[:gradient]         || theme_palette.gradient
       end
 
       def style
@@ -96,6 +101,12 @@ module DrawioDsl
       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.mxGeometry(x: x, y: y, width: w, height: h, as: 'geometry')
+        end
+      end
+
       def to_h
         {
           id: id,

data/lib/drawio_dsl/version.rb

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

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/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "drawio_dsl",
-  "version": "0.5.0",
+  "version": "0.5.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "drawio_dsl",
-      "version": "0.5.0",
+      "version": "0.5.3",
       "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.0",
+  "version": "0.5.3",
   "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.0
+  version: 0.5.3
 platform: ruby
 authors:
 - David Cruwys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-07 00:00:00.000000000 Z
+date: 2022-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: k_config
@@ -85,12 +85,14 @@ files:
 - ".builders/boot.rb"
 - ".builders/generators/01-bootstrap.rb"
 - ".builders/generators/02-generate-app.rb"
+- ".builders/generators/project_plans/drawio_dsl.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"
@@ -122,6 +124,7 @@ 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
@@ -139,10 +142,20 @@ files:
 - 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/h1.rb
+- lib/drawio_dsl/schema/shapes/h2.rb
+- lib/drawio_dsl/schema/shapes/h3.rb
+- lib/drawio_dsl/schema/shapes/h4.rb
+- lib/drawio_dsl/schema/shapes/h5.rb
+- lib/drawio_dsl/schema/shapes/h6.rb
 - lib/drawio_dsl/schema/shapes/hexagon.rb
 - lib/drawio_dsl/schema/shapes/note.rb
+- lib/drawio_dsl/schema/shapes/p.rb
 - lib/drawio_dsl/schema/shapes/process.rb
 - lib/drawio_dsl/schema/shapes/rectangle.rb
 - lib/drawio_dsl/schema/shapes/rectangle2.rb