archimate 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f7cec778a203f45d8559a57bebf5ad29fbecfaad296d3c4a0b9fdc47d746baa
-  data.tar.gz: 304983b0c9afd59fdd6f703a0866fc29f716da49681970d3fa3b2736d9f0b8f1
+  metadata.gz: 96bba8c44a533b1b6ab3fd4ed2a9119459fb3a8d3a86e48a49ff7d98b90a981a
+  data.tar.gz: 38360fca023b3984dc031644966353eaa050d60bb0dd7aaec574f46d434c3259
 SHA512:
-  metadata.gz: 5229b50c9b1af5e15e505f331ff197d3cbaf8519b0f93c3f7b636c852b282fcf8c15a9a05311ef7c2e8979c386deed3601be48d201e598e2523b854ec25c6bd6
-  data.tar.gz: 1cbb2a88d904e7a08e756c7ea51ba745a5c0da6dd4deb382359f3638fcdd593da18f1c007db24108e500a86529b6bc7cac4cb8cab791e02848ec09d1db4e3e8e
+  metadata.gz: 361db052df11cad6194370134a755d3f96df232ff40704ea263d2497df0ecdbf4d00e64310eea2021602a0202a56cd4c1901295265a7be69a90509c627d8b224
+  data.tar.gz: 948f1932a4d21f4ef5e61528d08a5bf83287fe81196e088403beb6f61eecf56ba1a30ab621b0d1cc63735fac68027e9fa7b4e5309b7f6ed533e06f8574f0d2f0

data/lib/archimate/data_model/connector_type.rb

@@ -11,7 +11,6 @@ module Archimate
       include Ruby::Enum
 
       define :AndJunction, "AndJunction"
-      define :Junction, "Junction"
       define :OrJunction, "OrJunction"
 
       # Returns true if {other} is a +ConnectorType+

data/lib/archimate/data_model/elements.rb

@@ -713,17 +713,6 @@ module Archimate
         end
       end
 
-      class Junction < Element
-        NAME = "Junction"
-        DESCRIPTION = "A junction is used to connect relationships of the same type."
-        CLASSIFICATION = :active_structure
-        LAYER = Layers::Connectors
-
-        def initialize(args)
-          super
-        end
-      end
-
       class OrJunction < Element
         NAME = "Or Junction"
         DESCRIPTION = "A junction is used to connect relationships of the same type."

data/lib/archimate/data_model/relationships.rb

@@ -163,21 +163,6 @@ module Archimate
         end
       end
 
-      # Junction is a relationship connector
-      # *  All relationships connected with relationship connectors must be of the same type
-      class Junction < Relationship
-        NAME = "Junction"
-        DESCRIPTION = "A junction is used to connect relationships of the same type."
-        WEIGHT = 0
-        CLASSIFICATION = :other
-        VERB = "junction to"
-        OBJECT_VERB = "junction from"
-
-        def initialize(args)
-          super
-        end
-      end
-
       # Junction is a relationship connector
       # *  All relationships connected with relationship connectors must be of the same type
       class AndJunction < Relationship

data/lib/archimate/data_model/viewpoints.rb

@@ -277,7 +277,7 @@ module Archimate
         allowed_relationship_types: [
           Relationships::AndJunction, Relationships::Association,
           Relationships::Composition, Relationships::Flow,
-          Relationships::Junction, Relationships::OrJunction,
+          Relationships::AndJunction, Relationships::OrJunction,
           Relationships::Triggering
         ]
       )

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

@@ -14,7 +14,7 @@ module Archimate
             when "element"
               element_type = Hash[attrs]["xsi:type"].sub(/archimate:/, '')
               case element_type
-              when DataModel::Elements
+              when DataModel::Elements, "Junction"
                 Element
               when DataModel::DiagramType
                 Diagram

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

@@ -26,11 +26,20 @@ module Archimate
             @element ||= DataModel::Elements.create(
               id: @attrs["id"],
               name: DataModel::LangString.string(process_text(@attrs["name"])),
-              type: element_type,
+              type: mapped_element_type,
               documentation: documentation,
               properties: properties
             )
           end
+
+          def mapped_element_type
+            case element_type
+            when "Junction"
+              @attrs["type"] == "or" ? "OrJunction" : "AndJunction"
+            else
+              element_type
+            end
+          end
         end
       end
     end

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

@@ -6,17 +6,29 @@ module Archimate
       module Archi
         module Element
           def serialize_element(xml, element)
-            xml.element(
-              {
-                "xsi:type" => "archimate:#{element.type}",
-                "id" => element.id,
-                "name" => element.name
-              }.compact
-            ) do
+            xml.element(element_attrs(element)) do
               serialize_documentation(xml, element.documentation)
               serialize(xml, element.properties)
             end
           end
+
+          def element_attrs(element)
+            {
+              "xsi:type" => "archimate:#{mapped_element_name(element)}",
+              "id" => element.id,
+              "name" => element.name,
+              "type" => element.is_a?(DataModel::Elements::OrJunction) ? "or" : nil
+            }.compact
+          end
+
+          def mapped_element_name(element)
+            case element
+            when DataModel::Elements::AndJunction, DataModel::Elements::OrJunction
+              "Junction"
+            else
+              element.type
+            end
+          end
         end
       end
     end

