archimate 2.0.2 → 2.0.3

data/lib/archimate/file_formats/serializer/model_exchange_file/v30/model.rb

@@ -25,13 +25,11 @@ module Archimate
             end
 
             def model_attrs(model)
-              remove_nil_values(
-                model.namespaces.merge(
-                  "xsi:schemaLocation" => model.schema_locations.join(" "),
-                  "identifier" => identifier(model.id),
-                  "version" => model.version
-                )
-              )
+              model.namespaces.merge(
+                "xsi:schemaLocation" => model.schema_locations.join(" "),
+                "identifier" => identifier(model.id),
+                "version" => model.version
+              ).compact
             end
           end
         end

data/lib/archimate/file_formats/serializer/model_exchange_file/v30/view_node.rb

@@ -22,8 +22,8 @@ module Archimate
                 identifier: identifier(view_node.id),
                 elementRef: nil,
                 "xsi:type" => view_node.type,
-                "x" => view_node.bounds ? (view_node.bounds&.x + x_offset).round : nil,
-                "y" => view_node.bounds ? (view_node.bounds&.y + y_offset).round : nil,
+                "x" => view_node.bounds ? ((view_node.bounds&.x || 0) + x_offset).round : nil,
+                "y" => view_node.bounds ? ((view_node.bounds&.y || 0) + y_offset).round : nil,
                 "w" => view_node.bounds&.width&.round,
                 "h" => view_node.bounds&.height&.round
               }
@@ -35,7 +35,7 @@ module Archimate
                 attrs[:elementRef] = view_node.view_refs
                 attrs[:type] = "model"
               end
-              remove_nil_values(attrs)
+              attrs.compact
             end
           end
         end

data/lib/archimate/file_formats/serializer/writer.rb

@@ -45,11 +45,6 @@ module Archimate
             end
           end
         end
-
-        def remove_nil_values(h)
-          h.delete_if { |_k, v| v.nil? }
-          h
-        end
       end
     end
   end

data/lib/archimate/file_formats/serializer.rb

@@ -9,18 +9,21 @@ module Archimate
       autoload :XmlMetadata, 'archimate/file_formats/serializer/xml_metadata'
       autoload :XmlPropertyDefs, 'archimate/file_formats/serializer/xml_property_defs'
       module Archi
+        autoload :ArchiFileWriter, 'archimate/file_formats/serializer/archi/archi_file_writer'
+        autoload :ArchiFileWriter3, 'archimate/file_formats/serializer/archi/archi_file_writer_3'
+        autoload :ArchiFileWriter4, 'archimate/file_formats/serializer/archi/archi_file_writer_4'
         autoload :Bounds, 'archimate/file_formats/serializer/archi/bounds'
         autoload :Connection, 'archimate/file_formats/serializer/archi/connection'
         autoload :Diagram, 'archimate/file_formats/serializer/archi/diagram'
         autoload :Documentation, 'archimate/file_formats/serializer/archi/documentation'
         autoload :Element, 'archimate/file_formats/serializer/archi/element'
-        autoload :Location, 'archimate/file_formats/serializer/archi/location'
         autoload :Model, 'archimate/file_formats/serializer/archi/model'
         autoload :Organization, 'archimate/file_formats/serializer/archi/organization'
         autoload :Property, 'archimate/file_formats/serializer/archi/property'
         autoload :Relationship, 'archimate/file_formats/serializer/archi/relationship'
         autoload :ViewNode, 'archimate/file_formats/serializer/archi/view_node'
-        autoload :ViewpointType, 'archimate/file_formats/serializer/archi/viewpoint_type'
+        autoload :Viewpoint3, 'archimate/file_formats/serializer/archi/viewpoint3'
+        autoload :Viewpoint4, 'archimate/file_formats/serializer/archi/viewpoint4'
       end
       module ModelExchangeFile
         autoload :Element, 'archimate/file_formats/serializer/model_exchange_file/element'
