drawio_dsl 0.4.1 → 0.5.2

data/lib/drawio_dsl/drawio_shapes.rb

@@ -0,0 +1,193 @@
+# frozen_string_literal: true
+
+module DrawioDsl
+  # DrawioDsl::Shapes is a list of DSL methods (one per shape)
+  # :nocov:
+  module DrawioShapes
+    def random(**opts)
+      case rand(30)
+      when 0
+        actor(**opts)
+      when 1
+        actor2(**opts)
+      when 2
+        callout(**opts)
+      when 3
+        callout2(**opts)
+      when 4
+        callout3(**opts)
+      when 5
+        callout4(**opts)
+      when 6
+        circle(**opts)
+      when 7
+        cloud(**opts)
+      when 8
+        cross(**opts)
+      when 9
+        envelop(**opts)
+      when 10
+        diamond(**opts)
+      when 11
+        document(**opts)
+      when 12
+        ellipse(**opts)
+      when 13
+        hexagon(**opts)
+      when 14
+        container(**opts)
+      when 15
+        container2(**opts)
+      when 16
+        container3(**opts)
+      when 17
+        container4(**opts)
+      when 18
+        note(**opts)
+      when 19
+        process(**opts)
+      when 20
+        rectangle(**opts)
+      when 21
+        rectangle2(**opts)
+      when 22
+        square(**opts)
+      when 23
+        step(**opts)
+      when 24
+        tick(**opts)
+      when 25
+        face(**opts)
+      when 26
+        triangle(**opts)
+      when 27
+        embed_row(**opts)
+      when 28
+        embed_col50(**opts)
+      when 29
+        embed_col200(**opts)
+      end
+    end
+
+    def actor(**opts)
+      builder.add_actor(**opts)
+    end
+
+    def actor2(**opts)
+      builder.add_actor2(**opts)
+    end
+
+    def callout(**opts)
+      builder.add_callout(**opts)
+    end
+
+    def callout2(**opts)
+      builder.add_callout2(**opts)
+    end
+
+    def callout3(**opts)
+      builder.add_callout3(**opts)
+    end
+
+    def callout4(**opts)
+      builder.add_callout4(**opts)
+    end
+
+    def circle(**opts)
+      builder.add_circle(**opts)
+    end
+
+    def cloud(**opts)
+      builder.add_cloud(**opts)
+    end
+
+    def cross(**opts)
+      builder.add_cross(**opts)
+    end
+
+    def envelop(**opts)
+      builder.add_envelop(**opts)
+    end
+
+    def diamond(**opts)
+      builder.add_diamond(**opts)
+    end
+
+    def document(**opts)
+      builder.add_document(**opts)
+    end
+
+    def ellipse(**opts)
+      builder.add_ellipse(**opts)
+    end
+
+    def hexagon(**opts)
+      builder.add_hexagon(**opts)
+    end
+
+    def container(**opts)
+      builder.add_container(**opts)
+    end
+
+    def container2(**opts)
+      builder.add_container2(**opts)
+    end
+
+    def container3(**opts)
+      builder.add_container3(**opts)
+    end
+
+    def container4(**opts)
+      builder.add_container4(**opts)
+    end
+
+    def note(**opts)
+      builder.add_note(**opts)
+    end
+
+    def process(**opts)
+      builder.add_process(**opts)
+    end
+
+    def rectangle(**opts)
+      builder.add_rectangle(**opts)
+    end
+
+    def rectangle2(**opts)
+      builder.add_rectangle2(**opts)
+    end
+
+    def square(**opts)
+      builder.add_square(**opts)
+    end
+
+    def step(**opts)
+      builder.add_step(**opts)
+    end
+
+    def tick(**opts)
+      builder.add_tick(**opts)
+    end
+
+    def face(**opts)
+      builder.add_face(**opts)
+    end
+
+    def triangle(**opts)
+      builder.add_triangle(**opts)
+    end
+
+    def embed_row(**opts)
+      builder.add_embed_row(**opts)
+    end
+
+    def embed_col50(**opts)
+      builder.add_embed_col50(**opts)
+    end
+
+    def embed_col200(**opts)
+      builder.add_embed_col200(**opts)
+    end
+  end
+  # :nocov:
+end

data/lib/drawio_dsl/layout_engine.rb

@@ -14,22 +14,15 @@ module DrawioDsl
     attr_reader :current_page
     attr_reader :current_layout
 
-    # attr_reader :page_margin_top
-    # attr_reader :page_margin_left
-    # attr_reader :x
-    # attr_reader :y
-
     def initialize(page)
       @page = page
-      # @x = 0
-      # @y = 0
     end
 
     def call
       page.position_x = page.margin_left
       page.position_y = page.margin_top
 
