ea 0.6.117 → 0.6.119

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 473bc36a9b9e843f0eb497f2437f56932823a674d8823c44c40063f93ab2da54
-  data.tar.gz: 41b7858cf138ecc8e5a16b05762451ac98e738b9c4b13b3bfd781fb9821ab002
+  metadata.gz: 2b80d2500a79d8c410643f012044e96045355f11475b70d9fdfd32522eb974f7
+  data.tar.gz: c36ab5e3816b5970f77cff1159eb6cab83972f655c7a22eef20f780fcb369900
 SHA512:
-  metadata.gz: c319d8f6b1c3454cd5c04495822223b4ec22e58bb1a357774b9ec3f5bbccde4eb1fa10bd94ff64a1a61cac24a70462d63915757fa6df98846d0c3fa7c5174b35
-  data.tar.gz: d9dc77d29d955d62ec4e27d102a35b41cd4e7a561f08ec91077a8cb8838f0de2438c935d3cb1176a03687eb7efab9c23654fdfbb299c7fab84dc8a92ddc7d3a1
+  metadata.gz: '0092fc3cc3572c4e9ce6fad78fd06bf20f0ed8f94885dfc1d69c04a439ed6e7853ee42969fbb3eae40489387e07584897fc22d29fe7c63357cb307155fda4798'
+  data.tar.gz: b428d62df7fdfd930a1a06614b5b80784a755de543a8fb1513addba4807d122c7d4bdaffa26553b854e7c53f3d4e9d2822f209f24943da4079a263f76b13328f

data/lib/ea/sources/qea/diagram_builder/routing.rb

@@ -8,6 +8,51 @@ module Ea
         module Routing
           private
 
+          # Offsets stay attached to semantic Start/End IDs even when the
+          # saved corner follows the opposite placement order. Clip each leg
+          # from its stored mathematical origin, retaining external origins.
+          def reversed_stored_corner(model, link_row, diagram_row, geom, context)
+            return model if context || !geom.values_at(:sx, :sy, :ex, :ey).all?
+
+            connector = database.find_connector(link_row.connectorid)
+            return model unless connector && reversed_corner_link?(link_row, diagram_row, connector)
+
+            boxes = stored_ray_boxes(link_row, diagram_row)
+            origins = [stored_ray_origin(boxes[0], geom[:sx], geom[:sy]),
+                       stored_ray_origin(boxes[1], geom[:ex], geom[:ey])]
+            x, y = intermediate_waypoints(link_row).first
+            bend = Ea::Model::Point.new(x: x, y: y)
+            ends = origins.zip(boxes).map do |origin, box|
+              inside_box?(origin, box) ? diagonal_corner_exit(origin, bend, box) : origin
+            end
+            return model unless ends.all?
+
+            model.waypoints = [ends[0], bend, ends[1]].map { |point| Ea::Model::Waypoint.new(position: point) }
+            model.source_anchor, model.target_anchor = origins
+            model
+          end
+
+          # Path follows SOID/EOID placement order, independently of the
+          # relationship's Start/End IDs. Only a complete, unique DUID pair
+          # can reverse the authored single-corner route.
+          def reversed_corner_link?(link_row, diagram_row, connector)
+            style = DiagramStyleParser.parse(link_row.style)
+            return false unless connector.connector_type == "Association" &&
+                                style.values_at(:mode, :lwidth, :tree) == ["3", "0", nil] &&
+                                parse_geometry_fields(link_row.geometry)[:edge] == 2 &&
+                                intermediate_waypoints(link_row).size == 1
+
+            ids = style.values_at(:soid, :eoid)
+            return false if ids.any? { |id| id.to_s.empty? } || ids.uniq.size != 2
+
+            placements = database.diagram_objects_for(diagram_row.diagram_id) || []
+            ends = ids.map do |id|
+              matches = placements.select { |row| DiagramStyleParser.parse(row.objectstyle)[:duid] == id }
+              matches.first.ea_object_id if matches.size == 1
+            end
+            ends == [connector.end_object_id, connector.start_object_id] && ends.uniq.size == 2
+          end
+
           # An empty custom-line Path has no authored corner to preserve.
           # Keep normalized port routes; replace only the computed EDGE2 jog.
           def direct_empty_path_ray(model, link_row, diagram_row, geom, context)