@@ -39,6 +42,7 @@ module Archimate
           autoload :OrganizationBody, 'archimate/file_formats/serializer/model_exchange_file/v21/organization_body'
           autoload :Property, 'archimate/file_formats/serializer/model_exchange_file/v21/property'
           autoload :ViewNode, 'archimate/file_formats/serializer/model_exchange_file/v21/view_node'
+          autoload :Viewpoint, 'archimate/file_formats/serializer/model_exchange_file/v21/viewpoint'
         end
         module V30
           autoload :Connection, 'archimate/file_formats/serializer/model_exchange_file/v30/connection'

data/lib/archimate/lint/duplicate_entities.rb

@@ -6,7 +6,7 @@ module Archimate
       a able about above according accordingly across actually after afterwards again against all allow allows
       almost alone along already also although always am among amongst amoungst amount an and another any anybody
       anyhow anyone anything anyway anyways anywhere apart appear appreciate appropriate are around as aside ask
-      asking associated at available away awfully back be became because become becomes becoming been before
+      asking associated at available away awfully be became because become becomes becoming been before
       beforehand behind being believe below beside besides best better between beyond bill both bottom brief but
       by call came can can't cannot cant cause causes certain certainly changes clearly co com come comes computer
       con concerning consequently consider considering contain containing contains corresponding could couldn't
@@ -14,7 +14,7 @@ module Archimate
       does doesn't doing don't done down downwards due during each edu eg eight either eleven else elsewhere empty
       enough entirely especially et etc even ever every everybody everyone everything everywhere ex exactly example
       except far few fifteen fifth fify fill find fire first five followed following follows for former formerly
-      forth forty found four from front full further furthermore get gets getting give given gives go goes going
+      forth forty found four from full further furthermore get gets getting give given gives go goes going
       gone got gotten greetings had hadn't happens hardly has hasn't hasnt have haven't having he he's hello help
       hence her here here's hereafter hereby herein hereupon hers herself hi him himself his hither hopefully how
       howbeit however hundred i i'd i'll i'm i've ie if ignored immediate in inasmuch inc indeed indicate indicated
@@ -85,13 +85,13 @@ module Archimate
           hash[tag] = hash.fetch(tag, []) << entity
         end
         @dupes.delete_if { |_tag, entities| entities.size <= 1 }
-        # @word_count.sort_by(&:last).reverse.each { |ak, av| puts "#{ak}: #{av}" }
         @dupes
       end
 
       def entity_hash_name(entity)
