ea 0.6.132 → 0.6.133

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a542204dd94a1259f110781e2aefa2240a73ad54b382e50e23599efd1ecc81e7
-  data.tar.gz: a508d4a7764678223708a317bc624f1e3eec295317e082cc15227705deac8343
+  metadata.gz: 020f344524c3f0702e581b349d7cb3f93a7069a3179684ca59440fd4d4762491
+  data.tar.gz: 46f2d46ab28ba95e5c975fedfa9bcd176c19b2acc4f3803635786f070dd315c2
 SHA512:
-  metadata.gz: 2df081d4e9815a2006c2de93f590a748bba596f8550bc9546a5e505f8cdda94b0519a13a32d90106527123685e4432161227ab6f00c73f1d8520d305bac44a6d
-  data.tar.gz: a100a9f9fb968da363f620390edc2e72321e9129032ed616c4cce9d9e0caefac8d3ea5fcae04a406dff42e2c08bb331f7742ab9ed5fccc528970a74270897d4d
+  metadata.gz: 16f49f774901e21cee845099df07ff8adc9989c3679c03fb49b97692356a81353d40c73c1cdde5dddfcd74b49657744695b61dbf557c96aabebe730fa4f0a7c4
+  data.tar.gz: 77fbf77c4cc929cb5565f2a9f712275b13e7244591b2dea3245d4ad096889531af5782aa4a8ad4888d9a2944e789fa9edd2657eb11cc5c93c5c6e9f17a7df3a0

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

@@ -182,6 +182,7 @@ module Ea
           def correct_stored_ray_origins(model, link_row, diagram_row, geom, context)
             return model if context
             return notelink_stored_ray(model, link_row, diagram_row, geom) if model.connector_type == "NoteLink"
+            return package_stored_ray(model, link_row, diagram_row, geom) if model.connector_type == "Package"
             return model unless stored_ray_candidate?(model, link_row, geom)
 
             source, target = stored_ray_boxes(link_row, diagram_row)
@@ -199,6 +200,42 @@ module Ea
             model
           end
 
+          # An empty custom-line package import has no authored bend. When
+          # its stored mathematical origins share a row inside both boxes,
+          # clip that ray instead of the computed EDGE2 port jog.
+          def package_stored_ray(model, link_row, diagram_row, geom)
+            return model unless package_ray_candidate?(model, link_row, geom)
+
+            boxes = stored_ray_boxes(link_row, diagram_row)
+            origins = level_package_origins(boxes, geom)
+            return model unless origins
+
+            model.waypoints = package_ray_waypoints(boxes, origins.first.y)
+            model.source_anchor, model.target_anchor = origins
+            model
+          end
+
+          def package_ray_candidate?(model, link_row, geom)
+            model.waypoints.size == 3 && link_row.path.to_s.empty? &&
+              model.style.values_at(:mode, :lwidth, :tree) == ["3", "0", nil] &&
+              geom[:edge] == 2 && geom.values_at(:sx, :sy, :ex, :ey).all?
+          end
+
+          def level_package_origins(boxes, geom)
+            return unless horizontal_ray_gap?(*boxes)
+
+            origins = association_ray_origins(*boxes, geom, "0")
+            origins if origins && origins.first.y == origins.last.y
+          end
+
+          def package_ray_waypoints(boxes, row)
+            rightward = boxes[0].x < boxes[1].x
+            boxes.each_with_index.map do |box, index|
+              x = box.x + (rightward == index.zero? ? box.width : 0)
+              Ea::Model::Waypoint.new(position: Ea::Model::Point.new(x: x, y: row))
+            end
+          end
+
           # A straight top-docked NoteLink uses mathematical saved Y offsets,
           # like the other custom rays, while authored bends keep their ports.
           def notelink_stored_ray(model, link_row, diagram_row, geom)

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.132"
+  VERSION = "0.6.133"
 end

metadata

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