data/lib/ea/sources/qea/diagram_builder.rb

@@ -145,6 +145,7 @@ module Ea
             font_underline: truthy?(style_hash[:ul]),
             show_tagged_values: truthy?(style_hash[:tag]),
             line_width: effective_line_width(obj_row, style_hash),
+            line_color: effective_line_color(obj_row, style_hash),
             background_color: style_hash[:bcol]&.to_i
           )
         end
@@ -161,6 +162,17 @@ module Ea
           nil
         end
 
+        def effective_line_color(obj_row, style)
+          object = database.find_object(obj_row.ea_object_id)
+          [style[:lcol], object&.bordercolor].each do |raw|
+            next if raw.nil? || raw.to_s.empty?
+
+            color = raw.to_i
+            return color if color >= 0
+          end
+          nil
+        end
+
         def truthy?(raw)
           raw == "1" || raw == "-1"
         end
@@ -452,7 +464,8 @@ module Ea
           model = overlap_ray_origins(model, link_row, diagram_row, geom, context)
           model = auto_port_elbow(model, link_row, diagram_row, geom, context)
           model = mark_default_square_ray(model, link_row, geom, context)
-          restore_stored_square_ports(model, link_row, diagram_row, geom, context)
+          model = restore_stored_square_ports(model, link_row, diagram_row, geom, context)
+          reversed_stored_corner(model, link_row, diagram_row, geom, context)
         end
 
         # Ray origin for one connector end: the element's center

data/lib/ea/sources/qea/relationship_builder.rb

@@ -23,6 +23,8 @@ module Ea
           args = common_args(row)
           args.merge!(association_args(row)) if klass == Ea::Model::Association
           args.merge!(generalization_args(row)) if klass == Ea::Model::Generalization
+          args.merge!(dependency_args(row)) if klass == Ea::Model::Dependency
+          args.merge!(realization_args(row)) if klass == Ea::Model::Realization
           klass.new(**args)
         end
 
@@ -50,6 +52,20 @@ module Ea
           }
         end
 
