ea 0.6.20 → 0.6.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4414e6921d37d619d953382395e7ecf9c8ddb19da4cca389e57177eb7a4ab398
-  data.tar.gz: 3365590f62c21b9855d18d70656515b361c4c93def5fe1d8341af944ed01822c
+  metadata.gz: 995544bb338cd3ca1a632cd580c978aeb4e85e59e74cce7d35df5736714e397c
+  data.tar.gz: c1039f763b50e27f87bfc94f72fdac4de3f542b4a21e7eeb19caf688563ffe9c
 SHA512:
-  metadata.gz: 87930fec1aeee29cae1c4352527bcb896147f971427c78a1f58c053b3496d891b82d78afd5aadd7e43a6356534ac9393c21c405cdb991d2703d228706077c01b
-  data.tar.gz: 2d0bce26c6aad8b83004004b86e156306847331b2e357c1599793dfce22ce8f953ee179fae02dde2a327f2c408faf347bbfeab5f3551f520954bccd801b9e56a
+  metadata.gz: cbc871ca5c043bc1555fb8940beebe50258bfe901df6b2b2e61a7f572ef103dff9aa757dd9896e555dea8da9bf8f17b5a72e8035caeab044dd9f58d5cd730e33
+  data.tar.gz: 28a342b4ed8e0129e52f706982d3aa4d0504496fcb15f439158a5c6b8f39128fb1e3ac1dccc12033b55753876904fd9f7f659c66a8181abf3dd249d517ff0741

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

@@ -25,14 +25,48 @@ module Ea
           def render_literals_block(context)
             line_h = context.size + LITERAL_LINE_OFFSET
             text_blocks = []
+            row_y = context.geometry.enum_literal_first_y
+            # EA renders a centered italic "literals" caption above
+            # the rows when the literals carry stored code values
+            # (t_attribute.Default); bare literal lists render the
+            # rows directly. Corpus-verified (PT_TypeOfSA:
+            # "literals" caption + "ServingParcel = SP" rows;
+            # CV_SequenceType: bare rows, no caption).
+            if caption?(context)
+              text_blocks << caption_text(context, row_y)
+              row_y += line_h
+            end
             context.enum_literals.each_with_index do |literal, idx|
-              y = context.geometry.enum_literal_first_y + (idx * line_h)
+              y = row_y + (idx * line_h)
               text_blocks << visibility_placeholder(context, y)
               text_blocks << literal_name_text(context, literal, y)
             end
             wrap_group(text_blocks, context.theme.text_color)
           end
 
+          def caption?(context)
+            context.enum_literals.any? do |l|
+              value = l.value.to_s
+              !value.empty? && value != l.name.to_s
+            end
+          end
+
+          def caption_text(context, y)
+            content = "literals"
+            len = TextRenderer.estimate_width(content, context.size, nil,
+                                              family: context.family).round
+            x = (context.bounds.x + (context.bounds.width - len) / 2.0).floor
+            TextRenderer.new(
+              content: content,
+              x: x, y: y,
+              family: context.family, size: context.size, size_unit: context.size_unit,
+              fill: context.theme.text_color,
+              stroke_in_text: context.theme.stroke_in_text_color,
+              width_factor: context.theme.text_width_factor,
+              style: "italic"
+            ).to_svg
+          end
+
           def visibility_placeholder(context, y)
             TextRenderer.new(
               content: " ",
@@ -46,8 +80,9 @@ module Ea
           end
 
           def literal_name_text(context, literal, y)
+            content = literal_display(literal)
             TextRenderer.new(
-              content: literal.name.to_s,
+              content: content,
               x: context.bounds.x + (context.theme.attribute_spec.content_x_offset || 26),
               y: y,
               family: context.family, size: context.size, size_unit: context.size_unit,
@@ -57,6 +92,15 @@ module Ea
             ).to_svg
           end
 
+          # EA shows "Name = Code" for literals with a stored
+          # default value; bare names otherwise.
+          def literal_display(literal)
+            value = literal.value.to_s
+            return literal.name.to_s if value.empty? || value == literal.name.to_s
+
+            "#{literal.name} = #{value}"
+          end
+
           def wrap_group(text_blocks, text_color)
             style = "stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel; " \
                     "fill:#{text_color};fill-opacity:1.00; " \

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

@@ -84,10 +84,10 @@ module Ea
           op_lines = (is_classifier && show_operations?) ? Element::OperationRenderer.lines_for(classifier) : []
           geometry = compartment_geometry(bounds, size, attr_lines, op_lines,
                                            tagged_values_for(classifier).size,
-                                           header_lines,
+                                           header_lines, classifier: classifier,
                                            constraints_count: constraints_for(classifier).size,
                                            marker_count: marker_lines_for(classifier).size,
-                                           enum_literals_count: enum_literals_for(classifier).size)
+                                           enum_literals_count: enum_row_count_for(classifier))
           # EA suppresses the whole attribute compartment when its
           # rows do not fit the stored box height (never truncates
           # rows) - the AOS box on CityFurniture hides its
