ea 0.6.104 → 0.6.105

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53866c904e4fef2b317cd5aeb9e0b142e3d970507b65e9d9f14d2c768a56f1e8
-  data.tar.gz: 40ad1c86acd5461a89fe8e6b23a9da1f65eb43ef9eba632583344d09ed54b932
+  metadata.gz: 430568b3607d439af39bac818b48ee27caa207875c7f2015e3a6f5689419680b
+  data.tar.gz: dfb835e2208d50a51caa01acb96a30e2561f5ccbdf6e83a6a1c55ec368c4b5b8
 SHA512:
-  metadata.gz: f475a015d57fc2337ef3a19ea8e81fbd75e2f04532d79893e5fc01e1e9b344b07b973e4b833a4480dc49aed31f1ff4b45463950e53dc5e290f2b7304638be9e9
-  data.tar.gz: b8ca9731d6d2442f74778cbe4ad66550cada64399cbf33eb858a4e0ad59ad7e9488516732194d29ebaa7733c3beae401ae7e7856964b3d1c4fd0989abae0db6d
+  metadata.gz: ce35bed8f6b13d1f799d8c99b550ad70d19453e2f2827888c1dce54b246dc9a938baa52cfe2d24f9fb9f093ecce1a86b52c4dbecbb60b397777c592cc61ea654
+  data.tar.gz: 22747dc14774fbfaa984efba1c88078619d8ab6bc74b4d06d5276074a93957dccc071963574aad3ff272377d043e51e613723708d0fa48318acf6558ec920de1

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

@@ -4,7 +4,7 @@ module Ea
   module Sources
     module Qea
       class DiagramBuilder
-        # Source-led routes for auto-routed associations with unequal end offsets.
+        # Stored mathematical docking for auto-routed associations.
         module AutoRouting
           private
 
@@ -22,6 +22,53 @@ module Ea
             model
           end
 
+          # When the shared row misses the target, retain the physical ports
+          # and let the emitter clip their ray before inserting the elbow.
+          def auto_port_elbow(model, link_row, diagram_row, geom, context)
+            return model if context || !auto_port_elbow_candidate?(model, link_row, geom)
+
+            source, target = stored_ray_boxes(link_row, diagram_row)
+            origins = [stored_ray_origin(source, geom[:sx], geom[:sy]),
+                       stored_ray_origin(target, geom[:ex], geom[:ey])]
+            return model unless auto_port_elbow_origins?(source, target, origins, geom)
+
+            apply_auto_port_elbow(model, origins)
+          end
+
+          def apply_auto_port_elbow(model, origins)
+            model.source_anchor, model.target_anchor = origins
+            model.waypoints = origins.map { |point| Ea::Model::Waypoint.new(position: point) }
+            model.style = model.style.to_h.merge(association_ray_outline: true, auto_port_elbow: true)
+            model
+          end
+
+          def auto_port_elbow_candidate?(model, link_row, geom)
+            auto_port_elbow_model?(model) && link_row.path.to_s.empty? &&
+              source_row_style?(model.style.to_h) && uniform_overlap_offsets?(geom) && geom[:edge] == 4
+          end
+
+          def auto_port_elbow_model?(model)
+            model.connector_type == "Association" && model.has_geometry_offsets &&
+              model.source_anchor && model.target_anchor && model.waypoints.size == 2
+          end
+
+          def auto_port_elbow_origins?(source, target, origins, geom)
+            return false if overlap_origins(source, target, geom)
+            return false unless source_row_faces_target?(source, target, geom[:edge])
+            return false unless origins.first.x == source.x - 1
+            return false if within_height?(origins.first.y, target)
+            return false unless crosses_target_horizontal_edge?(origins, target)
+
+            [source, target].zip(origins).all? { |box, origin| inside_box?(origin, grown_bounds(box, 1)) }
+          end
+
+          def crosses_target_horizontal_edge?(origins, target)
+            outline = grown_bounds(target, 1)
+            edge = Ea::Model::Bounds.new(x: outline.x, width: outline.width, height: 0,
+                                         y: origins.first.y < outline.y ? outline.y : outline.y + outline.height)
+            segment_crosses_box?(*origins, edge)
+          end
+
           def source_row_origins(source, target, geom)
             return nil unless source_row_faces_target?(source, target, geom[:edge])
 

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

@@ -443,6 +443,7 @@ module Ea
           model = correct_stored_ray_origins(model, link_row, diagram_row, geom, context)
           model = source_row_association_ray(model, link_row, diagram_row, geom, context)
           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)
         end

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

@@ -60,9 +60,26 @@ module Ea
           pairs = expanded ? candidate : original
           target = expanded ? outline.last : target_bounds
           pairs = default_square_pairs(connector, points, source_bounds, target, pairs)
-          stored_top_pairs(connector, expanded ? outline.first : source_bounds, pairs)
+          source = expanded ? outline.first : source_bounds
+          pairs = stored_top_pairs(connector, source, pairs)
+          auto_port_elbow_pairs(connector, source, target, pairs)
         end
 
+        # Auto routing turns at the clipped target column when the source
+        # leaves a side edge and the target enters through its top or bottom.
+        def auto_port_elbow_pairs(connector, source, target, pairs)
+          return pairs unless connector.style.to_h[:auto_port_elbow] == true
+
+          first, last = pairs
+          return pairs unless on_side_edge?(first, source) &&
+                              [target.y, target.y + target.height].include?(last[1]) &&
+                              last[0].between?(target.x, target.x + target.width)
+          return pairs if first[0] == last[0] || first[1] == last[1]
+
+          [first, [last[0], first[1]], last]
+        end
+        private_class_method :auto_port_elbow_pairs
+
         # EDGE=1 explicitly seats an external source ray on the top edge;
         # its first contact can instead be the bottom when its origin is below.
         def stored_top_pairs(connector, source, pairs)

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.104"
+  VERSION = "0.6.105"
 end

metadata

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