archimate 1.2.1 → 2.0.0

data/lib/archimate/svg/diagram.rb

@@ -27,7 +27,7 @@ module Archimate
 
       def set_title(svg)
         svg.at_css("title").content = diagram.name || "untitled"
-        svg.at_css("desc").content = diagram.documentation.first&.text || ""
+        svg.at_css("desc").content = diagram.documentation.to_s || ""
       end
 
       # Scan the SVG and figure out min & max

data/lib/archimate/svg/entity/base_entity.rb

@@ -24,20 +24,24 @@ module Archimate
 
         def layer_background_class
           case child.element&.layer
-          when "Strategy"
+          when "Strategy", DataModel::Layers::Strategy
             "archimate-strategy-background"
-          when "Business"
+          when "Business", DataModel::Layers::Business
             "archimate-business-background"
-          when "Application"
+          when "Application", DataModel::Layers::Application
             "archimate-application-background"
-          when "Technology"
+          when "Technology", DataModel::Layers::Technology
             "archimate-infrastructure-background"
-          when "Physical"
+          when "Physical", DataModel::Layers::Physical
             "archimate-physical-background"
-          when "Motivation"
+          when "Motivation", DataModel::Layers::Motivation
             "archimate-motivation-background"
-          when "Implementation and Migration"
+          when "Implementation and Migration", DataModel::Layers::Implementation_and_migration
             "archimate-implementation-background"
+          when "Connectors", DataModel::Layers::Connectors
+            "archimate-connectors-background"
+          else
+            puts "Unexpected layer #{child.element&.layer.inspect}" if child.element&.layer
           end
         end
 