-      page.nodes.each do |node|
+      page.nodes.all.each do |node|
         case node.classification
         when :layout_rule
           @current_layout = node

data/lib/drawio_dsl/schema/_.rb

@@ -4,6 +4,7 @@ require_relative 'common_style'
 require_relative 'default_palette'
 require_relative 'diagram'
 require_relative 'node'
+require_relative 'node_list'
 require_relative 'page'
 
 require_relative 'layouts/layout'
@@ -11,13 +12,33 @@ require_relative 'layouts/flex_layout'
 require_relative 'layouts/grid_layout'
 
 require_relative 'shapes/shape'
+require_relative 'shapes/actor'
+require_relative 'shapes/actor2'
 require_relative 'shapes/callout'
+require_relative 'shapes/callout2'
+require_relative 'shapes/callout3'
+require_relative 'shapes/callout4'
 require_relative 'shapes/circle'
 require_relative 'shapes/cloud'
+require_relative 'shapes/cross'
+require_relative 'shapes/envelop'
 require_relative 'shapes/diamond'
+require_relative 'shapes/document'
 require_relative 'shapes/ellipse'
 require_relative 'shapes/hexagon'
+require_relative 'shapes/container'
+require_relative 'shapes/container2'
+require_relative 'shapes/container3'
+require_relative 'shapes/container4'
 require_relative 'shapes/note'
 require_relative 'shapes/process'
 require_relative 'shapes/rectangle'
+require_relative 'shapes/rectangle2'
 require_relative 'shapes/square'
+require_relative 'shapes/step'
+require_relative 'shapes/tick'
+require_relative 'shapes/face'
+require_relative 'shapes/triangle'
+require_relative 'shapes/embed_row'
+require_relative 'shapes/embed_col50'
+require_relative 'shapes/embed_col200'

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/schema/node_list.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module DrawioDsl
+  module Schema
+    class NodeList
+      attr_reader :nodes
+
+      def initialize
+        @nodes = []
+      end
+
+      def add(node)
+        @nodes << node
+      end
+
+      def all
+        @nodes
+      end
+
+      def shapes
+        @nodes.select { |node| node.is_a?(DrawioDsl::Schema::Shape) }
+      end
+
+      def layouts
+        @nodes.select { |node| node.is_a?(DrawioDsl::Schema::Layout) }
+      end
+
+      def length
+        @nodes.length
+      end
+
+      def to_h
+        @nodes.map(&:to_h)
+      end
+    end
+  end
+end

data/lib/drawio_dsl/schema/page.rb

@@ -86,13 +86,13 @@ module DrawioDsl
           @gradient     ||= theme_palette.gradient
         end
 
-        @nodes = args[:nodes] || []
+        @nodes = NodeList.new # []
       end
       # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/MethodLength
 
-      def shapes
-        @nodes.select { |node| node.is_a?(DrawioDsl::Schema::Shape) }
-      end
+      # def shapes
+      #   nodes.shapes
+      # end
 
       def to_h
         {
@@ -104,7 +104,7 @@ module DrawioDsl
           palette: palette.to_h,
           style: style.to_h,
           settings: settings,
-          nodes: nodes.map(&:to_h)
+          nodes: nodes.to_h
         }
       end
 

data/{.builders/.templates/schema_shape.rb → lib/drawio_dsl/schema/shapes/actor.rb}

@@ -2,8 +2,8 @@
 
 module DrawioDsl
   module Schema
-    class {{camle type}} < Shape
-      configure_shape(:{{snake type}})
+    class Actor < Shape
+      configure_shape(:actor)
     end
   end
 end

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -5,6 +5,8 @@ module DrawioDsl
     # Shape is a graphical element, it can be a shape, a text, or a group (todo)
     class Shape < Node
       class << self
+        attr_reader :shape_defaults
+
         def configure_shape(name)
           raise "Shape #{name} not found in configuration" unless KConfig.configuration.drawio.shapes.members.include?(name)
 
@@ -12,12 +14,6 @@ module DrawioDsl
 
           @shape_defaults = config.clone
         end
-
-        def shape_defaults
-          return @shape_defaults if defined? @shape_defaults
-
-          raise 'Shape defaults not configured'
-        end
       end
 
       configure_shape(:shape)
@@ -100,6 +96,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,
@@ -113,6 +115,7 @@ module DrawioDsl
         }
       end
 
+      # :nocov:
       def debug(format: :detail)
         if format == :detail
           debug_detail({ id: id, classification: classification, type: type })
@@ -120,6 +123,7 @@ module DrawioDsl
           debug_row(classification, id, type, x, y, w, h)
         end
       end
+      # :nocov:
     end
   end
 end

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

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

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

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

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

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

data/lib/drawio_dsl/version.rb

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