drawio_dsl 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56780c6c8fa8c1ea29a29e07bf389cf257fd7a33faf52e955b3fe56133367063
-  data.tar.gz: f583d40a64cea1177d7d52ab627dcbfa954cb3091dada0903947f69f5792d3b5
+  metadata.gz: 43e99df9f899e7c7ebeb6618d9b2018cad1a17abf786cf047d918c1eed513f77
+  data.tar.gz: 2b251a9fa966d5447cc8130b1a1b9a2ac90e7f229b5b1aa0d182a233179ec88e
 SHA512:
-  metadata.gz: 92b5c4e8e2a8210c3e2213df96f1d35034689a3d2ff9132e17fc1fa30f68b89551cb395f725e0b1b5da3b506e62471e2e64def33683f8959f53a41a43e4f5805
-  data.tar.gz: 112eb4f963aa4c295559f8d1e8ed0eaf0121bb768282924ca54059c3de4924d16a33b5a3d33dd9044378315840aafda7db34d228aa2064606eccf5d29776da52
+  metadata.gz: d0da48b1461fa48072af5674a689dd9beac83fee630cb2cd656c22a3495fdffd062ec3fffa80dfca57478a240557ac70c456c14adc87b31d6dd2d4930d77dc2e
+  data.tar.gz: 6376e89f6e55ff96b644cbdf23f26000facdad358791f9bfa66eeee4bc7193389cc75c6601c3f5a8cc7a51f24c5717f1985dbcdd86214efbb1cadf5eff991b1e

data/.builders/.data/shapes.json

@@ -0,0 +1,82 @@
+[
+  {
+    "type": "callout",
+    "x": 0,
+    "y": 0,
+    "w": 160,
+    "h": 160,
+    "style_modifiers": "double=1;shape=callout"
+  },
+  {
+    "type": "circle",
+    "x": 0,
+    "y": 0,
+    "w": 160,
+    "h": 160,
+    "style_modifiers": "double=1;ellipse"
+  },
+  {
+    "type": "cloud",
+    "x": 0,
+    "y": 0,
+    "w": 160,
+    "h": 160,
+    "style_modifiers": "double=1;shape=cloud"
+  },
+  {
+    "type": "diamond",
+    "x": 0,
+    "y": 0,
+    "w": 160,
+    "h": 160,
+    "style_modifiers": "double=1;rhombus"
+  },
+  {
+    "type": "ellipse",
+    "x": 0,
+    "y": 0,
+    "w": 200,
+    "h": 120,
+    "style_modifiers": "double=1;ellipse"
+  },
+  {
+    "type": "hexagon",
+    "x": 0,
+    "y": 0,
+    "w": 200,
+    "h": 120,
+    "style_modifiers": "double=1;shape=hexagon"
+  },
+  {
+    "type": "note",
+    "x": 0,
+    "y": 0,
+    "w": 160,
+    "h": 160,
+    "style_modifiers": "double=1;shape=note"
+  },
+  {
+    "type": "process",
+    "x": 0,
+    "y": 0,
+    "w": 200,
+    "h": 120,
+    "style_modifiers": "double=1;shape=process"
+  },
+  {
+    "type": "rectangle",
+    "x": 0,
+    "y": 0,
+    "w": 200,
+    "h": 120,
+    "style_modifiers": ""
+  },
+  {
+    "type": "square",
+    "x": 0,
+    "y": 0,
+    "w": 160,
+    "h": 160,
+    "style_modifiers": ""
+  }
+]

