ea 0.6.31 → 0.6.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da25cfb5a4f0690b2b73df2d3c12fe3cd042c96fe6aab67d07e2c8871868feaf
-  data.tar.gz: 8be40d4bb501b904f1ba2609446d332ea260f3d04a831528d213d6747e352dfa
+  metadata.gz: 6e23a708761ca82e0a23584e7c5ee557251532481defbd16712c676963ad7fbe
+  data.tar.gz: dfaeae3624f35848cf7d801e5fdf9c1bf990fa162514838353b98b282da76e51
 SHA512:
-  metadata.gz: 271180e45139ae7e67a63a66a9fd78c8311edd379ee73f3a5ab9241f7b43d1be737bffca276e0585473f0294f1f557d3ff46fb254cdd105b8b6526ffb052fd36
-  data.tar.gz: 63856efa026109bf92d89468c10e6325f9a2f411e4f49217335667b590842d1b5f8f0f860f17c3527bb57236a3d096729ae411a9c3166c4f4efbb169db30eea0
+  metadata.gz: 8efc865e83d8c43843f276c3307158b90ea6674bdf252f39804c48f8cab7c98c765536f1b382773efe2a4a6fd629f97acb6e35d37fd545cdcd5a70f18b98f387
+  data.tar.gz: 9eee4896484462b96f7060de2700e893ab4cd2a76b6d4ee7217e1908d5003767914d4e80a9c06a9cea8723ca609f2bae965b903a86660000d2690d39ca442e92

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

@@ -165,8 +165,8 @@ module Ea
           target = diagram_object_placement(diagram_row.diagram_id, target_id)
           return nil unless source && target
 
-          source_bounds = bounds_from_rect(source)
-          target_bounds = bounds_from_rect(target)
+          source_bounds = drawn_bounds_for(source)
+          target_bounds = drawn_bounds_for(target)
           waypoints = if source_id == target_id
                         self_loop_waypoints(source_bounds)
                       else
@@ -224,8 +224,8 @@ module Ea
           target_placement = diagram_object_placement(diagram_row.diagram_id, target_id)
           return nil unless source_placement && target_placement
 
-          source_bounds = bounds_from_rect(source_placement)
-          target_bounds = bounds_from_rect(target_placement)
+          source_bounds = drawn_bounds_for(source_placement)
+          target_bounds = drawn_bounds_for(target_placement)
           waypoints = direct_waypoints(source_bounds, target_bounds)
           Ea::Model::DiagramConnector.new(
             id: IdNormalizer.synthetic("xc", diagram_row.diagram_id, object_id),
@@ -383,7 +383,33 @@ module Ea
                                             connector.end_object_id)
           return [] unless source && target
 
-          direct_waypoints(bounds_from_rect(source), bounds_from_rect(target))
+          direct_waypoints(drawn_bounds_for(source),
+                           drawn_bounds_for(target))
+        end
+
+        # The outline EA clips connector rays against: the DRAWN
+        # autosized box, not the stored logical rect. Packages draw
+        # narrower than their stored rect (body = autosized tab +
+        # 15), so their docks land on the drawn edges (E58034A3:
+        # supplier right-edge dock 155 drawn vs 121 stored). All
+        # other element kinds draw at the stored rect.
+        PACKAGE_BODY_EXTRA = 15
+
+        def drawn_bounds_for(placement)
+          logical = bounds_from_rect(placement)
+          obj = database.find_object(placement.ea_object_id.to_i)
+          return logical unless obj && obj.object_type == "Package"
+
+          tab = ::Ea::Svg::EaEmitter::Element::PackageShapeRenderer
+                .autosized_tab_width(label: obj.name.to_s,
+                                     stereotype: obj.stereotype.to_s,
+                                     size: 7)
+          Ea::Model::Bounds.new(
+            x: logical.x,
+            y: logical.y,
+            width: tab + PACKAGE_BODY_EXTRA,
+            height: logical.height
+          )
         end
 
         # Straight-line waypoints between the two box-outline

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

@@ -58,17 +58,23 @@ module Ea
           pts = waypoints_for(connector)
           return nil if pts.size < 2
 
-          d = pts.each_with_index.map do |p, idx|
-            x, y = translate_point(p)
-            "#{idx.zero? ? 'M' : 'L'} #{Canvas.coord(x)} #{Canvas.coord(y)}"
-          end.join(" ")
-          # EA writes a trailing zero-length "M <start>" repeat for
-          # DIRECT (auto-routed straight) connectors — verified on
-          # context diagrams where every line carries it (B6847577,
-          # E58034A3, 8CF27BE8).
+          # DIRECT (auto-routed straight) connectors: EA writes the
+          # segment TARGET-FIRST with a trailing zero-length repeat —
+          # "M target L source M target" (B6847577, E58034A3,
+          # 8CF27BE8). Same pixels as source-first; only the byte
+          # order differs, so reversal lives here at the emitter and
+          # the marker anchoring (source = first waypoint) is
+          # untouched.
           if pts.size == 2 && direct?(connector)
-            x, y = translate_point(pts.first)
-            d = "#{d} M #{Canvas.coord(x)} #{Canvas.coord(y)}"
+            x1, y1 = translate_point(pts.first)
+            x2, y2 = translate_point(pts.last)
+            d = "M #{Canvas.coord(x2)} #{Canvas.coord(y2)} L #{Canvas.coord(x1)} #{Canvas.coord(y1)} " \
+                "M #{Canvas.coord(x2)} #{Canvas.coord(y2)}"
+          else
+            d = pts.each_with_index.map do |p, idx|
+              x, y = translate_point(p)
+              "#{idx.zero? ? 'M' : 'L'} #{Canvas.coord(x)} #{Canvas.coord(y)}"
+            end.join(" ")
           end
           %(<path d="#{d}" shape-rendering="auto"/>)
         end

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

@@ -44,7 +44,19 @@ module Ea
           !attr_lines.empty? || !op_lines.empty? ||
             enum_literals.any? || tagged_values.any? ||
             (constraints&.any?) ||
-            (!package_content_lines.nil? && !package_content_lines.empty?)
+            (!package_content_lines.nil? && !package_content_lines.empty?) ||
+            hidden_features_present?
+        end
+
+        # EA draws the header divider whenever the element HAS a
+        # feature compartment — even one whose rows are all hidden
+        # by visibility flags (10E3E08A: CodeList with 3 attributes
+        # toggled off still renders the divider over an empty body;
+        # only feature-less elements omit it).
+        def hidden_features_present?
+          return false unless classifier.respond_to?(:properties)
+
+          classifier.properties.any? || classifier.operations.any?
         end
       end
     end

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.31"
+  VERSION = "0.6.32"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ea
 version: !ruby/object:Gem::Version
-  version: 0.6.31
+  version: 0.6.32
 platform: ruby
 authors:
 - Ribose Inc.