ea 0.6.50 → 0.6.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b916fbabbb74feb86f428a75fc8619acad646f676767544c1128e0ba635d3f52
-  data.tar.gz: dc470c0abf5864ccf0fa0c5d42d76a429b2491c30df15e6c19ff1231416b88f7
+  metadata.gz: 592e737c7721bcd03e989dc13572a79c4e8aa53aa654daad717398edb66377ef
+  data.tar.gz: 351a11a714b03d40859c3ad86000eb22efc9edde45d3bb376961fd0f1cbad44d
 SHA512:
-  metadata.gz: 49e1694bc33b133631b8baae3abe2cc0e0b154b06dbc1dc39b1ad6801b781939a80ab17edb63eb07bb58726aeff81d6210e3ae9198172cee2e68943cb7ae9de6
-  data.tar.gz: fc902135136a3103cc8456651d56c2945320f208aebfc8fd72be47c20bc389f9206f0704e559e7c824b2a1818dd238e5ab02c4559f48992e2047babd7d572ea1
+  metadata.gz: e6cdf30f3261579e60f8d72a48b50adf011d4a2afc6398de8edff40ee2eeb701c4a2f605262714fadd19d6e28d2144df3fb7fa51bb04ce4b9306b04beda16df1
+  data.tar.gz: 0d0cb7de7ad76775de6751904ea3de403d8d645ad3c7acfee0d4394237d0d330846927ba8d720cf7dd5293c44c9c46c3c8c9bd604119962c45dc98ffc34423bb

data/lib/ea/model/instance_specification.rb

@@ -10,6 +10,7 @@ module Ea
       attribute :name, :string
       attribute :classifier_id, :string
       attribute :classifier_name, :string
+      attribute :stereotype, :string
       attribute :package_id, :string
       attribute :package_name, :string
       attribute :qualified_name, :string
@@ -22,6 +23,7 @@ module Ea
         map "name", to: :name
         map "classifierId", to: :classifier_id
         map "classifierName", to: :classifier_name
+        map "stereotype", to: :stereotype
         map "packageId", to: :package_id
         map "packageName", to: :package_name
         map "qualifiedName", to: :qualified_name

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

@@ -112,12 +112,14 @@ module Ea
         end
 
         # EA stores the element font size in tenths of a point in the
-        # objectstyle string. 0 means "use default", and 80/90 (8pt /
-        # 9pt) are EA's classic defaults the dialogs write back when
-        # the user never customized — verified against EA-published
-        # reference images, where such elements render at the theme
-        # size. Only genuinely custom sizes are surfaced as explicit
-        # element fonts.
+        # objectstyle string, SHIFTED one point up from what it
+        # renders: explicit fontsz 100 renders 9pt (0D31AED1: every
+        # element stores 100, all 321 texts publish at 9pt), 70
+        # renders 6pt, 140 renders 13pt. 0 means "use default", and
+        # 80/90 (8pt / 9pt) are EA's classic defaults the dialogs
+        # write back when the user never customized — such elements
+        # render at the theme size. Only genuinely custom sizes are
+        # surfaced as explicit element fonts.
         USE_DEFAULT_FONTSZ = [0, 80, 90].freeze
 
         def font_size_from(style_hash)
@@ -126,23 +128,9 @@ module Ea
 
           return nil if raw.to_i.zero?
 
-          stored = (raw.to_f / 10).round
-          return stored - 1 if note_element? && stored > 1
-
           return nil if USE_DEFAULT_FONTSZ.include?(raw.to_i)
 
-          stored
-        end
-
-        # Text/Note elements carry their real font size in fontsz
-        # shifted by one point (stored 100 renders 9pt, 80 renders
-        # 7pt - corpus-verified on EA-published note SVGs);
-        # classifiers keep the use-default convention.
-        def note_element?
-          return false unless database && @current_obj_row
-
-          obj = database.find_object(@current_obj_row.ea_object_id.to_i)
-          obj&.object_type.to_s == "Text"
+          (raw.to_f / 10).round - 1
         end
 
         def build_connectors(diagram_row)

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

@@ -36,6 +36,7 @@ module Ea
             name: row.name.to_s,
             classifier_id: classifier_id_for(row),
             classifier_name: classifier_name_for(row),
+            stereotype: row.stereotype.to_s,
             package_id: package_id_for(row),
             package_name: package_name_for(row),
             qualified_name: qualified_name_for(row),

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

@@ -7,9 +7,10 @@ module Ea
         # Instance slot compartment. Renders each slot on an
         # InstanceSpecification as "name op value", then appends
         # "(from PackageName)" in italics below the slots when the
-        # instance has a classifier. Skipped entirely when the model
-        # element is not an InstanceSpecification or has neither
-        # slots nor a classifier.
+        # instance is foreign to the diagram's package. Skipped
+        # entirely when the model element is not an
+        # InstanceSpecification or has neither slots nor a
+        # classifier.
         module InstanceSlots
           ROW_OFFSET = 13
           SUBTITLE_EXTRA_OFFSET = 10