data/.builders/.templates/basic/schema_require.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require_relative 'common_style'
+require_relative 'default_palette'
+require_relative 'diagram'
+require_relative 'node'
+require_relative 'page'
+
+require_relative 'layouts/layout'
+require_relative 'layouts/flex_layout'
+require_relative 'layouts/grid_layout'
+
+require_relative 'shapes/shape'
+{{#each shapes}}
+require_relative 'shapes/{{snake ./type}}'
+{{/each}}

data/.builders/.templates/schema_shape_spec.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+RSpec.describe DrawioDsl::Schema::{{camle type}} do
+  include_context :node_dependencies
+
+  subject { instance }
+
+  let(:instance) { described_class.new(diagram, **args) }
+  let(:args) { { id: 1 } }
+  let(:default) { KConfig.configuration.drawio.shapes.{{snake type}} }
+
+  it_behaves_like :basic_shape_attributes
+end

data/.builders/blueprint/shapes.rb

@@ -2,18 +2,28 @@ KManager.model :shapes, namespace: %i[domain] do
   # microapp = import(:handlebars_helpers, :microapp)
 
   table :shapes do
-    fields :type, :x, :y, :w, :h, :style_modifiers
+    fields [:type, :x, :y, :w, :h, :style_modifiers]
 
     # row :shape      , x: 0, y: 0, w:  20, h:  20, style_modifiers: ''
-    row :square     , x: 0, y: 0, w: 160, h: 160, style_modifiers: ''
-    row :rectangle  , x: 0, y: 0, w: 200, h: 120, style_modifiers: ''
+    row :callout    , x: 0, y: 0, w: 160, h: 160, style_modifiers: 'double=1;shape=callout'
     row :circle     , x: 0, y: 0, w: 160, h: 160, style_modifiers: 'double=1;ellipse'
-    row :process    , x: 0, y: 0, w: 200, h: 120, style_modifiers: 'double=1;shape=process'
-    row :ellipse    , x: 0, y: 0, w: 200, h: 120, style_modifiers: 'double=1;ellipse'
+    row :cloud      , x: 0, y: 0, w: 160, h: 160, style_modifiers: 'double=1;shape=cloud'
     row :diamond    , x: 0, y: 0, w: 160, h: 160, style_modifiers: 'double=1;rhombus'
+    row :ellipse    , x: 0, y: 0, w: 200, h: 120, style_modifiers: 'double=1;ellipse'
     row :hexagon    , x: 0, y: 0, w: 200, h: 120, style_modifiers: 'double=1;shape=hexagon'
-    row :cloud      , x: 0, y: 0, w: 160, h: 160, style_modifiers: 'double=1;shape=cloud'
     row :note       , x: 0, y: 0, w: 160, h: 160, style_modifiers: 'double=1;shape=note'
-    row :callout    , x: 0, y: 0, w: 160, h: 160, style_modifiers: 'double=1;shape=callout'
+    row :process    , x: 0, y: 0, w: 200, h: 120, style_modifiers: 'double=1;shape=process'
+    row :rectangle  , x: 0, y: 0, w: 200, h: 120, style_modifiers: ''
+    row :square     ,  0,  0,  160,  160,  ''
+    
+  end
+
+  action do
+    data = self.raw_data
+    shapes = JSON.pretty_generate(data['shapes'])
+
+    k_builder
+      .cd(:data)
+      .add_file('shapes.json', content: shapes, on_exist: :write)
   end
 end

data/.builders/boot.rb

@@ -45,11 +45,15 @@ KConfig.configure(CONFIG_KEY) do |config|
   base_folder       = File.expand_path('../', builder_folder)
   global_template   = File.expand_path('~/dev/kgems/k_templates/templates')
 
+  # Templates
   config.template_folders.add(:global_template    , global_template)
   config.template_folders.add(:template           , File.expand_path('.templates', Dir.pwd))
 
+  # Target Folders
   config.target_folders.add(:app                  , base_folder)
+  config.target_folders.add(:lib                  , :app, 'lib', 'drawio_dsl')
   config.target_folders.add(:builder              , builder_folder)
+  config.target_folders.add(:data                 , :builder, '.data')
 end
 
 KConfig.configuration(CONFIG_KEY).debug

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

@@ -0,0 +1,35 @@
+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

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [0.4.0](https://github.com/klueless-io/drawio_dsl/compare/v0.3.0...v0.4.0) (2022-03-05)
+
+
+### Features
+
+* big refactor, plus 98% test coverage ([0d1075c](https://github.com/klueless-io/drawio_dsl/commit/0d1075c177ff1441246950aaa7306ef774ba6df4))
+
 # [0.3.0](https://github.com/klueless-io/drawio_dsl/compare/v0.2.0...v0.3.0) (2022-03-04)
 
 

data/lib/drawio_dsl/version.rb

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

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "drawio_dsl",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "drawio_dsl",
-      "version": "0.4.0",
+      "version": "0.4.1",
       "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.0",
+  "version": "0.4.1",
   "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.0
+  version: 0.4.1
 platform: ruby
 authors:
 - David Cruwys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-05 00:00:00.000000000 Z
+date: 2022-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: k_config
@@ -73,17 +73,20 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".builders/.templates/command.rb"
+- ".builders/.data/shapes.json"
+- ".builders/.templates/basic/schema_require.rb"
 - ".builders/.templates/schema_shape.rb"
+- ".builders/.templates/schema_shape_spec.rb"
 - ".builders/_.rb"
 - ".builders/blueprint/shapes.rb"
 - ".builders/boot.rb"
 - ".builders/generators/01-bootstrap.rb"
-- ".builders/generators/10-page-margin.rb"
-- ".builders/generators/15-grid-direction.rb"
-- ".builders/generators/16-grid-alignment.rb"
-- ".builders/generators/20-styles.rb"
-- ".builders/generators/25-themes.rb"
+- ".builders/generators/90-requires.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"
 - ".releaserc.json"
 - ".rspec"
 - ".rubocop.yml"

data/.builders/.templates/command.rb

@@ -1,8 +0,0 @@
-KManager.model :{{command.name}}, namespace: %i[blueprint command] do
-  # microapp = import(:handlebars_helpers, :microapp)
-
-  settings do
-    name                  :{{command.name}}
-    description           "{{command.description}}"
-  end
-end