archimate 2.0.1 → 2.0.2

data/lib/archimate/svg/archimate.css

@@ -69,6 +69,11 @@ table.properties>caption {
     stroke: #999;
 }
 
+.archimate-location-background {
+    fill: #f9b77a;
+    stroke: #ae8055;
+}
+
 .archimate-strategy-background {
     fill: #eddfac;
     stroke: #44423b;
@@ -181,7 +186,7 @@ table.properties>caption {
 }
 
 .archimate-assignment-relationship {
-    marker-end: url(#archimate-dot-marker);
+    marker-end: url(#archimate-filled-arrow);
     marker-start: url(#archimate-dot-marker);
 }
 
@@ -215,7 +220,12 @@ table.properties>caption {
     marker-end: url(#archimate-hollow-arrow);
 }
 
-/*.archimate-influence-relationship, .archimate-association-relationship {
+.archimate-influence-relationship {
+    marker-end: url(#archimate-open-arrow);
+    stroke-dasharray: 5, 3;
+}
+
+/*, .archimate-association-relationship {
 }
 */
 .archimate-triggering-relationship {

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

@@ -17,49 +17,26 @@ module Archimate
           @text_bounds = child.bounds.reduced_by(2)
           @bounds_offset = bounds_offset
           @entity = @child.element || @child
-          @background_class = layer_background_class
+          @background_class = @child&.element&.layer&.background_class
           @text_align = nil
           @badge = nil
         end
 
-        def layer_background_class
-          case child.element&.layer
-          when "Strategy", DataModel::Layers::Strategy
-            "archimate-strategy-background"
-          when "Business", DataModel::Layers::Business
-            "archimate-business-background"
-          when "Application", DataModel::Layers::Application
-            "archimate-application-background"
-          when "Technology", DataModel::Layers::Technology
-            "archimate-infrastructure-background"
-          when "Physical", DataModel::Layers::Physical
-            "archimate-physical-background"
-          when "Motivation", DataModel::Layers::Motivation
-            "archimate-motivation-background"
-          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
-
         def to_svg(xml)
-          optional_link(xml) {
+          optional_link(xml) do
             xml.g(group_attrs) do
               xml.title { xml.text @entity.name } unless @entity.name.nil? || @entity.name.empty?
-              xml.desc { xml.text(@entity.documentation.to_s) } if @entity.documentation && !@entity.documentation.empty?
+              xml.desc { xml.text(@entity.documentation.to_s) } unless @entity.documentation&.empty?
               entity_shape(xml, child.bounds)
               entity_badge(xml)
               entity_label(xml)
               child.nodes.each { |c| Svg::EntityFactory.make_entity(c, child.bounds).to_svg(xml) }
             end
-          }
+          end
         end
 
-        def optional_link(xml, &block)
-          block.call
+        def optional_link(_xml)
+          yield
         end
 
         def entity_label(xml)

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

@@ -7,6 +7,7 @@ module Archimate
         def initialize(child, bounds_offset)
           super
           @badge = "#archimate-location-badge"
+          @background_class = "archimate-location-background"
         end
       end
     end

data/lib/archimate/svg/entity_factory.rb

@@ -5,10 +5,10 @@ module Archimate
     module EntityFactory
       def make_entity(child, bounds_offset)
         entity = child.element || child
-        klass_name = "Archimate::Svg::Entity::#{entity.type.sub('archimate:', '')}"
-        klass = Object.const_get(klass_name)
+        klass_name = entity.type.sub('archimate:', '')
+        klass = Archimate::Svg::Entity.const_get(klass_name)
         klass.new(child, bounds_offset)
-      rescue
+      rescue NameError
         puts "Unsupported entity type #{klass_name}"
       end
       module_function :make_entity

data/lib/archimate/svg/point.rb

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

data/lib/archimate/svg/svg_template.svg.erb

@@ -143,13 +143,13 @@
     </symbol>
 
     <!-- Line Markers -->
-    <marker id="archimate-dot-marker" viewBox="0 0 10 10" refX="4" refY="4" markerUnits="strokeWidth" markerWidth="8" markerHeight="8">
+    <marker id="archimate-dot-marker" viewBox="0 0 10 10" refX="0" refY="4" markerUnits="strokeWidth" markerWidth="10" markerHeight="10">
       <circle cx="4" cy="4" r="3" fill="black" stroke="black" />
     </marker>
     <marker id="archimate-used-by-arrow" viewBox="0 0 10 10" refX="9" refY="5" markerUnits="strokeWidth" markerWidth="8" markerHeight="8" orient="auto">
       <path d="M 1 1 L 9 5 L 1 9" fill="none" stroke="black" style="fill:none;stroke:black;"/>
     </marker>
-    <marker id="archimate-open-arrow" viewBox="0 0 10 10" refX="9" refY="5" markerUnits="strokeWidth" markerWidth="8" markerHeight="8" orient="auto">
+    <marker id="archimate-open-arrow" viewBox="0 0 10 10" refX="9" refY="5" markerUnits="strokeWidth" markerWidth="8" markerHeight="8" orient="auto" stroke="black" fill="none">
       <path d="M 1 1 L 9 5 L 1 9" fill="none" stroke="black"/>
     </marker>
     <marker id="archimate-filled-arrow" viewBox="0 0 10 10" refX="9" refY="5" markerUnits="strokeWidth" markerWidth="12" markerHeight="12" orient="auto">
@@ -158,11 +158,11 @@
     <marker id="archimate-hollow-arrow" viewBox="0 0 10 10" refX="9" refY="5" markerUnits="strokeWidth" markerWidth="12" markerHeight="12" orient="auto">
       <polygon points="1,1 9,5 1,9" fill="white" stroke="black"/>
     </marker>
-    <marker id="archimate-filled-diamond" viewBox="0 0 10 10" refX="1" refY="5" markerUnits="strokeWidth" markerWidth="12" markerHeight="12" orient="auto">
+    <marker id="archimate-filled-diamond" viewBox="0 0 10 10" refX="1" refY="5" markerUnits="strokeWidth" markerWidth="24" markerHeight="24" orient="auto">
       <polygon points="5,2.5 9,5 5,7.5 1,5" fill="black" stroke="black"/>
     </marker>
-    <marker id="archimate-hollow-diamond" viewBox="0 0 10 10" refX="1" refY="5" markerUnits="strokeWidth" markerWidth="13" markerHeight="13" orient="auto">
-      <polygon points="5,2.5 9,5 5,7.5 1,5" fill="white" stroke="black"/>
+    <marker id="archimate-hollow-diamond" viewBox="0 0 25 25" refX="1" refY="12" markerUnits="strokeWidth" markerWidth="24" markerHeight="24" orient="auto">
+      <polygon points="12.5,6.25 22.5,12.5 12.5,18.75 2.5,12.5" fill="white" stroke="black"/>
     </marker>
   </defs>
   <g id="archimate-diagram"></g>

data/lib/archimate/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Archimate
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: archimate
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Mark Morga
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-25 00:00:00.000000000 Z
+date: 2017-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -374,6 +374,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A collection of tools for working with ArchiMate files from Archi
 email:
 - markmorga@gmail.com
@@ -397,7 +411,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- TODOs.org
 - archimate.gemspec
 - bin/archimate
 - bin/console
@@ -429,9 +442,8 @@ files:
 - lib/archimate/data_model/connector_type.rb
 - lib/archimate/data_model/diagram.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/elements.rb
 - lib/archimate/data_model/font.rb
 - lib/archimate/data_model/lang_string.rb
 - lib/archimate/data_model/layer.rb
@@ -445,8 +457,10 @@ files:
 - lib/archimate/data_model/property.rb
 - lib/archimate/data_model/property_definition.rb
 - lib/archimate/data_model/referenceable.rb
+- lib/archimate/data_model/referenceable_list.rb
 - lib/archimate/data_model/relationship.rb
-- lib/archimate/data_model/relationship_type.rb
+- lib/archimate/data_model/relationship_references.rb
+- lib/archimate/data_model/relationships.rb
 - lib/archimate/data_model/schema_info.rb
 - lib/archimate/data_model/style.rb
 - lib/archimate/data_model/view_node.rb