@@ -21,7 +22,7 @@ module Ea
 
             instance = context.model_element
             slots = instance.slots || []
-            subtitle = from_package_subtitle(instance)
+            subtitle = from_package_subtitle(instance, context.diagram)
             return nil if slots.empty? && subtitle.nil?
 
             first_y = context.geometry.attr_first_y
@@ -44,7 +45,17 @@ module Ea
           end
           module_function :instance?
 
-          def from_package_subtitle(instance)
+          # EA draws "(from PackageName)" only for instances FOREIGN
+          # to the diagram's own package: every instance diagram in
+          # the corpus has local instances and EA renders the
+          # subtitle nowhere (FC590D99: 23 local FIG2010 instances,
+          # zero "(from" lines in the published SVG).
+          def from_package_subtitle(instance, diagram)
+            if diagram && instance.package_id && diagram.package_id &&
+               instance.package_id == diagram.package_id
+              return nil
+            end
+
             pkg = instance.package_name
             return nil if pkg.nil? || pkg.empty?
 

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

@@ -22,6 +22,7 @@ module Ea
                                :bounds_width, :font_size, :family,
                                :off_canvas_parent_name,
                                :foreign_package_name,
+                               :suppress_stereotypes,
                                keyword_init: true)
 
           PROVIDERS = [
@@ -39,9 +40,18 @@ module Ea
           end
 
           # Greedy word wrap measured with the header's own font.
-          # EA wraps overflowing headers at word boundaries
-          # (81F92FC7: instance header "new ownership: LA_Right"
+          # EA wraps overflowing headers at word boundaries and after
+          # "::" qualifiers (F851A657: class "Content
+          # information::MD_FeatureCatalogueDescription" renders as
+          # "Content information::" / "MD_FeatureCatalogueDescription";
+          # 81F92FC7: instance header "new ownership: LA_Right"
           # renders as "new ownership:" / "LA_Right").
+          # Headers wrap against a USABLE width of box width - 6:
+          # EA wrapped "SU_PB2: LA_SpatialUnit" (parts 36 + 59 +
+          # space 4 = 99) inside a 100px box, while
+          # "FuelStation: LA_BAUnit" (94) stayed single in a 100px
+          # box - the corpus boundary is margin 5 wrapped vs 6
+          # unwrapped (FC590D99 vs CBC03448).
           def self.wrap_words(text, context, weight)
             font_style = weight == :bold_italic ? "italic" : "normal"
             width = lambda do |s|
@@ -51,15 +61,17 @@ module Ea
               ).round
             end
             return [text] if context.bounds_width.nil?
-            return [text] if width.call(text) <= context.bounds_width.to_i
+            usable = context.bounds_width.to_i - 6
+            return [text] if width.call(text) <= usable
 
+            segments = wrap_segments(text)
             lines = []
             current = +""
-            text.split(" ").each do |word|
-              candidate = current.empty? ? word : "#{current} #{word}"
-              if !current.empty? && width.call(candidate) > context.bounds_width.to_i
+            segments.each do |segment|
+              candidate = current + segment
+              if !current.empty? && width.call(candidate) > usable
                 lines << current
-                current = word
+                current = +segment.lstrip
               else
                 current = candidate
               end
@@ -67,6 +79,32 @@ module Ea
             lines << current unless current.empty?
             lines
           end
+
+          # Break opportunities: after each space and after each
+          # "::". Each segment carries the separator that PRECEDES
+          # it ("" after "::", " " after a word), so joining all
+          # segments reproduces the original text exactly.
+          def self.wrap_segments(text)
+            segments = []
+            pending = ""
+            text.split(" ").each do |word|
+              chunk = +""
+              word.split(/(::)/).each_slice(2) do |part, sep|
+                chunk << pending << part
+                pending = ""
+                if sep
+                  chunk << sep
+                  segments << chunk.dup
+                  chunk.clear
+                end
+              end
+              unless chunk.empty?
+                segments << chunk.dup
+                pending = " "
+              end
+            end
+            segments
+          end
         end
       end
     end

data/lib/ea/svg/ea_emitter/element/header_line_provider/instance_spec.rb

@@ -6,22 +6,37 @@ module Ea
       module Element
         module HeaderLineProvider
           # InstanceSpecification: short-circuits the pipeline. The
-          # header for an instance is "name: Classifier" on one bold
-          # line, word-wrapped when it overflows the box (81F92FC7:
-          # "new ownership:" / "LA_Right").
+          # header for an instance is its own «stereotype» line (the
+          # t_object.Stereotype value, verbatim - «featureType»,
+          # «FeatureType», «type» …) followed by "name: Classifier"
+          # on one bold line, word-wrapped when it overflows the box
+          # (81F92FC7: "new ownership:" / "LA_Right"). The stereotype
+          # line is suppressed by the diagram pdata flag
+          # HideEStereo=1 (FC590D99 shows it; the Annex C "Case"
+          # diagrams with HideEStereo=1 show none).
           class InstanceSpec
             def self.call(context)
               inst = context.classifier
               return [] unless inst.is_a?(Ea::Model::InstanceSpecification)
 
