ea 0.6.106 → 0.6.107

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 944b29164fec6d17c5e89224547ae993a7ef4dfbee74ac1c15208eba6f88f0d5
-  data.tar.gz: e0d40f4203d9ef1bf8a1d6f0cf72349b7e3e052ed2c3c920f96f1ca655ff2741
+  metadata.gz: 931597d4cff3d8f491f63e12f3ed1a5ba31f8cc68d535b060222ca704388bda7
+  data.tar.gz: 70054ffff1db544c415879495386b4b45c7a1dafb88dfcc7d680325f37e4d019
 SHA512:
-  metadata.gz: 4087c56867c690c67f9c99011a3e8bd4c043fdcb4bb25880a6d7020d7bab5c6e9bed6adc5b25475e37d9dfe64034d6ce7a52fea44d163fb7a41df37998ce1186
-  data.tar.gz: 4ae9f0ff3fc328d2f4ceeec2a9e8b0acb51fc72326c9806b00471449dfc656d3b60029f002b4bd5e59269c32807144ed1a660dafb29bc9b4916731e5ba57e761
+  metadata.gz: 8881133d7a2443adc4dcde58dd1290b532cea8c575f22b274dc818985d6540e22d11927f0aada28a5b27f5e76748be1fd2874bbde30018c09e3dd6422a3f3263
+  data.tar.gz: c91711384dc7ebefa97bdff19923697a5eacf8f22c362dfe1ee737e8d281a3c08224d63d66d411ff77ac7edb503db1245f7d40b443c82c4468d09885fa9487f8

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

@@ -123,6 +123,7 @@ module Ea
         def build_element(obj_row, diagram_row)
           @current_obj_row = obj_row
           style_hash = DiagramStyleParser.parse(obj_row.objectstyle)
