ea 0.6.5 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d4eb047626f932a223d59f60d7a07ac839542e16f1f08cc1e27f99102592af7
-  data.tar.gz: d38407abf49dd80a886269968e944edfa691bc09ca31772556d8d20a89dac294
+  metadata.gz: d066021fc111c616534f8445aa46fc1217d16bd06e5a7555634033b692d1023c
+  data.tar.gz: b09455921b726464c95e69a918a916eccc7b6caa66675493e84438eea62c6000
 SHA512:
-  metadata.gz: 50d22ea166bdb5ee80f60a16d2396dc12b90470d1c9f5048279ee9e9d4233b7778af481f04719618416f59d26ada1ddb750bbda03e8fd9f6c4abc1c279ecd9a1
-  data.tar.gz: 9ac1166cc762bce236ca889b8a28f26bb32f3688fa00ce925b53f91adf5999976057aefe91e4b684fdf55adbca352af6bd4f5901e9b5251ba0b29c21999becd5
+  metadata.gz: 1b388387a89b3d933b8a7c6667c70134da049679cdbc2ef3d3c2aa11937228cd8b0ef55b3509c780b47f5ce437d93a4641e356bd84562929d65ea0012466a67c
+  data.tar.gz: be2f5b42394a8a3be5eeeb7bff3d48b6929d47009823f632c105e59f2f2ec33652b9bf6e4fa5a5194c20bf8e74c194a1d3448b6a32ab3f1d145bc59f9ab056bf

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

@@ -94,6 +94,15 @@ module Ea
                                              tagged_values_for(classifier).size,
                                              header_lines)
           end
+          # EA suppresses the operations compartment when its rows
+          # overflow the stored box height (same rule as attributes).
+          if op_lines.any? && geometry.op_first_y &&
+             geometry.op_bottom_y.to_i + size > bounds.y + bounds.height
+            op_lines = []
+            geometry = compartment_geometry(bounds, size, attr_lines, op_lines,
+                                             tagged_values_for(classifier).size,
+                                             header_lines)
+          end
           RenderContext.new(
             element: element,
             bounds: bounds,

data/lib/ea/svg/ea_emitter/label/end_label.rb

@@ -122,13 +122,23 @@ module Ea
             assoc = association_for(connector)
             return [nil, nil, nil] unless assoc
 
-            prop = property_at_end(assoc, end_kind)
+            prop = property_at_end(assoc, end_kind, connector)
             return [true, *property_role(prop)] if prop
 
             [false, *association_role(assoc, end_kind)]
           end
 
-          def property_at_end(association, end_kind)
+          def property_at_end(association, end_kind, connector = nil)
+            # EA renders the source classifier's synthesized
+            # association-end property (matched by the connector's
+            # relationship guid), falling back to the property index
+            # lookup by association source/target id.
+            if connector&.relationship_ref
+              placed = placed_classifier_id(association, end_kind)
+              prop = assoc_end_property(placed, connector.relationship_ref)
+              return prop if prop
+            end
+
             id = end_kind == :source ? association.source_id : association.target_id
             return nil unless id
 
@@ -137,9 +147,29 @@ module Ea
             fallback_property_lookup(id)
           end
 
+          def placed_classifier_id(association, end_kind)
+            end_kind == :source ? association.source_id : association.target_id
+          end
+
+          # Find the synthesized association-end property on the
+          # placed classifier whose association_id matches the
+          # connector's relationship reference.
+          def assoc_end_property(classifier_id, relationship_ref)
+            return nil unless classifier_id
+
+            classifier = model_index[classifier_id]
+            return nil unless classifier.is_a?(Ea::Model::Classifier)
+
+            (classifier.properties || []).find do |p|
+              p.association_id == relationship_ref
+            end
+          end
+
           # Linear-scan fallback for callers that did not wire in
           # the Document. Production paths go through Document's
           # property_index for O(1) lookup.
+
+
           def fallback_property_lookup(id)
             return nil unless model_index
 
@@ -155,11 +185,23 @@ module Ea
           def property_role(property)
             visibility = visibility_prefix(property)
             name = property.name.to_s
-            role = name.empty? ? nil : "#{visibility}#{name}"
+            type_name = property.type_name.to_s
+            line = if type_name.empty? || type_name == " "
+                     "#{visibility}#{name}"
+                   else
+                     "#{visibility}#{name}: #{namespace_double_colon(type_name)}"
+                   end
+            role = line.empty? ? nil : line
             mult = multiplicity_text(property)
             [role, mult]
           end
 
+          def namespace_double_colon(type_name)
+            return type_name if type_name.nil? || type_name.empty?
+
+            type_name.to_s.gsub(/([A-Za-z0-9_]):([A-Za-z])/, '\1::\2')
+          end
+
           def association_role(assoc, end_kind)
             name = end_kind == :source ? assoc.source_role_name : assoc.target_role_name
             lower = end_kind == :source ? assoc.source_multiplicity_lower : assoc.target_multiplicity_lower

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.5"
+  VERSION = "0.6.7"
 end

metadata

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