ea 0.6.66 → 0.6.68

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53d5c1cd5e970e7c26ed55e55e86487d2907dc1aabf6d5ef179bca4a85c2cfdb
-  data.tar.gz: 9da246b062c598d455d7a3a13c7c5f0b0ac28fe9d141a19d26b5521b54d3b85f
+  metadata.gz: c7fcedda4b91a88d79b8f5465244ee52b36fd404ac2b857bc1d1451894a6e3c7
+  data.tar.gz: 830e1eaa359016448a29883887c4648f026868c634df5c4debb2364416b1d14a
 SHA512:
-  metadata.gz: 4d36f5777e743ce2b1ee995338e191b2fa6912622a6ab4a401449b3877880ab3c4cdac54ffb16be575758d436956eba86badaacf26a4e613299c68bc71d4c720
-  data.tar.gz: 50dd7b12049c64807c8e671e1e912f367b8f55e222a137e1e52ed7b4b950430d619882798934fd42f6560fd4182d3482cca2290fac8447d751e0b785bb202204
+  metadata.gz: f20b3391834fb6eb79400b6b502eed84b3cc557438a69699061a54a11368b88588c955285be2bff805600f8d5a70ba274d0f9f89157311ee9ec8130e978c8cd1
+  data.tar.gz: c0408d5d3094d7111a01c9ef62ccf2ad44949006a7366a60e1e708612af285863fe476a6a7e977f078b8d798a71f5045ece48578a16d407e8dc945e4be9f3b54

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

@@ -10,17 +10,27 @@ module Ea
         class AttributeRenderer
           DEFAULT_VISIBILITY_X_OFFSET = 5
           DEFAULT_CONTENT_X_OFFSET = 22
+
           DEFAULT_FONT_UNIT = "pt"
           # EA seats compartment stereotype headers («Property») 12px
           # from the box edge and spaces rows 13px at 7pt.
           STEREOTYPE_HEADER_X_OFFSET = 12
           ROW_LINE_OFFSET = 6
 
+
+          # EA scales the row text inset with point size:
+          # 7pt rows sit at box.x+22, 9pt at box.x+26 (the '+ '
+          # visibility run stays at box.x+5 for both).
+          def self.content_x_offset(size)
+            DEFAULT_CONTENT_X_OFFSET + 2 * (size - 7)
+          end
+
           def self.render(lines, bounds:, first_y:, family:,
                           size:, size_unit: DEFAULT_FONT_UNIT,
                           fill: "#000000",
                           visibility_x_offset: DEFAULT_VISIBILITY_X_OFFSET,
-                          content_x_offset: DEFAULT_CONTENT_X_OFFSET)
+                          content_x_offset: nil)
+
             line_h = size + ROW_LINE_OFFSET
             text_blocks = []
             lines.each_with_index do |line, idx|
@@ -28,7 +38,9 @@ module Ea
               visibility, rest = split_visibility(line)
               if visibility
                 text_blocks << build_text(bounds.x + visibility_x_offset, y, visibility, family, size, size_unit, fill)
-                text_blocks << build_text(bounds.x + content_x_offset, y, rest, family, size, size_unit, fill)
+                offset = (content_x_offset || DEFAULT_CONTENT_X_OFFSET) +
+                         2 * (size - 7)
+                text_blocks << build_text(bounds.x + offset, y, rest, family, size, size_unit, fill)
               elsif line.strip.start_with?("«")
                 text_blocks << build_text(bounds.x + STEREOTYPE_HEADER_X_OFFSET, y, line.strip, family, size, size_unit, fill)
               else

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

@@ -37,7 +37,7 @@ module Ea
               y = first_y + ((idx + offset) * line_h)
               text_blocks << build_text(bounds.x + VISIBILITY_X_OFFSET, y,
                                          visibility_prefix(op), family, size)
-              text_blocks << build_text(bounds.x + CONTENT_X_OFFSET, y,
+              text_blocks << build_text(bounds.x + AttributeRenderer.content_x_offset(size), y,
                                          operation_text(op), family, size)
             end
             %(<g style="#{Style::TEXT_GROUP}">\n#{text_blocks.join("\n")}\n</g>)

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

@@ -124,8 +124,15 @@ module Ea
           # attribute rows (936AA434/Surface lists its nine 19107
           # attributes); the earlier corpus evidence for
           # header-only interfaces was zero-attribute leaf types.
+          # Regenerated contexts ignore stored per-element visibility
+          # toggles - EXCEPT for boxes whose only rows are
+          # association-derived properties (5833A95E keeps those
+          # suppressed even on FOC=0; 0CABA7D7 shows its association
+          # row because the class also owns real attributes).
           attr_lines = if is_classifier && show_attributes? &&
-                          attributes_visible?(element)
+                          (attributes_visible?(element) ||
+                           (regenerated_context? &&
+                            classifier.properties.to_a.any? { |pr| !pr.association_id }))
                          Element::AttributeRenderer.lines_for(
                            classifier, lookup: attribute_lookup,
                            exclude_association_ids: drawn_association_ids
@@ -133,7 +140,8 @@ module Ea
                        else
                          []
                        end
-          op_lines = if is_classifier && show_operations? && operations_visible?(element)
+          op_lines = if is_classifier && show_operations? &&
+                        (operations_visible?(element) || regenerated_context?)
                         Element::OperationRenderer.lines_for(classifier)
                       else
                         []
@@ -471,8 +479,7 @@ module Ea
         # (descendant packages included). Corpus-verified (450
         # diagrams): ShowForeign=0 renders plain everywhere.
         def regenerated_context?
-          diagram.name.to_s.downcase.start_with?("context diagram") &&
-            diagram.style_ex.to_s !~ /SuppressFOC=1/
+          diagram.style_ex.to_s !~ /SuppressFOC=1/
         end
 
         def foreign_package_name_for(classifier)

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.66"
+  VERSION = "0.6.68"
 end

metadata

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