+          style_hash[:stored_attribute_order] = true
           Ea::Model::DiagramElement.new(
             id: IdNormalizer.synthetic("de", diagram_row.diagram_id,
                                        obj_row.instance_id),

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

@@ -16,7 +16,8 @@ module Ea
 
         def build_all_for(owner_object)
           attrs = database.attributes_for_object(owner_object.ea_object_id) || []
-          attrs.map { |row| build_one(row, owner_object) }
+          attrs.each_with_index.sort_by { |row, index| attribute_sort_key(row, index) }
+               .map { |row, _index| build_one(row, owner_object) }
         end
 
         def build_one(row, owner_object)
@@ -48,6 +49,15 @@ module Ea
 
         private
 
+        # Equal explicit Pos values use name order in EA's published diagrams.
+        # Missing positions retain source order before the explicit zero cohort.
+        def attribute_sort_key(row, index)
+          return [row.sort_position, 0, "", "", index] if row.pos.nil?
+
+          name = row.name.to_s
+          [row.sort_position, 1, name.downcase, name, index]
+        end
+
         # EA stores some bounds as literal text ("n"); those render
         # verbatim in attribute lines while computed-unbounded bounds
         # render as "*" (verified against EA-published SVGs).

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

@@ -11,26 +11,17 @@ module Ea
         # content and suppresses them when they would overflow the
         # stored box height (never truncates rows).
         module Constraints
-          DEFAULT_TEXT_COLOR = "#000000"
-
           module_function
 
           def render(context)
             return nil unless context.constraints&.any?
-            return nil unless context.geometry.tagged_value_first_y
-
-            first_y = context.geometry.tagged_value_first_y
-            line_h = context.size + 6
-            last_y = first_y + (context.constraints.size - 1) * line_h
-            return nil if last_y + 4 > context.bounds.y + context.bounds.height
+            return nil unless context.geometry.constraints_first_y
 
-            Element::ConstraintRenderer.render(
-              context.constraints,
-              bounds: context.bounds,
-              first_y: first_y,
-              family: context.family, size: context.size,
-              fill: DEFAULT_TEXT_COLOR
+            divider = Element::DividerRenderer.render(
+              context.bounds, y: context.geometry.constraints_divider_y,
+                              stroke: context.stroke, stroke_width: context.stroke_width
             )
+            "#{divider}\n#{Element::ConstraintRenderer.render_compartment(context)}"
           end
         end
       end

data/lib/ea/svg/ea_emitter/element/attribute_renderer.rb

@@ -87,7 +87,7 @@ module Ea
           # Pass a `lookup` (any callable returning a Classifier for
           # an id) to enable inherited-property namespace prefixing.
           def self.lines_for(classifier, lookup: nil,
-                            exclude_association_ids: nil)
+                             exclude_association_ids: nil, stored_order: false)
             props = displayable_properties(classifier, exclude_association_ids)
             return [] unless props
 
@@ -95,19 +95,14 @@ module Ea
             if stereotypes.size == 1 && props.all? { |p| property_stereotype(p) }
               # EA renders ONE compartment stereotype header for a
               # uniformly-stereotyped attribute set (e.g. «Property»
-              # above GML property rows) and lists rows
-              # alphabetically - verified against EA-published SVGs.
+              # above GML property rows).
               header = "«#{canonical_stereotype(stereotypes.first)}»"
-              [header] + props.sort_by { |p| p.name.to_s }.map do |prop|
+              [header] + ordered_properties(props, stored_order, case_sensitive: true).map do |prop|
                 AttributeLineBuilder.new(prop, host: classifier,
                                          lookup: lookup).to_s
               end
             else
-              # EA lists attribute rows alphabetically (case-
-              # insensitive) — corpus-verified: 991 boxes strictly
-              # alphabetical vs 24 strictly stored-Pos order.
-              props.sort_by { |p| [p.name.to_s.downcase, p.name.to_s] }
-                   .flat_map do |prop|
+              ordered_properties(props, stored_order).flat_map do |prop|
                 lines = []
                 stereotype = property_stereotype(prop)
                 lines << "«#{stereotype}»" if stereotype
@@ -117,6 +112,20 @@ module Ea
             end
           end
 
+          # QEA properties arrive in stored Pos order. Association ends retain
+          # their alphabetical fallback rather than using connector Pos values.
+          def self.ordered_properties(props, stored_order, case_sensitive: false)
+            alphabetical = lambda do |prop|
+              name = prop.name.to_s
+              case_sensitive ? [name] : [name.downcase, name]
+            end
+            return props.sort_by(&alphabetical) unless stored_order
+
+            own, ends = props.partition { |prop| !prop.association_id }
+            own + ends.sort_by(&alphabetical)
+          end
+          private_class_method :ordered_properties
+
           STEREOTYPE_DISPLAY = {
             "property" => "Property",
             "featuretype" => "FeatureType",

data/lib/ea/svg/ea_emitter/element/compartment_geometry.rb

@@ -150,14 +150,30 @@ module Ea
             divider_y + size + (attr_first_offset || 7)
           end
 
-          # Tagged values appear after attributes (or after ops if
-          # present). EA does not emit a separate divider — the
-          # italic "tags" header marks the compartment. Constraints
-          # render ABOVE the attributes (constraints_first_y), not
-          # here.
+          # OCL constraints follow the regular content with a divider and caption.
+          # Suppress the whole compartment when its last row cannot fit.
+          def constraints_first_y
+            return nil unless constraints_count.to_i.positive?
+
+            first_y = constraints_caption_y
+            first_y if first_y + constraints_count * (size + 5) + 4 <= bounds.y + bounds.height
+          end
+
+          def constraints_caption_y
+            (regular_content_bottom_y || raw_attr_first_y) + size + 13
+          end
+
+          def constraints_divider_y
+            constraints_first_y - size - 7 if constraints_first_y
+          end
+
+          def constraints_bottom_y
+            constraints_first_y + constraints_count * (size + 5) if constraints_first_y
+          end
+
+          # Tagged values follow the last visible content compartment.
           def tagged_value_first_y
-            return nil unless tagged_values_count.to_i.positive? ||
-                              constraints_count.to_i.positive?
+            return nil unless tagged_values_count.to_i.positive?
 
             (content_bottom_y || raw_attr_first_y) + size + 5
           end
@@ -169,6 +185,10 @@ module Ea
           # the autosize gate must not treat the empty-compartment
           # anchor as content.
           def content_bottom_y
+            [regular_content_bottom_y, constraints_bottom_y].compact.max
+          end
+
+          def regular_content_bottom_y
             bottoms = []
             bottoms << attr_bottom_y if attr_lines_count.to_i.positive?
             bottoms << enum_literals_bottom_y if enum_literals_count.to_i.positive?
@@ -185,4 +205,4 @@ module Ea
       end
     end
   end
-end
+end

data/lib/ea/svg/ea_emitter/element/constraint_renderer.rb

@@ -29,6 +29,34 @@ module Ea
             %(<g style="#{Style::TEXT_GROUP}">\n#{text_blocks.join("\n")}\n</g>)
           end
 
+          def self.render_compartment(context)
+            rows = context.constraints.each_with_index.map do |constraint, idx|
+              compartment_row(constraint, context, idx)
+            end
+            %(<g style="#{Style::TEXT_GROUP}">\n#{([compartment_caption(context)] + rows).join("\n")}\n</g>)
+          end
+
+          def self.compartment_row(constraint, context, index)
+            build_text(context.bounds.x + 5,
+                       context.geometry.constraints_first_y + (index + 1) * (context.size + 5),
+                       "{#{constraint.name}}", context.family, context.size, context.text_fill)
+          end
+          private_class_method :compartment_row
+
+          def self.compartment_caption(context)
+            TextRenderer.new(content: "constraints", x: caption_x(context),
+                             y: context.geometry.constraints_first_y, family: context.family,
+                             size: context.size, fill: context.text_fill, style: "italic").to_svg
+          end
+          private_class_method :compartment_caption
+
+          def self.caption_x(context)
+            width = TextRenderer.estimate_width("constraints", context.size, nil,
+                                                family: context.family, style: "italic").round
+            context.bounds.x + ((context.bounds.width - width) / 2).floor
+          end
+          private_class_method :caption_x
+
           def self.build_text(x, y, content, family, size, fill)
             TextRenderer.new(content: content, x: x, y: y,
                               family: family, size: size, fill: fill).to_svg

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

@@ -135,7 +135,8 @@ module Ea
                             classifier.properties.to_a.any? { |pr| !pr.association_id }))
                          Element::AttributeRenderer.lines_for(
                            classifier, lookup: attribute_lookup,
-                           exclude_association_ids: drawn_association_ids
+                                       exclude_association_ids: drawn_association_ids,
+                                       stored_order: element.style&.fetch(:stored_attribute_order, false)
                          )
                        else
                          []

data/lib/ea/svg/ea_emitter/marker/diamond.rb

@@ -4,27 +4,11 @@ module Ea
   module Svg
     module EaEmitter
       module Marker
-        # Diamond marker at the whole end of an aggregation, plus a
-        # navigability arrow apexing at the diamond's line-side tip.
-        #
-        # WHOLE-END SELECTION: EA flags the whole end either through
-        # t_connector.DestAccess (1 shared / 2 composite -> whole at
-        # the TARGET; corpus-verified 333EFCCF: PersonalRight_E is
-        # the DestAccess=2 end and every diamond sits there) or
-        # through the Connector_Type itself ("Aggregation"/
-        # "Composition" -> whole at the SOURCE; basic.qea's
-        # composition diagram). DestAccess wins when both appear.
-        # Without relationship data the direction heuristic applies
-        # ("Destination -> Source" -> whole at target).
-        #
-        # ARROW: dest-flagged aggregations draw a base-12 height-15
-        # open arrow stacked on the diamond tip pointing into the
-        # whole (333EFCCF: 6 diamonds + 6 path arrows). Type-inferred
-        # source-side aggregations draw the diamond only (basic.qea:
-        # 17 diamonds, 0 arrows).
+        # EA endpoint fields select the diamond end; direction selects
+        # the arrow end for target-owned aggregations.
         class Diamond < Kind
           def self.handles?(effective_type)
-            effective_type == "Aggregation" || effective_type == "Composition"
+            %w[Aggregation Composition].include?(effective_type)
           end
 
           def self.specs_for(connector, source, target, before_target, after_source, relationship: nil)
@@ -36,10 +20,8 @@ module Ea
                                         base: whole_base)]
             return specs unless whole_at_target
 
