ea 0.6.62 → 0.6.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30cdaecff7833cb3af1138d6ac1df0667dbdde2e3b6f109ae456cd6c3c5e1dab
-  data.tar.gz: 9d6fc9c8bd00571d092bcb8250260195758514e7edb62993a5e08c3a19ce0bde
+  metadata.gz: e6f6d084b7fd0042b8f31d006ed91d5fbc00c18d82937cd1ee5f5b6a6a8e2340
+  data.tar.gz: 6a93141b935afeac3c9409e933795100d5207a4ce532c3634906a174b7ce8c6e
 SHA512:
-  metadata.gz: 04b411c70b7d59ec632737088134fdf6cb41205444aa754294f5b6e66406ff49cdcd08fbff7094ecfbd70f62559949255f30783dc1f481a104465e551ce8aabe
-  data.tar.gz: d06fa28bb5c00f669c4d6ac3b99abfc5f410680d1a0a9770ff9969b7ed2ad5dd7753b17964c2553189e217ce67f3ed6875fbaf7e404f3c11d813c7781951a8bb
+  metadata.gz: f4ff485fff168ca3d18ee168d1fa8f3c2acc168d8eb748cedd17c356b98ff8b9abea4b03432c5d3643c956025f358e25a7783cd24806e4e20f494df914992851
+  data.tar.gz: 9351c617930b3c3c54e74b98dc7da68ec8fe12d2031daf28cf0e0a99d0ca7c35f20fc49e85ca726634f9d7c86003b201f3dd808d00d5bc3ed1e7a0e8bc31a96d

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

@@ -128,6 +128,29 @@ module Ea
                                                                 off_canvas_parent_name: parent_name,
                                                                 foreign_package_name: foreign_package_name_for(classifier),
                                                                 suppress_stereotypes: suppress_stereotypes?) : []
+          # Regenerated contexts (SuppressFOC=0) re-size EVERY box to
+          # fit ALL content (7F10BFBD: Set enum box stored 70x59 ->
+          # EA 165x223 with all six literals unwrapped): width =
+          # max(stored, title + pad_t, widest row + 8), height likewise
+          # grows via the standard content growth. Frozen contexts
+          # (SuppressFOC=1) keep stored sizes and wrap.
+          if regenerated_context? && classifier.is_a?(Ea::Model::Classifier) &&
+             !classifier.is_a?(Ea::Model::Package)
+            preview_lines = []
+            if show_attributes? && attributes_visible?(element) &&
+               !classifier.is_a?(Ea::Model::Interface)
+              preview_lines += Element::AttributeRenderer.lines_for(
+                classifier, lookup: attribute_lookup,
+                exclude_association_ids: drawn_association_ids
+              )
+            end
+            if show_operations? && operations_visible?(element)
+              preview_lines += Element::OperationRenderer.lines_for(classifier)
+            end
+            bounds = context_resized_bounds(bounds, classifier, size, family,
+                                            preview_lines)
+          end
+
           is_classifier = classifier.is_a?(Ea::Model::Classifier)
           # Interfaces DO render attribute compartments when they own
           # attribute rows (936AA434/Surface lists its nine 19107
@@ -143,6 +166,7 @@ module Ea
                          []
                        end
           op_lines = if is_classifier && show_operations? && operations_visible?(element)
+            $stderr.puts "DBG ops: show=#{show_operations?} vis=#{operations_visible?(element)} cls=#{classifier.class} nops=#{classifier.operations.to_a.size}"
                         Element::OperationRenderer.lines_for(classifier)
                       else
                         []
@@ -177,8 +201,24 @@ module Ea
                                            enum_literals_count: enum_row_count_for(classifier))
           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 &&
+          # overflow the stored box height (same rule as attributes)
+          # - EXCEPT on regenerated contexts, where EA GROWS the box
+          # to fit every row instead (7F10BFBD: Set stored 70x59 ->
+          # drawn 165x223 with all twelve operations).
+          if regenerated_context? && op_lines.any? && geometry.op_first_y &&
+             geometry.op_bottom_y.to_i > bounds.y + bounds.height
+            bounds = Ea::Model::Bounds.new(
+              x: bounds.x, y: bounds.y,
+              width: bounds.width,
+              height: geometry.op_bottom_y.to_i + 8 - bounds.y
+            )
+            geometry = compartment_geometry(bounds, size, attr_lines, op_lines,
+                                             tagged_values_for(classifier).size,
+                                             header_lines, classifier: classifier,
+                                             constraints_count: constraints_for(classifier).size,
+                                           marker_count: marker_lines_for(classifier).size,
+                                           enum_literals_count: enum_row_count_for(classifier))
+          elsif op_lines.any? && geometry.op_first_y &&
              geometry.op_bottom_y.to_i > bounds.y + bounds.height
             op_lines = []
             geometry = compartment_geometry(bounds, size, attr_lines, op_lines,
@@ -198,7 +238,12 @@ module Ea
           # position even with zero operations), so it must stay out
           # of the max.
           grown_bottom = geometry.content_bottom_y.to_i
-          if attr_lines.any? && grown_bottom.positive? &&
+          # Enum literals grow the box too (7F10BFBD 'Context Diagram:
+          # Bag': Set enum box stored h59 -> EA 223 fitting six
+          # literals); op-only boxes keep the no-growth behavior
+          # (op_bottom_y is a divider sentinel, not content).
+          if (attr_lines.any? || enum_literals_for(classifier).any?) &&
+             grown_bottom.positive? &&
              grown_bottom + 8 > bounds.y + bounds.height
             bounds = Ea::Model::Bounds.new(
               x: bounds.x, y: bounds.y,
@@ -419,6 +464,34 @@ module Ea
         # classifier lives in a different package than the diagram
         # (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/
+        end
+
+        TITLE_PAD = 18
+
+        def context_resized_bounds(bounds, classifier, size, family, rows)
+          label = classifier.name.to_s
+          pkg = foreign_package_name_for(classifier)
+          label = "#{pkg}::#{label}" if pkg
+          title_w = TextRenderer.estimate_width(
+            label, size, nil, family: family, weight: "700"
+          ).round
+          pad = title_w.odd? ? TITLE_PAD : 16
+          row_w = rows.map do |line|
+            line = line.sub(/\A«[^»]*»\z/, "")
+            TextRenderer.estimate_width(
+              line, size, nil, family: family, weight: "400"
+            ).round + 8
+          end.max.to_i
+          needed = [bounds.width, title_w + pad, row_w].max
+          return bounds if needed <= bounds.width
+
+          Ea::Model::Bounds.new(x: bounds.x, y: bounds.y,
+                                width: needed, height: bounds.height)
+        end
+
         def foreign_package_name_for(classifier)
           return nil unless diagram.show_foreign
           return nil unless classifier.is_a?(Ea::Model::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.62"
+  VERSION = "0.6.63"
 end

metadata

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