drawio_dsl 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5d0f74df30a578aa511a4d9a7ba497839667f25c33d30cb70ec97c42254ec57
-  data.tar.gz: bab21fd8a4c2e2db844e3bf1cba63b6e224778fbe94a029ddaba9fd6fad71539
+  metadata.gz: bc020dbec3ff4115cab4aa60206f9e7321670c6337c6621134b592695f2f8037
+  data.tar.gz: 42f7bab79c6318c124cf457f1f2cabfd3738eff6ba3d8c8066bb486901cb0021
 SHA512:
-  metadata.gz: c1b8da217e0876c4720cf087080ed0d66a332eaecb469ab51548b52f95f923943ea57c1fb2405499456be030ce8144d74667f8ff120a7df7d674b4f138c11945
-  data.tar.gz: 1bf29a42082f521cf04f51cd882bb0f664589f076add43d956ccf636f1c24f57c260bf46721bb4f18b8bf87acb9ed487b0ac77d5fd35d482b9dbd71853f875af
+  metadata.gz: 62b9fa5927e15b638fe9e135fd90b5a304c248f9328a2c42d43079a15b06e839c309ebfa3a356d824fd29fe85bdcf2c02ccbe262dbd1a62aaa8a60ea2cca055d
+  data.tar.gz: 402641432dd415ff7694a3204ba2c5180910bb1f8642ce238c6374b4b2e3d930a93ea5ed4e6a04350cfa98f7c0fb5d7d5b49002022997e77e8c200ce242cfba9

data/.builders/generators/sample_diagrams/50-willoughby-council.rb

@@ -0,0 +1,38 @@
+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, rounded: 1) do
+        grid_layout(wrap_at: 40, direction: :vertical, )
+
+        square(w: 300, h: 100, title: 'PREPARATION FOR INVESTIGATION ')
+        square(w: 300, h: 100, title: '(source: Hunter & Central Coast Regional Environmental Management Strategy – Investigations guideline) ')
+        square(w: 300, h: 100, title: 'Enter report into system')
+        square(w: 300, h: 100, title: 'Preliminary Review ')
+        square(w: 300, h: 100, title: 'Insufficient Information ')
+        square(w: 300, h: 100, title: 'Seek Additional Information ')
+        square(w: 300, h: 100, title: 'Identify Possible Breach ')
+        square(w: 300, h: 100, title: 'Insufficient evidence or no breach detected ')
+        square(w: 300, h: 100, title: 'Plan follow up action ')
+        square(w: 300, h: 100, title: 'Establish Jurisdiction - Council or other agency? ')
+        square(w: 300, h: 100, title: 'Refer to other agency ')
+        square(w: 300, h: 100, title: 'Council Responsibility ')
+        square(w: 300, h: 100, title: 'Plan investigation ')
+        square(w: 300, h: 100, title: 'Conduct investigation Gather and manage evidence (Evidence Gathering Guideline) ')
+        square(w: 300, h: 100, title: 'Prepare recommendations report ')
+        square(w: 300, h: 100, title: 'Make decision ')
+        square(w: 300, h: 100, title: 'Take action (Enforcement Options Guideline) ')
+        square(w: 300, h: 100, title: 'Review investigation ')
+        square(w: 300, h: 100, title: 'Close case ')
+        square(w: 300, h: 100, title: 'Feedback to complainant ')
+      end
+
+    diagram = DrawioDsl::XmlBuilder.new(director.builder.diagram)
+
+    File.write('../spec/.samples/drawio/50-willoughby-council.xml', diagram.build)
+    File.write('../spec/.samples/drawio/50-willoughby-council.drawio', diagram.build)
+  end
+end

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.5.1](https://github.com/klueless-io/drawio_dsl/compare/v0.5.0...v0.5.1) (2022-03-07)
+
+
+### Bug Fixes
+
+* refactor nodes array to nodelist object ([10372a5](https://github.com/klueless-io/drawio_dsl/commit/10372a529e6274bae451dae15626dfbac4b9cccb))
+
 # [0.5.0](https://github.com/klueless-io/drawio_dsl/compare/v0.4.1...v0.5.0) (2022-03-07)
 
 

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

@@ -6,22 +6,28 @@ module DrawioDsl
     class GridLayout < Layout
       attr_accessor :direction
       attr_accessor :wrap_at
-      attr_accessor :grid_size
+      attr_accessor :grid_size # this is an alternative to grid_w/grid_h
+      attr_accessor :grid_w
+      attr_accessor :grid_h
       attr_accessor :cell_no
       attr_accessor :h_align
       attr_accessor :v_align
 
+      # 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
+        @grid_w     = args[:grid_w]     || grid_size
+        @grid_h     = args[:grid_h]     || grid_size
         @h_align    = args[:h_align]    || :center
         @v_align    = args[:v_align]    || :center
         @cell_no    = 1
 
         super(page, **args)
       end
+      # rubocop:enable Metrics/CyclomaticComplexity
 
       def position_shape(shape)
         fire_after_init
@@ -47,7 +53,8 @@ module DrawioDsl
         super.merge(
           direction: direction,
           wrap_at: wrap_at,
-          grid_size: grid_size,
+          grid_w: grid_w,
+          grid_h: grid_h,
           cell_no: cell_no
         )
       end
@@ -56,8 +63,8 @@ module DrawioDsl
 
       # rubocop:disable Metrics/AbcSize
       def horizontal_shape_alignment(shape)
-        return page.position_x + ((grid_size - shape.w) / 2)  if h_align == :center
-        return page.position_x + (grid_size - shape.w)        if h_align == :right
+        return page.position_x + ((grid_w - shape.w) / 2)  if h_align == :center
+        return page.position_x + (grid_w - shape.w)        if h_align == :right
 
         page.position_x
       end
@@ -65,8 +72,8 @@ module DrawioDsl
 
       # rubocop:disable Metrics/AbcSize
       def vertical_shape_alignment(shape)
-        return page.position_y + ((grid_size - shape.h) / 2)  if v_align == :center || v_align == :middle
-        return page.position_y + (grid_size - shape.h)        if v_align == :bottom
+        return page.position_y + ((grid_h - shape.h) / 2)  if v_align == :center || v_align == :middle
+        return page.position_y + (grid_h - shape.h)        if v_align == :bottom
 
         page.position_y
       end
@@ -74,27 +81,27 @@ module DrawioDsl
 
       def move_cell_horizontally
         if cell_no < wrap_at
-          page.position_x += grid_size
+          page.position_x += grid_w
           @cell_no += 1
           return
         end
 
         # Flow down to the next row
         page.position_x = anchor_x
-        page.position_y += grid_size
+        page.position_y += grid_w
         @cell_no = 1
       end
 
       def move_cell_vertically
         if cell_no < wrap_at
-          page.position_y += grid_size
+          page.position_y += grid_h
           @cell_no += 1
           return
         end
 
         # Flow right to the next column
         page.position_y = anchor_y
-        page.position_x += grid_size
+        page.position_x += grid_h
         @cell_no = 1
       end
     end

data/lib/drawio_dsl/version.rb

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

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "drawio_dsl",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "drawio_dsl",
-      "version": "0.5.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.5.1",
+  "version": "0.5.2",
   "description": "DrawIO DSL can build DrawIO diagrams using a Domain Specific Language",
   "scripts": {
     "release": "semantic-release"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drawio_dsl
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - David Cruwys
@@ -91,6 +91,7 @@ files:
 - ".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"