@@ -100,10 +100,10 @@ module Ea
             attr_lines = []
             geometry = compartment_geometry(bounds, size, attr_lines, op_lines,
                                              tagged_values_for(classifier).size,
-                                             header_lines,
+                                             header_lines, classifier: classifier,
                                              constraints_count: constraints_for(classifier).size,
                                            marker_count: marker_lines_for(classifier).size,
-                                           enum_literals_count: enum_literals_for(classifier).size)
+                                           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).
@@ -112,10 +112,10 @@ module Ea
             op_lines = []
             geometry = compartment_geometry(bounds, size, attr_lines, op_lines,
                                              tagged_values_for(classifier).size,
-                                             header_lines,
+                                             header_lines, classifier: classifier,
                                              constraints_count: constraints_for(classifier).size,
                                            marker_count: marker_lines_for(classifier).size,
-                                           enum_literals_count: enum_literals_for(classifier).size)
+                                           enum_literals_count: enum_row_count_for(classifier))
           end
           RenderContext.new(
             element: element,
@@ -145,7 +145,7 @@ module Ea
         end
 
         def compartment_geometry(bounds, size, attr_lines, op_lines,
-                                 tagged_count, header_lines,
+                                 tagged_count, header_lines, classifier: nil,
                                  constraints_count: 0, marker_count: 0,
                                  enum_literals_count: 0)
           CompartmentGeometry.new(bounds: bounds, size: size,
@@ -156,7 +156,7 @@ module Ea
                                    constraints_count: constraints_count,
                                    marker_count: marker_count,
                                    enum_literals_count: enum_literals_count,
-                                   header_top_padding: header_padding_for(header_lines),
+                                   header_top_padding: header_padding_for(header_lines, classifier),
                                    header_line_offset: theme.compartments.header_line_offset,
                                    divider_offset: theme.compartments.divider_offset,
                                    attr_line_offset: theme.compartments.attr_line_offset,
@@ -164,21 +164,29 @@ module Ea
         end
 
         # EA seats a stereotype line 3px higher than a bare class name
-        # (first baseline +16 vs +19 at 7pt) - verified against the
-        # EA-published reference SVGs.
-        def header_padding_for(header_lines)
+        # (first baseline +16 vs +19 at 7pt) - and Enumeration /
+        # Interface elements seat their stereotype 3px higher still
+        # (+13). Corpus-verified by identity-matched elements:
+        # Interface +13 x44 vs +16 x17, Enumeration +13 x13 vs +16
+        # x3, Class/Object/DataType +16 x515.
+        def header_padding_for(header_lines, classifier)
           first = header_lines.first
           return theme.compartments.header_top_padding unless first
 
           if first.last == :italic
             6 # ghost-led: EA seats the right-aligned ghost at +13
           elsif first.first.to_s.start_with?("«")
-            9
+            enumeration_or_interface?(classifier) ? 6 : 9
           else
             theme.compartments.header_top_padding
           end
         end
 
+        def enumeration_or_interface?(classifier)
+          classifier.is_a?(Ea::Model::Enumeration) ||
+            classifier.is_a?(Ea::Model::Interface)
+        end
+
         # A stereotype group header («Property») sits 4px below where
         # plain rows start (divider+18 vs divider+14 at 7pt).
         def attr_first_offset_for(attr_lines)
@@ -196,6 +204,14 @@ module Ea
           classifier.literals || []
         end
 
+        # The "literals" caption occupies a row slot when any
+        # literal carries a stored code value.
+        def enum_row_count_for(classifier)
+          literals = enum_literals_for(classifier)
+          caption = literals.any? { |l| !l.value.to_s.empty? && l.value.to_s != l.name.to_s }
+          literals.size + (caption ? 1 : 0)
+        end
+
         def tagged_values_for(classifier)
           return [] 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.20"
+  VERSION = "0.6.22"
 end

metadata

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