data/lib/archimate/lint/duplicate_entities.rb

@@ -50,7 +50,7 @@ module Archimate
         @dupes = nil
         @count = nil
         @word_count = {}
-        @ignored_entity_types = %w[Junction AndJunction OrJunction]
+        @ignored_entity_types = %w[AndJunction OrJunction]
         dupe_list
       end
 

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

@@ -8,6 +8,10 @@ module Archimate
           super
           @background_class = "archimate-junction-background"
         end
+
+        def entity_shape(xml, bounds)
+          xml.circle(cx: bounds.left + bounds.width / 2.0, cy: bounds.top + bounds.height / 2.0, r: bounds.width / 2.0, class: background_class, style: shape_style)
+        end
       end
     end
   end

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

@@ -8,6 +8,10 @@ module Archimate
           super
           @background_class = "archimate-or-junction-background"
         end
+
+        def entity_shape(xml, bounds)
+          xml.circle(cx: bounds.left + bounds.width / 2.0, cy: bounds.top + bounds.height / 2.0, r: bounds.width / 2.0, class: background_class, style: shape_style)
+        end
       end
     end
   end

data/lib/archimate/svg/legend.rb

@@ -85,24 +85,25 @@ module Archimate
         if klass.superclass == DataModel::Element
           element_example(x, y, klass, klass_name, xml)
         elsif klass.superclass == DataModel::Relationship
-          relationship_example(x, y, klass_name, xml)
+          relationship_example(x, y, klass, klass_name, xml)
         end
         element_type_description(klass::DESCRIPTION, text_bounds(x, y), xml)
       end
 
       def element_example(x, y, klass, klass_name, xml)
         case klass_name
-        when "Junction"
+        when "OrJunction"
           r = (element_height - 10) / 4
-
-          xml.circle(cx: x + r, cy: y + r, r: r, style: "fill:#000;stroke:#000")
-          xml.text_(x: x + r * 2 + text_indent, y: y + r + line_height / 2, class: "archimate-legend-title") do
-            xml.text("And Junction")
-          end
-          xml.circle(cx: x + r, cy: y + row_height / 2 + r, r: r, style: "fill:#fff;stroke:#000")
-          xml.text_(x: x + r * 2 + text_indent, y: y + row_height / 2 + r + line_height / 2, class: "archimate-legend-title") do
+          xml.circle(cx: x + r, cy: y + row_height / 2 - r, r: r, style: "fill:#fff;stroke:#000")
+          xml.text_(x: x + r * 2 + text_indent, y: y + row_height / 2 - line_height / 2, class: "archimate-legend-title") do
             xml.text("Or Junction")
           end
+        when "AndJunction"
+          r = (element_height - 10) / 4
+          xml.circle(cx: x + r, cy: y + row_height / 2 - r, r: r, style: "fill:#000;stroke:#000")
+          xml.text_(x: x + r * 2 + text_indent, y: y + row_height / 2 - line_height / 2, class: "archimate-legend-title") do
+            xml.text("And Junction")
+          end
         else
           element = DataModel::Elements.const_get(klass_name).new(id: "legend-element-#{klass_name}", name: klass::NAME)
           view_node = DataModel::ViewNode.new(
@@ -117,7 +118,10 @@ module Archimate
         end
       end
 
-      def relationship_example(x, y, klass_name, xml)
+      def relationship_example(x, y, klass, klass_name, xml)
+        xml.text_(x: x + text_indent, y: y + line_height, class: "archimate-legend-title") do
+          xml.text(klass::NAME)
+        end
         css_class = "archimate-#{klass_name.downcase} archimate-relationship"
         xml.path(d: "M#{x} #{y + row_height / 2} h #{element_width}", class: css_class)
       end

data/lib/archimate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Archimate
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: archimate
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Mark Morga
@@ -618,7 +618,6 @@ files:
 - lib/archimate/svg/entity/infrastructure_service.rb
 - lib/archimate/svg/entity/interaction_entity.rb
 - lib/archimate/svg/entity/interface_entity.rb
-- lib/archimate/svg/entity/junction.rb
 - lib/archimate/svg/entity/location.rb
 - lib/archimate/svg/entity/material.rb
 - lib/archimate/svg/entity/meaning.rb

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

@@ -1,19 +0,0 @@
-
-# frozen_string_literal: true
-
-module Archimate
-  module Svg
-    module Entity
-      class Junction < RectEntity
-        def initialize(child, bounds_offset)
-          super
-          @background_class = "archimate-junction-background"
-        end
-
-        def entity_shape(xml, bounds)
-          xml.circle(cx: bounds.left + bounds.width / 2.0, cy: bounds.top + bounds.height / 2.0, r: bounds.width / 2.0, class: background_class, style: shape_style)
-        end
-      end
-    end
-  end
-end