-        layer = entity.layer
-        layer_sort_order = layer ? DataModel::Layers.find_index(layer) : 9
+        layer = entity.respond_to?(:layer) ? entity.layer : nil
+        layer ||= DataModel::Layers::None
+        layer_sort_order = DataModel::Layers.find_index(layer) # layer ? DataModel::Layers.find_index(layer) : 9
         [
           entity.class.name, # Taking advantage of Element being before Relationship
           layer_sort_order.to_s,

data/lib/archimate/lint/linter.rb

@@ -89,13 +89,13 @@ module Archimate
       def invalid_for_viewpoint
         model.diagrams.each_with_object([]) do |diagram, errors|
           next if diagram.total_viewpoint?
-          valid_entity_types = DataModel::ViewpointType::VIEWPOINTS[diagram.viewpoint_type][:entities]
-          valid_relation_types = DataModel::ViewpointType::VIEWPOINTS[diagram.viewpoint_type][:relations]
+          valid_entity_types = diagram.viewpoint&.allowed_element_types || DataModel::Elements.classes
+          valid_relation_types = diagram.viewpoint&.allowed_relationship_types || DataModel::Relationships.classes
           invalid_elements = diagram.all_nodes.reject do |child|
-            child.element&.type.nil? || valid_entity_types.include?(child.element&.type)
+            child.element.nil? || valid_entity_types.include?(child.element.class)
           end
           invalid_relations = diagram.connections.reject do |sc|
-            sc.element&.type.nil? || valid_relation_types.include?(sc.element&.type)
+            sc.element.nil? || valid_relation_types.include?(sc.element.class)
           end
           next unless !invalid_elements.empty? || !invalid_relations.empty?
           errors << format(

data/lib/archimate/maybe_io.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
-## This class passes an IO (or a fake IO) to the given block based on passing
-# either a filename to permit ouput into or nil for a fake IO.
+
+# This class passes an IO (or a fake IO) to the given block based on passing
+# either a filename to permit output into or nil for a fake IO.
 #
 module Archimate
   class MaybeIO

data/lib/archimate/svg/archimate.css

@@ -56,7 +56,6 @@ table.properties>caption {
     float: right;
     height: 20px;
     width: 20px;
-    /*border: 1px solid red;*/
 }
 
 .archimate-icon {
@@ -115,8 +114,8 @@ table.properties>caption {
 }
 
 .archimate-motivation-background {
-    fill: #fecdfe;
-    stroke: #b18fb1;
+    fill: #cccdfd;
+    stroke: #8e8fb1;
 }
 
 .archimate-motivation2-background {
@@ -149,6 +148,12 @@ table.properties>caption {
     stroke: #939696;
 }
 
+.archimate-grouping-background {
+    fill: #ffffff;
+    stroke: #b2b2b2;
+    stroke-dasharray: 8,4;
+}
+
 .archimate-sticky-background {
     fill: #fffeb9;
     stroke: #b2b181;
@@ -185,58 +190,51 @@ table.properties>caption {
     font-size: 9px;
 }
 
-.archimate-assignment-relationship {
+.archimate-assignment {
     marker-end: url(#archimate-filled-arrow);
     marker-start: url(#archimate-dot-marker);
 }
 
-.archimate-composition-relationship {
+.archimate-composition {
     marker-start: url(#archimate-filled-diamond);
 }
 
-.archimate-used-by-relationship {
+.archimate-used-by {
     marker-end: url(#archimate-used-by-arrow);
 }
 
-.archimate-serving-relationship {
+.archimate-serving {
     marker-end: url(#archimate-used-by-arrow);
 }
 
-.archimate-aggregation-relationship {
+.archimate-aggregation {
     marker-start: url(#archimate-hollow-diamond);
 }
 
-.archimate-access-relationship {
+.archimate-access {
     marker-end: url(#archimate-open-arrow);
     stroke-dasharray: 2, 3;
 }
 
-.archimate-realisation-relationship {
+.archimate-realization {
     marker-end: url(#archimate-hollow-arrow);
     stroke-dasharray: 5, 3;
 }
 
-.archimate-specialisation-relationship {
+.archimate-specialization {
     marker-end: url(#archimate-hollow-arrow);
 }
 
-.archimate-influence-relationship {
+.archimate-influence {
     marker-end: url(#archimate-open-arrow);
     stroke-dasharray: 5, 3;
 }
 
-/*, .archimate-association-relationship {
-}
-*/
-.archimate-triggering-relationship {
+.archimate-triggering {
     marker-end: url(#archimate-filled-arrow);
 }
 
-.archimate-flow-relationship {
+.archimate-flow {
     marker-end: url(#archimate-filled-arrow);
     stroke-dasharray: 3, 3;
 }
-
-/*.archimate-default-connection {
-}
-*/

data/lib/archimate/svg/connection.rb

@@ -51,7 +51,7 @@ module Archimate
       end
 
       def text_position
-        case connection.style
+        case connection.style&.text_position
         when 0
           0.1 # "10%"
         when 1

data/lib/archimate/svg/diagram.rb

@@ -66,15 +66,10 @@ module Archimate
         )
       end
 
-      def attr_to_i(node, attr)
-        ival = node.attr(attr)
-        ival.to_i unless ival.nil? || ival.strip.empty?
-      end
-
       def render_elements(svg_node)
         diagram
           .nodes
-          .reduce(svg_node) { |svg, child| Child.new(child).render_elements(svg) }
+          .reduce(svg_node) { |svg, view_node| ViewNode.new(view_node).render_elements(svg) }
       end
 
       def render_connections(svg_node)

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

@@ -3,14 +3,20 @@
 module Archimate
   module Svg
     module Entity
-      # TODO: support alternate appearance
-      class ApplicationComponent < BaseEntity
+      class ApplicationComponent < RectEntity
         def initialize(child, bounds_offset)
           super
+          @badge = "#archimate-app-component-badge"
         end
 
         def entity_shape(xml, bounds)
-          component_path(xml, bounds)
+          case child.child_type
+          when "1"
+            super
+          else
+            component_path(xml, bounds)
+            @badge = nil
+          end
         end
 
         def component_path(xml, bounds)

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

@@ -6,7 +6,6 @@ module Archimate
       class Constraint < MotivationEntity
         def initialize(child, bounds_offset)
           super
-          @background_class = "archimate-motivation2-background"
           @badge = "#archimate-constraint-badge"
         end
       end

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

@@ -7,6 +7,15 @@ module Archimate
         def initialize(child, bounds_offset)
           super
         end
+
+        def entity_shape(xml, bounds)
+          calc_text_bounds(bounds)
+          xml.g(class: background_class) do
+            xml.rect(x: bounds.left, y: bounds.top, width: bounds.width, height: bounds.height, class: background_class, style: shape_style)
+            xml.rect(x: bounds.left, y: bounds.top, width: bounds.width, height: @margin, class: "archimate-decoration")
+            xml.rect(x: bounds.left, y: bounds.top + bounds.height - @margin, width: bounds.width, height: @margin, class: "archimate-decoration")
+          end
+        end
       end
     end
   end

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

@@ -6,7 +6,7 @@ module Archimate
       class DataEntity < BaseEntity
         def initialize(child, bounds_offset)
           super
-          @margin = 10
+          @margin = 8
         end
 
         def calc_text_bounds(_bounds)

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

@@ -12,7 +12,7 @@ module Archimate
 
         def entity_shape(xml, bounds)
           case child.child_type
-          when 1
+          when "1"
             @badge = "#archimate-device-badge"
             node_path(xml, bounds)
           else

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

@@ -3,13 +3,28 @@
 module Archimate
   module Svg
     module Entity
-      class EventEntity < BaseEntity
+      class EventEntity < RoundedRectEntity
+        def initialize(child, bounds_offset)
+          super
+          @badge = "#archimate-event-badge"
+        end
+
         def entity_shape(xml, bounds)
+          case child.child_type
+          when "1"
+            @badge = nil
+            event_path(xml, bounds)
+          else
+            super
+          end
+        end
+
+        def event_path(xml, bounds)
           notch_x = 18
           notch_height = bounds.height / 2.0
           event_width = bounds.width * 0.85
           rx = 17
-          calc_text_bounds(notch_x)
+          calc_event_text_bounds(notch_x)
           xml.path(
             d: [
               "M", bounds.left, bounds.top,
@@ -23,12 +38,14 @@ module Archimate
           )
         end
 
-        def calc_text_bounds(notch_x)
+        def calc_event_text_bounds(notch_x)
           bounds = @text_bounds
-          @text_bounds = DataModel::Bounds.new(bounds.to_h.merge(
-            x: bounds.left + notch_x * 0.80,
-            width: bounds.width - notch_x
-          ))
+          @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/group.rb

@@ -1,4 +1,3 @@
-
 # frozen_string_literal: true
 
 module Archimate
@@ -12,9 +11,29 @@ module Archimate
 
         def entity_shape(xml, bounds)
           group_header_height = 21
-          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")
+          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 = DataModel::Bounds.new(bounds.to_h.merge(height: group_header_height))
           @text_align = "left"
         end

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

@@ -0,0 +1,37 @@
+
+# frozen_string_literal: true
+
+module Archimate
+  module Svg
+    module Entity
+      class Grouping < BaseEntity
+        def initialize(child, bounds_offset)
+          super
+          @background_class = "archimate-grouping-background"
+        end
+
+        def entity_shape(xml, bounds)
+          group_header_height = 21
+          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.path(
+            d: ["M", bounds.left, bounds.top + group_header_height - 1,
+                "v", -(group_header_height - 1),
+                "h", bounds.width / 2,
+                "v", group_header_height - 1].map(&:to_s).join(" "),
+            class: background_class,
+            style: shape_style
+          )
+          @text_bounds = DataModel::Bounds.new(bounds.to_h.merge(height: group_header_height))
+          @text_align = "left"
+        end
+      end
+    end
+  end
+end

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

@@ -11,7 +11,7 @@ module Archimate
 
         def entity_shape(xml, bounds)
           case child.child_type
-          when 1
+          when "1"
             @badge = nil
             elipse_path(xml, bounds)
           else

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

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

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

@@ -6,7 +6,6 @@ module Archimate
       class Outcome < MotivationEntity
         def initialize(child, bounds_offset)
           super
-          @background_class = "archimate-motivation2-background"
           @badge = "#archimate-outcome-badge"
         end
       end

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

@@ -6,7 +6,6 @@ module Archimate
       class Principle < MotivationEntity
         def initialize(child, bounds_offset)
           super
-          @background_class = "archimate-motivation2-background"
           @badge = "#archimate-principle-badge"
         end
       end

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

@@ -11,7 +11,7 @@ module Archimate
 
         def entity_shape(xml, bounds)
           case child.child_type
-          when 1
+          when "1"
             @badge = nil
             process_path(xml, bounds)
           else

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

@@ -6,7 +6,6 @@ module Archimate
       class Requirement < MotivationEntity
         def initialize(child, bounds_offset)
           super
-          @background_class = "archimate-motivation2-background"
           @badge = "#archimate-requirement-badge"
         end
       end

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

@@ -3,12 +3,11 @@
 module Archimate
   module Svg
     module Entity
-      class ServiceEntity < BaseEntity
-        include Rect
-
+      class ServiceEntity < RoundedRectEntity
         def initialize(child, bounds_offset)
           super
           bounds = child.bounds
+          @badge = "#archimate-service-badge"
           @text_bounds = DataModel::Bounds.new(
             x: bounds.left + 7,
             y: bounds.top + 5,
@@ -19,17 +18,11 @@ module Archimate
 
         def entity_shape(xml, bounds)
           case child.child_type
-          when 1
-            @badge_bounds = DataModel::Bounds.new(
-              x: bounds.right - 25,
-              y: bounds.top + 5,
-              width: 20,
-              height: 20
-            )
-            @badge = "#archimate-service-badge"
-            rect_path(xml, bounds)
-          else
+          when "1"
             service_path(xml, bounds)
+            @badge = nil
+          else
+            super
           end
         end
 

data/lib/archimate/svg/entity.rb

@@ -46,6 +46,7 @@ module Archimate
       autoload :Gap, 'archimate/svg/entity/gap'
       autoload :Goal, 'archimate/svg/entity/goal'
       autoload :Group, 'archimate/svg/entity/group'
+      autoload :Grouping, 'archimate/svg/entity/grouping'
       autoload :ImplementationEvent, 'archimate/svg/entity/implementation_event'
       autoload :InfrastructureEvent, 'archimate/svg/entity/infrastructure_event'
       autoload :InfrastructureFunction, 'archimate/svg/entity/infrastructure_function'

data/lib/archimate/svg/entity_factory.rb

@@ -3,13 +3,17 @@
 module Archimate
   module Svg
     module EntityFactory
+      # @todo this is wrong because it depends on `type` attribute
       def make_entity(child, bounds_offset)
-        entity = child.element || child
-        klass_name = entity.type.sub('archimate:', '')
-        klass = Archimate::Svg::Entity.const_get(klass_name)
-        klass.new(child, bounds_offset)
+        if child.element
+          klass_name = child.element.class.name.split("::").last
+        else
+          klass_name = child.type.sub('archimate:', '')
+        end
+        Entity.const_get(klass_name).new(child, bounds_offset)
       rescue NameError
-        puts "Unsupported entity type #{klass_name}"
+        Logging.logger.fatal "Unsupported entity type #{klass_name}"
+        raise
       end
       module_function :make_entity
     end