archimate 2.0.2 → 2.0.3

data/lib/archimate/file_formats/sax/archi/diagram.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "scanf"
 
 module Archimate
@@ -6,6 +7,57 @@ module Archimate
     module Sax
       module Archi
         class Diagram < FileFormats::Sax::Handler
+          VIEWPOINT_INDEX = {
+            "1" => nil, # DataModel::Viewpoints::Actor_cooperation,
+            "2" => DataModel::Viewpoints::Application_behavior,
+            "application_cooperation" => DataModel::Viewpoints::Application_cooperation,
+            "3" => DataModel::Viewpoints::Application_cooperation,
+            "4" => DataModel::Viewpoints::Application_structure,
+            "application_usage" => DataModel::Viewpoints::Application_usage,
+            "5" => DataModel::Viewpoints::Application_usage,
+            "6" => DataModel::Viewpoints::Business_function,
+            "business_process_cooperation" => DataModel::Viewpoints::Business_process_cooperation,
+            "7" => nil, # DataModel::Viewpoints::Business_cooperation,
+            "8" => DataModel::Viewpoints::Business_process,
+            "product" => DataModel::Viewpoints::Product,
+            "9" => DataModel::Viewpoints::Product,
+            "implementation_deployment" => DataModel::Viewpoints::Implementation_and_deployment,
+            "10" => DataModel::Viewpoints::Implementation_and_deployment,
+            "information_structure" => DataModel::Viewpoints::Information_structure,
+            "11" => DataModel::Viewpoints::Information_structure,
+            "12" => DataModel::Viewpoints::Infrastructure_usage,
+            "13" => DataModel::Viewpoints::Infrastructure,
+            "layered" => DataModel::Viewpoints::Layered,
+            "14" => DataModel::Viewpoints::Layered,
+            "organization" => DataModel::Viewpoints::Organization,
+            "15" => DataModel::Viewpoints::Organization,
+            "service_realization" => DataModel::Viewpoints::Service_realization,
+            "16" => DataModel::Viewpoints::Service_realization,
+            "stakeholder" => DataModel::Viewpoints::Stakeholder,
+            "17" => DataModel::Viewpoints::Stakeholder,
+            "goal_realization" => DataModel::Viewpoints::Goal_realization,
+            "18" => DataModel::Viewpoints::Goal_realization,
+            "19" => DataModel::Viewpoints::Goal_contribution,
+            "20" => DataModel::Viewpoints::Principles,
+            "requirements_realization" => DataModel::Viewpoints::Requirements_realization,
+            "21" => DataModel::Viewpoints::Requirements_realization,
+            "motivation" => DataModel::Viewpoints::Motivation,
+            "22" => DataModel::Viewpoints::Motivation,
+            "project" => DataModel::Viewpoints::Project,
+            "23" => DataModel::Viewpoints::Project,
+            "migration" => DataModel::Viewpoints::Migration,
+            "24" => DataModel::Viewpoints::Migration,
+            "implementation_migration" => DataModel::Viewpoints::Implementation_and_migration,
+            "25" => DataModel::Viewpoints::Implementation_and_migration,
+            "capability" => nil, # DataModel::Viewpoints::Capability,
+            "outcome_realization" => DataModel::Viewpoints::Outcome_realization,
+            "physical" => DataModel::Viewpoints::Physical,
+            "resource" => nil, # DataModel::Viewpoints::Resource,
+            "strategy" => DataModel::Viewpoints::Strategy,
+            "technology" => DataModel::Viewpoints::Technology,
+            "technology_usage" => DataModel::Viewpoints::Technology_usage
+          }.freeze
+
           include Sax::CaptureDocumentation
           include Sax::CaptureProperties
 