+              lines = stereotype_lines(inst, context)
               label = inst.name.to_s
               if inst.classifier_name && !inst.classifier_name.empty?
                 label = "#{label}: #{inst.classifier_name}"
               end
-              HeaderLinePipeline.wrap_words(label, context, :bold).map do |line|
+              lines + HeaderLinePipeline.wrap_words(label, context, :bold).map do |line|
                 [line, :bold]
               end
             end
+
+            def self.stereotype_lines(inst, context)
+              return [] if context.suppress_stereotypes
+
+              st = inst.stereotype.to_s
+              return [] if st.empty?
+
+              [["«#{st}»", :normal]]
+            end
           end
         end
       end

data/lib/ea/svg/ea_emitter/element/header_line_provider/name.rb

@@ -58,7 +58,11 @@ module Ea
                 name, context.font_size || 9, nil,
                 family: context.family, weight: "700", style: font_style
               ).round
-              len > context.bounds_width
+              # Same usable width as wrap_words: box width - 6.
+              # EA wraps "Content information::MD_FeatureCatalogue-
+              # Description" (parts 86 + 137 + space 4 = 227) inside
+              # a 230px box (F851A657).
+              len > context.bounds_width.to_i - 6
             end
 
             # EA renders the plain classifier name in element headers;

data/lib/ea/svg/ea_emitter/element/header_line_provider/stereotype_label.rb

@@ -17,6 +17,10 @@ module Ea
             def self.call(context)
               classifier = context.classifier
               return [] if classifier.is_a?(Ea::Model::InstanceSpecification)
+              # Diagram pdata HideEStereo=1 suppresses classifier
+              # stereotype lines too (the Annex C "Case" diagrams
+              # render zero «...» lines, classes included).
+              return [] if context.suppress_stereotypes
 
               labels = label_for(classifier, context.umldi_keyword)
               return [] if labels.empty?

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

@@ -126,7 +126,8 @@ module Ea
                                                                 font_size: size,
                                                                 family: family,
                                                                 off_canvas_parent_name: parent_name,
-                                                                foreign_package_name: foreign_package_name_for(classifier)) : []
+                                                                foreign_package_name: foreign_package_name_for(classifier),
+                                                                suppress_stereotypes: suppress_stereotypes?) : []
           is_classifier = classifier.is_a?(Ea::Model::Classifier)
           attr_lines = if is_classifier && show_attributes? &&
                           !classifier.is_a?(Ea::Model::Interface) &&
@@ -262,7 +263,7 @@ module Ea
           first = header_lines.first
           return theme.compartments.header_top_padding unless first
 
-          if first.last == :italic
+          if first.last == :italic || first.last == :italic_tight
             6 # ghost-led: EA seats the right-aligned ghost at +13
           elsif first.first.to_s.start_with?("«")
             enumeration_or_interface?(classifier) ? 6 : 9
@@ -276,6 +277,14 @@ module Ea
             classifier.is_a?(Ea::Model::Interface)
         end
 
+        # t_diagram pdata HideEStereo=1 suppresses every stereotype
+        # line on the diagram - instance boxes ("Case C25" renders
+        # no «featureType» despite every instance carrying one) and
+        # classifier boxes alike.
+        def suppress_stereotypes?
+          diagram.style.to_s.match?(/HideEStereo=1/)
+        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)

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

@@ -42,8 +42,11 @@ module Ea
           explicit = element&.font_size
           explicit = nil if explicit&.zero?
           return explicit if explicit
-          return diagram_default_size if diagram_default_size
 
+          # An element's own explicit fontsz never re-sizes its
+          # neighbours: default elements always render at the theme
+          # size (9BA1CE54: one 9pt label + six use-default
+          # instances; EA publishes the six at 7pt).
           DEFAULT_ELEMENT_FONT_SIZE
         end
 
@@ -77,13 +80,6 @@ module Ea
           most_common(families)
         end
 
-        def diagram_default_size
-          sizes = element_sizes
-          return nil if sizes.empty?
-
-          most_common(sizes)
-        end
-
         FALLBACK_DEFAULT_FAMILY = "Calibri"
 
         def most_common(values)
@@ -97,10 +93,6 @@ module Ea
           (diagram.elements || []).map(&:font_family).compact
         end
 
-        def element_sizes
-          (diagram.elements || []).map(&:font_size).compact.reject(&:zero?)
-        end
-
         def tally_values(values)
           values.each_with_object(Hash.new(0)) { |v, acc| acc[v] += 1 }
         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.50"
+  VERSION = "0.6.52"
 end

metadata

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