-            specs << Registry::Spec.new(shape: :arrow,
-                                        anchor: whole_anchor,
-                                        base: whole_base)
-            specs
+            specs.concat(direction_specs(connector, source, target,
+                                         before_target, after_source))
           end
 
           def self.whole_at_target?(connector, relationship)
@@ -58,6 +40,18 @@ module Ea
             relationship &&
               %w[shared composite].include?(relationship.source_aggregation.to_s)
           end
+
+          def self.direction_specs(connector, source, target, before_target,
+                                   after_source)
+            if connector.direction == "Destination -> Source"
+              return [Registry::Spec.new(shape: :arrow, anchor: source,
+                                         base: after_source)]
+            end
+
+            [Registry::Spec.new(shape: :arrow, anchor: target,
+                                base: before_target)]
+          end
+          private_class_method :direction_specs
         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.106"
+  VERSION = "0.6.107"
 end

data/memory/deviations.md

@@ -0,0 +1,3 @@
+# Focused Ruby deviations
+
+- Issue 135 attribute ordering: RuboCop Metrics/MethodLength flags the 14-line real-QEA fixture builder, and Metrics/BlockLength flags its six-example public pipeline regression group. Keep the fixture together and the directly related controls in one group; splitting them would obscure the input collections and ordering contract.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ea
 version: !ruby/object:Gem::Version
-  version: 0.6.106
+  version: 0.6.107
 platform: ruby
 authors:
 - Ribose Inc.
@@ -1012,6 +1012,7 @@ files:
 - lib/ea/xml_escape.rb
 - lib/tasks/fonts.rake
 - lib/tasks/svg_bench.rake
+- memory/deviations.md
 - reference-docs/enterprise-architect-appearance-dialogs/appearance-1-diagram-1-themes-list.png
 - reference-docs/enterprise-architect-appearance-dialogs/appearance-1-diagram-1-themes.png
 - reference-docs/enterprise-architect-appearance-dialogs/appearance-1-diagram-2-gradients.png