@@ -31,8 +83,7 @@ module Archimate
             @diagram ||= DataModel::Diagram.new(
               id: @attrs["id"],
               name: DataModel::LangString.string(process_text(@attrs["name"])),
-              viewpoint_type: parse_viewpoint_type(@attrs["viewpoint"]),
-              viewpoint: nil,
+              viewpoint: VIEWPOINT_INDEX.fetch(@attrs["viewpoint"], nil),
               connection_router_type: @attrs["connectionRouterType"],
               type: @attrs["xsi:type"],
               background: @attrs["background"]
@@ -48,17 +99,6 @@ module Archimate
             @connections << connection
             false
           end
-
-          def parse_viewpoint_type(viewpoint_idx)
-            case viewpoint_idx
-            when String
-              idx = viewpoint_idx.scanf("%d").first
-              return nil unless idx
-              Serializer::Archi::ViewpointType.values[idx]
-            else
-              nil
-            end
-          end
         end
       end
     end

data/lib/archimate/file_formats/sax/archi/location.rb

@@ -9,9 +9,7 @@ module Archimate
             super
             @location = DataModel::Location.new(
               x: @attrs["startX"] || 0,
-              y: @attrs["startY"] || 0,
-              end_x: @attrs["endX"],
-              end_y: @attrs["endY"]
+              y: @attrs["startY"] || 0
             )
           end
 

data/lib/archimate/file_formats/sax/model_exchange_file/diagram.rb

@@ -31,8 +31,7 @@ module Archimate
           def diagram
             @diagram ||= DataModel::Diagram.new(
               id: @attrs["identifier"],
-              viewpoint_type: @attrs["viewpoint"],
-              viewpoint: nil,
+              viewpoint: viewpoint,
               connection_router_type: @attrs["connectionRouterType"],
               type: @attrs["xsi:type"],
               background: @attrs["background"]
@@ -53,6 +52,18 @@ module Archimate
             @connections << connection
             false
           end
+
+          VIEWPOINT_MAP = {
+            "Business Process Co-operation" => DataModel::Viewpoints::Business_process_cooperation,
+            "Application Co-operation" => DataModel::Viewpoints::Application_cooperation
+          }.freeze
+
+          def viewpoint
+            viewpoint_attr = @attrs["viewpoint"]&.strip || ""
+            return nil if viewpoint_attr.empty?
+            return VIEWPOINT_MAP[viewpoint_attr] if VIEWPOINT_MAP.include?(viewpoint_attr)
+            DataModel::Viewpoints.with_name(viewpoint_attr)
+          end
         end
       end
     end

data/lib/archimate/file_formats/sax.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Archimate
   module FileFormats
     module Sax

data/lib/archimate/file_formats/serializer/archi/archi_file_writer.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require "nokogiri"
+
+module Archimate
+  module FileFormats
+    module Serializer
+      module Archi
+        class ArchiFileWriter < Serializer::Writer
+          include Serializer::Archi::Bounds
+          include Serializer::Archi::Connection
+          include Serializer::Archi::Diagram
+          include Serializer::Archi::Documentation
+          include Serializer::Archi::Element
+          include Serializer::Archi::Model
+          include Serializer::Archi::Organization
+          include Serializer::Archi::Property
+          include Serializer::Archi::Relationship
+          include Serializer::Archi::ViewNode
+          include Serializer::Archi::Viewpoint3
+
+          TEXT_SUBSTITUTIONS = [
+            ['&#13;', '&#xD;'],
+            ['"', '&quot;'],
+            ['&gt;', '>'],
+            ['&#38;', '&amp;']
+          ].freeze
+
+          def initialize(model)
+            super
+            @version = "3.1.1"
+          end
+
+          def process_text(doc_str)
+            %w(documentation content name).each do |tag|
+              TEXT_SUBSTITUTIONS.each do |from, to|
+                doc_str.gsub!(%r{<#{tag}>([^<]*#{from}[^<]*)</#{tag}>}) do |str|
+                  str.gsub(from, to)
+                end
+              end
+            end
+            doc_str.gsub(
+              %r{<(/)?archimate:}, "<\\1"
+            ).gsub(
+              %r{<(/)?model}, "<\\1archimate:model"
+            )
+          end
+
+          def write(archifile_io)
+            builder = Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |xml|
+              serialize_model(xml, model)
+            end
+            archifile_io.write(
+              process_text(
+                builder.to_xml
+              )
+            )
+          end
+        end
+      end
+    end
+  end
+end

data/lib/archimate/file_formats/serializer/archi/archi_file_writer_3.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Archimate
+  module FileFormats
+    module Serializer
+      module Archi
+        class ArchiFileWriter3 < Serializer::Archi::ArchiFileWriter
+          include Serializer::Archi::Viewpoint3
+
+          def initialize(model)
+            super
+            @version = model.version || "3.1.1"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/archimate/file_formats/serializer/archi/archi_file_writer_4.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Archimate
+  module FileFormats
+    module Serializer
+      module Archi
+        class ArchiFileWriter4 < Serializer::Archi::ArchiFileWriter
+          include Serializer::Archi::Viewpoint4
+
+          def initialize(model)
+            super
+            @version = model.version || "4.0.0"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/archimate/file_formats/serializer/archi/bounds.rb

@@ -8,12 +8,12 @@ module Archimate
           def serialize_bounds(xml, bounds)
             return unless bounds
             xml.bounds(
-              remove_nil_values(
+              {
                 x: bounds.x&.to_i,
                 y: bounds.y&.to_i,
                 width: bounds.width&.to_i,
                 height: bounds.height&.to_i
-              )
+              }.compact
             )
           end
         end

data/lib/archimate/file_formats/serializer/archi/connection.rb

@@ -7,25 +7,36 @@ module Archimate
         module Connection
           def serialize_connection(xml, connection)
             xml.sourceConnection(
-              remove_nil_values(
-                {
-                  "xsi:type" => connection.type,
-                  "id" => connection.id,
-                  "name" => connection.name
-                }.merge(
-                  archi_style_hash(connection.style).merge(
-                    "source" => connection.source&.id,
-                    "target" => connection.target&.id,
-                    "relationship" => connection.relationship&.id
-                  )
+              {
+                "xsi:type" => connection.type,
+                "id" => connection.id,
+                "name" => connection.name
+              }.merge(
+                archi_style_hash(connection.style).merge(
+                  "source" => connection.source&.id,
+                  "target" => connection.target&.id,
+                  "archimateRelationship" => connection.relationship&.id
                 )
-              )
+              ).compact
             ) do
-              serialize(xml, connection.bendpoints)
+              connection.bendpoints.each do |bendpoint|
+                serialize_bendpoint(xml, bendpoint, connection)
+              end
               serialize_documentation(xml, connection.documentation)
               serialize(xml, connection.properties)
             end
           end
+
+          def serialize_bendpoint(xml, bendpoint, connection)
+            xml.bendpoint(
+              {
+                startX: (bendpoint.x - connection.start_location.x).to_i,
+                startY: (bendpoint.y - connection.start_location.y).to_i,
+                endX: (bendpoint.x - connection.end_location.x).to_i,
+                endY: (bendpoint.y - connection.end_location.y).to_i
+              }.delete_if { |_k, v| v.zero? }
+            )
+          end
         end
       end
     end

data/lib/archimate/file_formats/serializer/archi/diagram.rb

@@ -7,14 +7,14 @@ module Archimate
         module Diagram
           def serialize_diagram(xml, diagram)
             xml.element(
-              remove_nil_values(
+              {
                 "xsi:type" => diagram.type || "archimate:ArchimateDiagramModel",
                 "id" => diagram.id,
                 "name" => diagram.name,
                 "connectionRouterType" => diagram.connection_router_type,
-                "viewpoint" => ViewpointType.values.index(diagram.viewpoint_type)&.to_s,
+                "viewpoint" => serialize_viewpoint(diagram.viewpoint),
                 "background" => diagram.background
-              )
+              }.compact
             ) do
               serialize(xml, diagram.nodes)
               serialize_documentation(xml, diagram.documentation)

data/lib/archimate/file_formats/serializer/archi/element.rb

@@ -7,11 +7,11 @@ module Archimate
         module Element
           def serialize_element(xml, element)
             xml.element(
-              remove_nil_values(
+              {
                 "xsi:type" => "archimate:#{element.type}",
                 "id" => element.id,
                 "name" => element.name
-              )
+              }.compact
             ) do
               serialize_documentation(xml, element.documentation)
               serialize(xml, element.properties)

data/lib/archimate/file_formats/serializer/archi/organization.rb

@@ -7,7 +7,7 @@ module Archimate
         module Organization
           def serialize_organization(xml, organization)
             xml.folder(
-              remove_nil_values(name: organization.name, id: organization.id, type: organization.type)
+              { name: organization.name, id: organization.id, type: organization.type }.compact
             ) do
               serialize(xml, organization.organizations)
               serialize_documentation(xml, organization.documentation)

data/lib/archimate/file_formats/serializer/archi/property.rb

@@ -6,7 +6,7 @@ module Archimate
       module Archi
         module Property
           def serialize_property(xml, property)
-            xml.property(remove_nil_values(key: property.key, value: property.value))
+            xml.property({ key: property.key, value: property.value }.compact)
           end
         end
       end

data/lib/archimate/file_formats/serializer/archi/relationship.rb

@@ -7,14 +7,14 @@ module Archimate
         module Relationship
           def serialize_relationship(xml, rel)
             xml.element(
-              remove_nil_values(
+              {
                 "xsi:type" => "archimate:#{rel.type}Relationship",
                 "id" => rel.id,
                 "name" => rel.name,
                 "source" => rel.source.id,
                 "target" => rel.target.id,
                 "accessType" => serialize_access_type(rel.access_type)
-              )
+              }.compact
             ) do
               serialize_documentation(xml, rel.documentation)
               serialize(xml, rel.properties)

data/lib/archimate/file_formats/serializer/archi/view_node.rb

@@ -5,32 +5,30 @@ module Archimate
     module Serializer
       module Archi
         module ViewNode
-          def serialize_view_node(xml, child)
-            style_hash = archi_style_hash(child.style)
+          def serialize_view_node(xml, view_node)
+            style_hash = archi_style_hash(view_node.style)
             fill_color = style_hash.delete("fillColor")
             xml.child(
-              remove_nil_values(
-                {
-                  "xsi:type" => child.type,
-                  "id" => child.id,
-                  "name" => child.name
-                }.merge(
-                  style_hash.merge(
-                    "targetConnections" => child.target_connections.empty? ? nil : child.target_connections.join(" "),
-                    "fillColor" => fill_color,
-                    "model" => child.view_refs&.id,
-                    "archimateElement" => child.element&.id,
-                    "type" => child.child_type
-                  )
+              {
+                "xsi:type" => view_node.type,
+                "id" => view_node.id,
+                "name" => view_node.name
+              }.merge(
+                style_hash.merge(
+                  "targetConnections" => view_node.target_connections.empty? ? nil : view_node.target_connections.join(" "),
+                  "fillColor" => fill_color,
+                  "model" => view_node.view_refs&.id,
+                  "archimateElement" => view_node.element&.id,
+                  "type" => view_node.child_type
                 )
-              )
+              ).compact
             ) do
-              serialize_bounds(xml, child.bounds)
-              serialize(xml, child.connections)
-              xml.content { xml.text child.content } if child.content
-              serialize(xml, child.nodes)
-              serialize_documentation(xml, child.documentation)
-              serialize(xml, child.properties)
+              serialize_bounds(xml, view_node.bounds)
+              serialize(xml, (view_node.connections + view_node.diagram.connections.select { |conn| conn.source.id == view_node.id }).uniq)
+              xml.content { xml.text view_node.content } if view_node.content
+              serialize(xml, view_node.nodes)
+              serialize_documentation(xml, view_node.documentation)
+              serialize(xml, view_node.properties)
             end
           end
 

data/lib/archimate/file_formats/serializer/archi/viewpoint3.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Archimate
+  module FileFormats
+    module Serializer
+      module Archi
+        module Viewpoint3
+          VIEWPOINT_INDEX = {
+            # nil => "1", # DataModel::Viewpoints::Actor_cooperation,
+            DataModel::Viewpoints::Application_behavior => "2",
+            DataModel::Viewpoints::Application_cooperation => "3",
+            DataModel::Viewpoints::Application_structure => "4",
+            DataModel::Viewpoints::Application_usage => "5",
+            DataModel::Viewpoints::Business_function => "6",
+            # nil => "7", # DataModel::Viewpoints::Business_cooperation,
+            DataModel::Viewpoints::Business_process => "8",
+            DataModel::Viewpoints::Product => "9",
+            DataModel::Viewpoints::Implementation_and_deployment => "10",
+            DataModel::Viewpoints::Information_structure => "11",
+            DataModel::Viewpoints::Infrastructure_usage => "12",
+            DataModel::Viewpoints::Infrastructure => "13",
+            DataModel::Viewpoints::Layered => "14",
+            DataModel::Viewpoints::Organization => "15",
+            DataModel::Viewpoints::Service_realization => "16",
+            DataModel::Viewpoints::Stakeholder => "17",
+            DataModel::Viewpoints::Goal_realization => "18",
+            DataModel::Viewpoints::Goal_contribution => "19",
+            DataModel::Viewpoints::Principles => "20",
+            DataModel::Viewpoints::Requirements_realization => "21",
+            DataModel::Viewpoints::Motivation => "22",
+            DataModel::Viewpoints::Project => "23",
+            DataModel::Viewpoints::Migration => "24",
+            DataModel::Viewpoints::Implementation_and_migration => "25"
+          }.freeze
+
+          def serialize_viewpoint(viewpoint)
+            VIEWPOINT_INDEX.fetch(viewpoint, nil)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/archimate/file_formats/serializer/archi/viewpoint4.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Archimate
+  module FileFormats
+    module Serializer
+      module Archi
+        module Viewpoint4
+          VIEWPOINT_INDEX = {
+            DataModel::Viewpoints::Application_cooperation => "application_cooperation",
+            DataModel::Viewpoints::Application_usage => "application_usage",
+            DataModel::Viewpoints::Business_process_cooperation => "business_process_cooperation",
+            DataModel::Viewpoints::Product => "product",
+            DataModel::Viewpoints::Implementation_and_deployment => "implementation_deployment",
+            DataModel::Viewpoints::Information_structure => "information_structure",
+            DataModel::Viewpoints::Layered => "layered",
+            DataModel::Viewpoints::Organization => "organization",
+            DataModel::Viewpoints::Service_realization => "service_realization",
+            DataModel::Viewpoints::Stakeholder => "stakeholder",
+            DataModel::Viewpoints::Goal_realization => "goal_realization",
+            DataModel::Viewpoints::Requirements_realization => "requirements_realization",
+            DataModel::Viewpoints::Motivation => "motivation",
+            DataModel::Viewpoints::Project => "project",
+            DataModel::Viewpoints::Migration => "migration",
+            DataModel::Viewpoints::Implementation_and_migration => "implementation_migration",
+            # DataModel::Viewpoints::Capability => "capability",
+            DataModel::Viewpoints::Outcome_realization => "outcome_realization",
+            DataModel::Viewpoints::Physical => "physical",
+            # DataModel::Viewpoints::Resource => "resource",
+            DataModel::Viewpoints::Strategy => "strategy",
+            DataModel::Viewpoints::Technology => "technology",
+            DataModel::Viewpoints::Technology_usage => "technology_usage"
+          }.freeze
+
+          def serialize_viewpoint(viewpoint)
+            VIEWPOINT_INDEX.fetch(viewpoint, nil)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/archimate/file_formats/serializer/model_exchange_file/style.rb

@@ -7,11 +7,7 @@ module Archimate
         module Style
           def serialize_style(xml, style)
             return unless style
-            xml.style(
-              remove_nil_values(
-                lineWidth: style.line_width
-              )
-            ) do
+            xml.style({ lineWidth: style.line_width }.compact) do
               serialize_color(xml, style.fill_color, :fillColor)
               serialize_color(xml, style.line_color, :lineColor)
               serialize_font(xml, style)
@@ -22,11 +18,11 @@ module Archimate
           def serialize_font(xml, style)
             return unless style && (style.font || style.font_color)
             xml.font(
-              remove_nil_values(
+              {
                 name: style.font&.name,
                 size: style.font&.size&.round,
                 style: font_style_string(style.font)
-              )
+              }.compact
             ) { serialize_color(xml, style&.font_color, :color) }
           end
 

data/lib/archimate/file_formats/serializer/model_exchange_file/v21/diagram.rb

@@ -8,11 +8,11 @@ module Archimate
           module Diagram
             def serialize_diagram(xml, diagram)
               xml.view(
-                remove_nil_values(
+                {
                   identifier: identifier(diagram.id),
-                  viewpoint: diagram.viewpoint_type,
+                  viewpoint: viewpoint_attribute(diagram.viewpoint),
                   "xsi:type": diagram.type
-                )
+                }.compact
               ) do
                 elementbase(xml, diagram)
                 serialize(xml, diagram.nodes)

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

@@ -14,7 +14,7 @@ module Archimate
                 serialize_properties(xml, model)
                 Serializer::NamedCollection.new("elements", model.elements).serialize(xml) { |xml_e, elements| serialize(xml_e, elements) }
                 Serializer::NamedCollection.new("relationships", model.relationships).serialize(xml) { |xml_r, relationships| serialize(xml_r, relationships) }
-                NamedCollection.new("organization", model.organizations).serialize(xml) { |xml_o, orgs|  serialize(xml_o, orgs) }
+                NamedCollection.new("organization", model.organizations).serialize(xml) { |xml_o, orgs| serialize(xml_o, orgs) }
                 Serializer::XmlPropertyDefs.new(model.property_definitions).serialize(xml)
                 NamedCollection.new("views", model.diagrams).serialize(xml) do |xml_v, diagrams|
                   serialize(xml_v, diagrams)
@@ -24,7 +24,14 @@ module Archimate
 
             def model_attrs
               model.namespaces.merge(
-                "xsi:schemaLocation" => model.schema_locations.join(" "),
+                "xmlns" => "http://www.opengroup.org/xsd/archimate",
+                "xmlns:dc" => "http://purl.org/dc/elements/1.1/",
+                "xmlns:xsi" => "http://www.w3.org/2001/XMLSchema-instance",
+                "xsi:schemaLocation" => %w[http://www.opengroup.org/xsd/archimate
+                                           http://www.opengroup.org/xsd/archimate/archimate_v2p1.xsd
+                                           http://purl.org/dc/elements/1.1/
+                                           http://dublincore.org/schemas/xmls/qdc/2008/02/11/dc.xsd].join(" "),
+                # "xsi:schemaLocation" => model.schema_locations.join(" "),
                 "identifier" => identifier(model.id)
               )
             end

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

@@ -34,7 +34,7 @@ module Archimate
                 # the elementref for views in views
                 attrs[:elementref] = view_node.view_refs
               end
-              remove_nil_values(attrs)
+              attrs.compact
             end
           end
         end

data/lib/archimate/file_formats/serializer/model_exchange_file/v21/viewpoint.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Archimate
+  module FileFormats
+    module Serializer
+      module ModelExchangeFile
+        module V21
+          module Viewpoint
+            VIEWPOINT_MAP = {
+              "Business Process Co-operation" => DataModel::Viewpoints::Business_process_cooperation,
+              "Application Co-operation" => DataModel::Viewpoints::Application_cooperation
+            }.freeze
+
+            def viewpoint_attribute(viewpoint)
+              return nil unless viewpoint
+              VIEWPOINT_MAP.key(viewpoint) || viewpoint.name.to_s
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -8,11 +8,11 @@ module Archimate
           module Diagram
             def serialize_diagram(xml, diagram)
               xml.view(
-                remove_nil_values(
+                {
                   identifier: identifier(diagram.id),
                   "xsi:type": diagram.type,
-                  viewpoint: diagram.viewpoint_type
-                )
+                  viewpoint: diagram.viewpoint&.name
+                }.compact
               ) do
                 elementbase(xml, diagram)
                 serialize(xml, diagram.nodes)