+        def dependency_args(row)
+          {
+            client_id: id_for_object_id(row.start_object_id),
+            supplier_id: id_for_object_id(row.end_object_id)
+          }
+        end
+
+        def realization_args(row)
+          {
+            realizing_id: id_for_object_id(row.start_object_id),
+            contract_id: id_for_object_id(row.end_object_id)
+          }
+        end
+
         def association_args(row)
           {
             source_id: id_for_object_id(row.start_object_id),

data/lib/ea/svg/ea_emitter/compartment/enum_literals.rb

@@ -69,16 +69,9 @@ module Ea
 
           def literal_name_text(context, literal, y)
             content = literal_display(literal)
-            # EA uses the attribute row point-size increment for literal names.
-            offset = context.theme.attribute_spec.content_x_offset || 26
-            offset += 2 * (context.size - 7) if context.size_unit == "pt"
-            if Ea::Fonts::Metrics.compact_compartment_font?(context.size,
-                                                            family: context.family, unit: context.size_unit)
-              offset -= 1
-            end
             TextRenderer.new(
               content: content,
-              x: context.bounds.x + offset,
+              x: context.bounds.x + content_x_offset(context.theme, context.size, context.size_unit, context.family),
               y: y,
               family: context.family, size: context.size,
               size_unit: context.size_unit, logical_height: context.logical_height,
@@ -88,6 +81,26 @@ module Ea
             ).to_svg
           end
 
+          def content_width(literals, theme:, size:, family:, **font_options)
+            return nil if literals.empty?
+
+            logical_height = font_options[:logical_height] if font_options[:size_unit] == "pt"
+            length = literals.map do |literal|
+              TextRenderer.estimate_width(literal_display(literal), size, theme.text_width_factor,
+                                          family: family, weight: 400, style: "normal",
+                                          logical_height: logical_height).round
+            end.max
+            content_x_offset(theme, size, font_options[:size_unit], family) + length + 5
+          end
+
+          def content_x_offset(theme, size, size_unit, family)
+            # EA uses the attribute row point-size increment for literal names.
+            offset = theme.attribute_spec.content_x_offset || 26
+            offset += 2 * (size - 7) if size_unit == "pt"
+            offset -= 1 if Ea::Fonts::Metrics.compact_compartment_font?(size, family: family, unit: size_unit)
+            offset
+          end
+
           # EA shows "Name = Code" for literals with a stored
           # default value; bare names otherwise.
           def literal_display(literal)

data/lib/ea/svg/ea_emitter/connector_redock.rb

@@ -21,7 +21,8 @@ module Ea
           return nil unless bounds_map
           points = waypoint_pairs(connector)
           lateral = lateral_tree?(connector, points)
-          return nil unless points.size == 2 || lateral
+          trunk = trunk_tree?(connector, points)
+          return nil unless points.size == 2 || lateral || trunk
 
           rel = relationship_for(connector, model_index)
           return nil unless rel
@@ -33,6 +34,7 @@ module Ea
           target_bounds = bounds_map[target_ref]
           return nil unless source_bounds && target_bounds
           return nil if source_ref == target_ref
+          return trunk_pairs(points, source_bounds, target_bounds, connector.style[:tree]) if trunk
 
           square = OrthogonalRay.pairs_for(connector, source_bounds, target_bounds)
           return square if square
@@ -164,6 +166,37 @@ module Ea
         end
         private_class_method :lateral_tree?
 
+        # The QEA builder already docks the Generalization, Aggregation and
+        # Association trunks; the other types (Dependency, Nesting, ...) keep
+        # their stored ends. A flush (width 0) vertical or horizontal trunk
+        # runs axis-aligned into both boxes, so a stored end off that axis or
+        # on the far edge of its box is a lost dock the adjacent bend names.
+        BUILDER_TRUNK_TYPES = %w[Generalization Aggregation Association].freeze
+
+        def trunk_tree?(connector, points)
+          style = connector.style.to_h
+          points.size >= 3 && style[:mode] == "3" && style[:lwidth] == "0" &&
+            %w[V H].include?(style[:tree]) && !BUILDER_TRUNK_TYPES.include?(connector.connector_type)
+        end
+        private_class_method :trunk_tree?
+
+        def trunk_pairs(points, source, target, tree)
+          first = trunk_dock(points[0], points[1], source, tree)
+          last = trunk_dock(points[-1], points[-2], target, tree)
+          return nil if first == points[0] && last == points[-1]
+
+          [first, *points[1..-2], last]
+        end
+        private_class_method :trunk_pairs
+
+        def trunk_dock(end_point, bend, bounds, tree)
+          return end_point unless bounds.width.positive? && bounds.height.positive?
+
+          dock = tree == "V" ? vertical_target(bend, bounds) : horizontal_target(bend, bounds)
+          dock || end_point
+        end
+        private_class_method :trunk_dock
+
         # The bend selects the near target edge even when the boxes overlap.
         # Preserve the source leg and bend; only the final dock changes.
         def lateral_target(bend, bounds, tree)
@@ -227,7 +260,7 @@ module Ea
         def bordered_outline?(connector, diagram, refs, bounds)
           style = connector.style.to_h
           return false unless style[:lwidth] == "0" && !style[:tree]
-          return false unless %w[Generalization Aggregation Association].include?(connector.connector_type)
+          return false unless %w[Generalization Aggregation Association Dependency].include?(connector.connector_type)
           return false unless bounds.all? { |box| box.width.positive? && box.height.positive? }
 
           ends = [[refs.first, style[:soid]], [refs.last, style[:eoid]]]
@@ -508,15 +541,15 @@ module Ea
 
         # Polymorphic relationship ends, in connector start→end
         # order: Generalization child→parent (specific_id/general_id),
+        # Realization realizing_id/contract_id,
         # Dependency client→supplier (client_id/supplier_id),
         # Association source_id/target_id.
         def end_refs(rel)
-          if rel.respond_to?(:specific_id)
-            [rel.specific_id, rel.general_id]
-          elsif rel.respond_to?(:client_id)
-            [rel.client_id, rel.supplier_id]
-          else
-            [rel.source_id, rel.target_id]
+          case rel
+          when Ea::Model::Generalization then [rel.specific_id, rel.general_id]
+          when Ea::Model::Realization then [rel.realizing_id, rel.contract_id]
+          when Ea::Model::Dependency then [rel.client_id, rel.supplier_id]
+          else [rel.source_id, rel.target_id]
           end
         end
 

data/lib/ea/svg/ea_emitter/elements.rb

@@ -151,20 +151,20 @@ module Ea
                       else
                         []
                       end
-          # Regenerated contexts grow the DRAWN width to fit the
-          # widest row: attr rows inset 22 + 5 right, op rows inset
-          # 22 + 3 (CharacterString 197+27=224, Integer 92+25=117).
-          # Titles never drive growth - they wrap instead.
-          if attr_lines.any? || op_lines.any?
-            row_w = [row_content_width(attr_lines, 5, size, family, logical_height),
-                     row_content_width(op_lines, 3, size, family, logical_height)].compact.max
-            if row_w && row_w > bounds.width
-              bounds = Ea::Model::Bounds.new(
-                x: bounds.x, y: bounds.y,
-                width: row_w,
-                height: bounds.height
-              )
-            end
+          # Titles wrap; content rows grow the drawn box to fit their insets.
+          row_w = [row_content_width(attr_lines, 5, size, family, logical_height),
+                   row_content_width(op_lines, 3, size, family, logical_height),
+                   Compartment::EnumLiterals.content_width(
+                     enum_literals_for(classifier),
+                     theme: theme, size: size, family: family,
+                     size_unit: size_unit, logical_height: logical_height
+                   )].compact.max
+          if row_w && row_w > bounds.width
+            bounds = Ea::Model::Bounds.new(
+              x: bounds.x, y: bounds.y,
+              width: row_w,
+              height: bounds.height
+            )
           end
           stereotype_fqname = element.style&.fetch(:stereotype_fqname, nil)
           header_lines = classifier ? Element::HeaderLines.for(classifier,
@@ -272,7 +272,7 @@ module Ea
             model_element: model_element,
             classifier: classifier,
             fill: resolve_fill(element, classifier),
-            stroke: resolve_stroke,
+            stroke: resolve_stroke(element),
             stroke_width: resolve_stroke_width(element),
             text_fill: theme.text_color,
             family: family, size: size, size_unit: size_unit, logical_height: logical_height,
@@ -665,8 +665,8 @@ module Ea
           color_resolver.fill_for(element, classifier)
         end
 
-        def resolve_stroke
-          color_resolver.stroke_for(nil)
+        def resolve_stroke(element)
+          color_resolver.stroke_for(element)
         end
 
         def resolve_stroke_width(element)

data/lib/ea/version.rb

@@ -4,5 +4,5 @@ module Ea
   # Gem release version. Extracted to its own file so the
   # `gem-release` tool's `gem bump` can find and update it via the
   # standard `lib/<gem>/version.rb` convention.
-  VERSION = "0.6.117"
+  VERSION = "0.6.119"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ea
 version: !ruby/object:Gem::Version
-  version: 0.6.117
+  version: 0.6.119
 platform: ruby
 authors:
 - Ribose Inc.
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.8.114
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.8.114
 - !ruby/object:Gem::Dependency
   name: lutaml-path
   requirement: !ruby/object:Gem::Requirement