@@ -45,7 +49,7 @@ module Archimate
           optional_link(xml) {
             xml.g(group_attrs) do
               xml.title { xml.text @entity.name } unless @entity.name.nil? || @entity.name.empty?
-              xml.desc { xml.text(@entity.documentation.map(&:text).join("\n\n")) } unless @entity.documentation.empty?
+              xml.desc { xml.text(@entity.documentation.to_s) } if @entity.documentation && !@entity.documentation.empty?
               entity_shape(xml, child.bounds)
               entity_badge(xml)
               entity_label(xml)

data/lib/archimate/svg/entity/data_entity.rb

@@ -10,10 +10,10 @@ module Archimate
         end
 
         def calc_text_bounds(_bounds)
-          @text_bounds = @text_bounds.with(
+          @text_bounds = DataModel::Bounds.new(@text_bounds.to_h.merge(
             y: @text_bounds.top + @margin,
             height: @text_bounds.height - @margin
-          )
+          ))
         end
 
         def entity_shape(xml, bounds)

data/lib/archimate/svg/entity/diagram_model_reference.rb

@@ -8,7 +8,7 @@ module Archimate
           super
           @badge = "#archimate-diagram-model-reference-badge"
           @background_class = "archimate-diagram-model-reference-background"
-          @entity = child.model_element
+          @entity = child.view_refs
         end
 
         def optional_link(xml, &block)

data/lib/archimate/svg/entity/event_entity.rb

@@ -25,10 +25,10 @@ module Archimate
 
         def calc_text_bounds(notch_x)
           bounds = @text_bounds
-          @text_bounds = bounds.with(
+          @text_bounds = DataModel::Bounds.new(bounds.to_h.merge(
             x: bounds.left + notch_x * 0.80,
             width: bounds.width - notch_x
-          )
+          ))
         end
       end
     end

data/lib/archimate/svg/entity/gap.rb

@@ -8,7 +8,7 @@ module Archimate
           super
           @background_class = "archimate-implementation2-background"
           @badge = "#archimate-gap-badge"
-          @badge_bounds = child.bounds.with(
+          @badge_bounds = DataModel::Bounds.new(
             x: child.bounds.right - 25,
             y: child.bounds.top + 5,
             width: 20,

data/lib/archimate/svg/entity/group.rb

@@ -15,7 +15,7 @@ module Archimate
           xml.rect(x: bounds.left, y: bounds.top + group_header_height, width: bounds.width, height: bounds.height - group_header_height, class: background_class, style: shape_style)
           xml.rect(x: bounds.left, y: bounds.top, width: bounds.width / 2.0, height: group_header_height, class: background_class, style: shape_style)
           xml.rect(x: bounds.left, y: bounds.top, width: bounds.width / 2.0, height: group_header_height, class: "archimate-decoration")
-          @text_bounds = bounds.with(height: group_header_height)
+          @text_bounds = DataModel::Bounds.new(bounds.to_h.merge(height: group_header_height))
           @text_align = "left"
         end
       end

data/lib/archimate/svg/entity/motivation_entity.rb

@@ -6,7 +6,7 @@ module Archimate
       class MotivationEntity < BaseEntity
         def initialize(child, bounds_offset)
           super
-          @badge_bounds = child.bounds.with(
+          @badge_bounds = DataModel::Bounds.new(
             x: child.bounds.right - 25,
             y: child.bounds.top + 5,
             width: 20,

data/lib/archimate/svg/entity/node.rb

@@ -15,7 +15,7 @@ module Archimate
         def entity_shape(xml, bounds)
           case child.child_type
           when 1
-            @badge_bounds = bounds.with(
+            @badge_bounds = DataModel::Bounds.new(
               x: bounds.right - 25,
               y: bounds.top + 5,
               width: 20,

data/lib/archimate/svg/entity/rect_entity.rb

@@ -8,7 +8,7 @@ module Archimate
 
         def initialize(child, bounds_offset)
           super
-          @badge_bounds = child.bounds.with(
+          @badge_bounds = DataModel::Bounds.new(
             x: child.bounds.right - 25,
             y: child.bounds.top + 5,
             width: 20,

data/lib/archimate/svg/entity/rounded_rect_entity.rb

@@ -6,7 +6,7 @@ module Archimate
       class RoundedRectEntity < BaseEntity
         def initialize(child, bounds_offset)
           super
-          @badge_bounds = child.bounds.with(
+          @badge_bounds = DataModel::Bounds.new(
             x: child.bounds.right - 25,
             y: child.bounds.top + 5,
             width: 20,

data/lib/archimate/svg/entity/service_entity.rb

@@ -9,7 +9,7 @@ module Archimate
         def initialize(child, bounds_offset)
           super
           bounds = child.bounds
-          @text_bounds = bounds.with(
+          @text_bounds = DataModel::Bounds.new(
             x: bounds.left + 7,
             y: bounds.top + 5,
             width: bounds.width - 14,
@@ -20,7 +20,7 @@ module Archimate
         def entity_shape(xml, bounds)
           case child.child_type
           when 1
-            @badge_bounds = bounds.with(
+            @badge_bounds = DataModel::Bounds.new(
               x: bounds.right - 25,
               y: bounds.top + 5,
               width: 20,

data/lib/archimate/svg/entity/value.rb

@@ -14,12 +14,12 @@ module Archimate
         end
 
         def calc_text_bounds(_bounds)
-          @text_bounds = @text_bounds.with(
+          @text_bounds = DataModel::Bounds.new(@text_bounds.to_h.merge(
             x: @text_bounds.left + 10,
             y: @text_bounds.top + 10,
             width: @text_bounds.width - 20,
             height: @text_bounds.height - 20
-          )
+          ))
         end
       end
     end

data/lib/archimate/svg/path.rb

@@ -0,0 +1,153 @@
+# frozen_string_literal: true
+
+module Archimate
+  module Svg
+    class Path
+      attr_reader :connection
+
+      def initialize(connection)
+        @connection = connection
+      end
+
+      # @return Float length of this path
+      def length
+        segment_lengths.reduce(0) { |total, length| total + length }
+      end
+
+      # @return Point mid-point on Path
+      def midpoint
+        point(0.5)
+      end
+
+      # @param fraction Float 0.0-1.0
+      # @return Point at the given percent along line between start and end
+      def point(fraction)
+        length_from_start = length * fraction
+        segments.each do |a, b|
+          seg_length = b - a
+          if seg_length >= length_from_start
+            pct = length_from_start / seg_length
+            return Point.new(
+              a.x + ((b.x - a.x) * pct),
+              a.y + ((b.y - a.y) * pct)
+            )
+          else
+            length_from_start -= seg_length
+          end
+        end
+        Point.new(0.0, 0.0)
+      end
+
+      # builds the line coordinates for the path
+      # rough drawing is the point at center of first element, point of each bendpoint, and center of end element
+      # First naive implementation
+      # if left/right range of both overlap, use centerpoint of overlap range as x val
+      # if top/bottom range of both overlap, use centerpoint of overlap range as y val
+      def d
+        [move_to(points.first)].concat(points[1..-1].map { |pt| line_to(pt) }).join(" ")
+      end
+
+      def points
+        @points ||= calc_points
+      end
+
+      def segments
+        (0..points.length - 2).map { |i| [points[i], points[i + 1]] }
+      end
+
+      # Returns the lengths of each segment of the line
+      def segment_lengths
+        segments.map { |a, b| b - a }
+      end
+
+      private
+
+      def source_bounds
+        @source_bounds ||= connection.source&.absolute_position || DataModel::Bounds.zero
+      end
+
+      def target_bounds
+        @target_bounds ||= connection.target&.absolute_position || DataModel::Bounds.zero
+      end
+
+      def normalized_bend_points
+        source_bounds_center = source_bounds.center
+        bp_bounds = connection.bendpoints.map do |bp|
+          DataModel::Bounds.new(
+            x: source_bounds_center.x + (bp.x || 0),
+            y: source_bounds_center.y + (bp.y || 0),
+            width: 0,
+            height: 0
+          )
+        end
+        bp_bounds.reject do |bounds|
+          bounds.inside?(source_bounds) || bounds.inside?(target_bounds)
+        end
+      end
+
+      def calc_points
+        bounds = [source_bounds, normalized_bend_points, target_bounds].flatten
+
+        points = []
+        a = bounds.shift
+        until bounds.empty?
+          b = bounds.shift
+          points.concat(bounds_to_points(a, b))
+          a = b
+        end
+        points.uniq
+      end
+
+      # a: Bounds
+      # b: Bounds
+      def bounds_to_points(a, b)
+        ax_range = a.x_range
+        bx_range = b.x_range
+
+        overlap_x_center = ranges_overlap(ax_range, bx_range)
+
+        if overlap_x_center
+          ax = bx = overlap_x_center
+        elsif b.is_right_of?(a)
+          ax = a.right
+          bx = b.left
+        else
+          ax = a.left
+          bx = b.right
+        end
+
+        ay_range = a.y_range
+        by_range = b.y_range
+
+        overlap_y_center = ranges_overlap(ay_range, by_range)
+
+        if overlap_y_center
+          ay = by = overlap_y_center
+        elsif b.is_above?(a)
+          ay = a.top
+          by = b.bottom
+        else
+          ay = a.bottom
+          by = b.top
+        end
+
+        [Point.new(ax, ay), Point.new(bx, by)]
+      end
+
+      def move_to(point)
+        "M #{point.x} #{point.y}"
+      end
+
+      def line_to(point)
+        "L #{point.x} #{point.y}"
+      end
+
+      def ranges_overlap(r1, r2)
+        begin_max = [r1, r2].map(&:begin).max
+        end_min = [r1, r2].map(&:end).min
+        return nil if begin_max > end_min
+        (begin_max + end_min) / 2.0
+      end
+    end
+  end
+end

data/lib/archimate/svg/point.rb

@@ -2,6 +2,13 @@
 
 module Archimate
   module Svg
-    Point = Struct.new(:x, :y)
+    Point = Struct.new(:x, :y) do
+      def -(pt)
+        Math.sqrt(
+          ((pt.x - x) ** 2) +
+          ((pt.y - y) ** 2)
+        )
+      end
+    end
   end
 end

data/lib/archimate/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Archimate
-  VERSION = "1.2.1"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: archimate
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Mark Morga
@@ -10,20 +10,6 @@ bindir: exe
 cert_chain: []
 date: 2017-10-19 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: dry-struct
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
+- !ruby/object:Gem::Dependency
+  name: ruby-enum
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -379,7 +379,11 @@ email:
 - markmorga@gmail.com
 - mmorga@rackspace.com
 executables:
+- archidiff
+- archidiff-summary
 - archimate
+- archimerge
+- fmtxml
 extensions: []
 extra_rdoc_files: []
 files:
@@ -398,7 +402,11 @@ files:
 - bin/archimate
 - bin/console
 - bin/setup
+- exe/archidiff
+- exe/archidiff-summary
 - exe/archimate
+- exe/archimerge
+- exe/fmtxml
 - lib/archimate.rb
 - lib/archimate/cli/archi.rb
 - lib/archimate/cli/cleanup.rb
@@ -413,58 +421,131 @@ files:
 - lib/archimate/data_model.rb
 - lib/archimate/data_model/any_attribute.rb
 - lib/archimate/data_model/any_element.rb
-- lib/archimate/data_model/archimate_node.rb
 - lib/archimate/data_model/bounds.rb
 - lib/archimate/data_model/color.rb
-- lib/archimate/data_model/concept.rb
+- lib/archimate/data_model/comparison.rb
 - lib/archimate/data_model/concern.rb
 - lib/archimate/data_model/connection.rb
-- lib/archimate/data_model/constants.rb
-- lib/archimate/data_model/container.rb
+- lib/archimate/data_model/connector_type.rb
 - lib/archimate/data_model/diagram.rb
-- lib/archimate/data_model/diffable_array.rb
-- lib/archimate/data_model/diffable_primitive.rb
-- lib/archimate/data_model/documentation.rb
+- lib/archimate/data_model/diagram_type.rb
+- lib/archimate/data_model/differentiable.rb
 - lib/archimate/data_model/element.rb
+- lib/archimate/data_model/element_type.rb
 - lib/archimate/data_model/font.rb
-- lib/archimate/data_model/label.rb
 - lib/archimate/data_model/lang_string.rb
+- lib/archimate/data_model/layer.rb
+- lib/archimate/data_model/layers.rb
 - lib/archimate/data_model/location.rb
 - lib/archimate/data_model/metadata.rb
 - lib/archimate/data_model/model.rb
 - lib/archimate/data_model/modeling_note.rb
-- lib/archimate/data_model/named_referenceable.rb
 - lib/archimate/data_model/organization.rb
+- lib/archimate/data_model/preserved_lang_string.rb
 - lib/archimate/data_model/property.rb
 - lib/archimate/data_model/property_definition.rb
 - lib/archimate/data_model/referenceable.rb
+- lib/archimate/data_model/referenceable_collection.rb
 - lib/archimate/data_model/relationship.rb
+- lib/archimate/data_model/relationship_type.rb
 - lib/archimate/data_model/schema_info.rb
 - lib/archimate/data_model/style.rb
-- lib/archimate/data_model/view.rb
-- lib/archimate/data_model/view_concept.rb
 - lib/archimate/data_model/view_node.rb
 - lib/archimate/data_model/viewpoint.rb
+- lib/archimate/data_model/viewpoint_type.rb
 - lib/archimate/export/csv_export.rb
 - lib/archimate/export/cypher.rb
 - lib/archimate/export/graph_ml.rb
+- lib/archimate/export/jsonl.rb
 - lib/archimate/export/n_quads.rb
 - lib/archimate/file_format.rb
-- lib/archimate/file_formats/archi_file_format.rb
 - lib/archimate/file_formats/archi_file_reader.rb
 - lib/archimate/file_formats/archi_file_writer.rb
-- lib/archimate/file_formats/archimate_v2.rb
-- lib/archimate/file_formats/model_exchange_file/xml_lang_string.rb
-- lib/archimate/file_formats/model_exchange_file/xml_metadata.rb
-- lib/archimate/file_formats/model_exchange_file/xml_property_definitions.rb
-- lib/archimate/file_formats/model_exchange_file/xml_property_defs.rb
 - lib/archimate/file_formats/model_exchange_file_reader.rb
-- lib/archimate/file_formats/model_exchange_file_reader_21.rb
-- lib/archimate/file_formats/model_exchange_file_reader_30.rb
-- lib/archimate/file_formats/model_exchange_file_writer.rb
 - lib/archimate/file_formats/model_exchange_file_writer_21.rb
 - lib/archimate/file_formats/model_exchange_file_writer_30.rb
-- lib/archimate/file_formats/writer.rb
+- lib/archimate/file_formats/sax.rb
+- lib/archimate/file_formats/sax/any_element.rb
+- lib/archimate/file_formats/sax/archi/archi_handler_factory.rb
+- lib/archimate/file_formats/sax/archi/bounds.rb
+- lib/archimate/file_formats/sax/archi/connection.rb
+- lib/archimate/file_formats/sax/archi/content.rb
+- lib/archimate/file_formats/sax/archi/diagram.rb
+- lib/archimate/file_formats/sax/archi/element.rb
+- lib/archimate/file_formats/sax/archi/location.rb
+- lib/archimate/file_formats/sax/archi/model.rb
+- lib/archimate/file_formats/sax/archi/organization.rb
+- lib/archimate/file_formats/sax/archi/property.rb
+- lib/archimate/file_formats/sax/archi/relationship.rb
+- lib/archimate/file_formats/sax/archi/style.rb
+- lib/archimate/file_formats/sax/archi/view_node.rb
+- lib/archimate/file_formats/sax/capture_content.rb
+- lib/archimate/file_formats/sax/capture_documentation.rb
+- lib/archimate/file_formats/sax/capture_properties.rb
+- lib/archimate/file_formats/sax/content_element.rb
+- lib/archimate/file_formats/sax/document.rb
+- lib/archimate/file_formats/sax/handler.rb
+- lib/archimate/file_formats/sax/lang_string.rb
+- lib/archimate/file_formats/sax/model_exchange_file/color.rb
+- lib/archimate/file_formats/sax/model_exchange_file/connection.rb
+- lib/archimate/file_formats/sax/model_exchange_file/diagram.rb
+- lib/archimate/file_formats/sax/model_exchange_file/element.rb
+- lib/archimate/file_formats/sax/model_exchange_file/font.rb
+- lib/archimate/file_formats/sax/model_exchange_file/item.rb
+- lib/archimate/file_formats/sax/model_exchange_file/location.rb
+- lib/archimate/file_formats/sax/model_exchange_file/metadata.rb
+- lib/archimate/file_formats/sax/model_exchange_file/model.rb
+- lib/archimate/file_formats/sax/model_exchange_file/model_exchange_handler_factory.rb
+- lib/archimate/file_formats/sax/model_exchange_file/property.rb
+- lib/archimate/file_formats/sax/model_exchange_file/property_definition.rb
+- lib/archimate/file_formats/sax/model_exchange_file/relationship.rb
+- lib/archimate/file_formats/sax/model_exchange_file/schema_info.rb
+- lib/archimate/file_formats/sax/model_exchange_file/style.rb
+- lib/archimate/file_formats/sax/model_exchange_file/view_node.rb
+- lib/archimate/file_formats/sax/no_op.rb
+- lib/archimate/file_formats/sax/preserved_lang_string.rb
+- lib/archimate/file_formats/serializer.rb
+- lib/archimate/file_formats/serializer/archi/bounds.rb
+- lib/archimate/file_formats/serializer/archi/connection.rb
+- lib/archimate/file_formats/serializer/archi/diagram.rb
+- lib/archimate/file_formats/serializer/archi/documentation.rb
+- lib/archimate/file_formats/serializer/archi/element.rb
+- lib/archimate/file_formats/serializer/archi/location.rb
+- lib/archimate/file_formats/serializer/archi/model.rb
+- lib/archimate/file_formats/serializer/archi/organization.rb
+- lib/archimate/file_formats/serializer/archi/property.rb
+- lib/archimate/file_formats/serializer/archi/relationship.rb
+- lib/archimate/file_formats/serializer/archi/view_node.rb
+- lib/archimate/file_formats/serializer/archi/viewpoint_type.rb
+- lib/archimate/file_formats/serializer/model_exchange_file/element.rb
+- lib/archimate/file_formats/serializer/model_exchange_file/location.rb
+- lib/archimate/file_formats/serializer/model_exchange_file/model_exchange_file_writer.rb
+- lib/archimate/file_formats/serializer/model_exchange_file/organization.rb
+- lib/archimate/file_formats/serializer/model_exchange_file/properties.rb
+- lib/archimate/file_formats/serializer/model_exchange_file/relationship.rb
+- lib/archimate/file_formats/serializer/model_exchange_file/style.rb
+- lib/archimate/file_formats/serializer/model_exchange_file/v21/connection.rb
+- lib/archimate/file_formats/serializer/model_exchange_file/v21/diagram.rb
+- lib/archimate/file_formats/serializer/model_exchange_file/v21/item.rb
+- lib/archimate/file_formats/serializer/model_exchange_file/v21/label.rb
+- lib/archimate/file_formats/serializer/model_exchange_file/v21/model.rb
+- lib/archimate/file_formats/serializer/model_exchange_file/v21/organization_body.rb
+- lib/archimate/file_formats/serializer/model_exchange_file/v21/property.rb
+- lib/archimate/file_formats/serializer/model_exchange_file/v21/view_node.rb
+- lib/archimate/file_formats/serializer/model_exchange_file/v30/connection.rb
+- lib/archimate/file_formats/serializer/model_exchange_file/v30/diagram.rb
+- lib/archimate/file_formats/serializer/model_exchange_file/v30/item.rb
+- lib/archimate/file_formats/serializer/model_exchange_file/v30/label.rb
+- lib/archimate/file_formats/serializer/model_exchange_file/v30/model.rb
+- lib/archimate/file_formats/serializer/model_exchange_file/v30/organization_body.rb
+- lib/archimate/file_formats/serializer/model_exchange_file/v30/property.rb
+- lib/archimate/file_formats/serializer/model_exchange_file/v30/property_definitions.rb
+- lib/archimate/file_formats/serializer/model_exchange_file/v30/view_node.rb
+- lib/archimate/file_formats/serializer/named_collection.rb
+- lib/archimate/file_formats/serializer/writer.rb
+- lib/archimate/file_formats/serializer/xml_lang_string.rb
+- lib/archimate/file_formats/serializer/xml_metadata.rb
+- lib/archimate/file_formats/serializer/xml_property_defs.rb
 - lib/archimate/lint/duplicate_entities.rb
 - lib/archimate/lint/linter.rb
 - lib/archimate/logging.rb
@@ -562,6 +643,7 @@ files:
 - lib/archimate/svg/entity/work_package.rb
 - lib/archimate/svg/entity_factory.rb
 - lib/archimate/svg/extents.rb
+- lib/archimate/svg/path.rb
 - lib/archimate/svg/point.rb
 - lib/archimate/svg/svg_template.rb
 - lib/archimate/svg/svg_template.svg.erb