ea 0.6.45 → 0.6.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70775a4db6ad6a0d240e3eb3de0e60aa31db24561ad167898a9613df3f431810
-  data.tar.gz: b15a7d2bcce540619ed08e2fb32d6fe427850a6381e6db15dd72a25b6bc6739f
+  metadata.gz: 883c961d3fd0e63b7d48117b76db47d79e90a62ed1027ad2cf4aa55082ee5132
+  data.tar.gz: d499d2e8b9376a7b79004f7da6c82ed8558cbebaca22fe7b9b83f4e3f534df87
 SHA512:
-  metadata.gz: 1d3e2a0d75fc280ab1eea83db6376dd9d6e045569ca99ef5ba5fa7bbc7a39d8c3b5eff7af59fa12bd7ad5b63f2518b16dbc20694b605c80574c5415617635036
-  data.tar.gz: 49baf9df9e8d0327b9d81bc5549edbf3a8d71e4401adbbe5cf895a17bcae8e283daf178e4e87ef5a509b9d7e0a94a2630899e22adebddebcdd9a40f5c1e2042a
+  metadata.gz: f056a65fa2b30039c1602d38e90b775f0fd712be85f36774ddbb068c74649bd47f756eb7aa67c45124fbe698c64119849d468d3b29f527ceb113ce4707ea1b96
+  data.tar.gz: 8dc93dcf117c9ba1cfaff73a4f521f6c1e9ca8189173f992dbd3e7b15cd43712c843f3b9a80b8d668b3d9ca79043a462cffd2404936d441e09202d1c6f9a5c04

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

@@ -85,6 +85,7 @@ module Ea
         end
 
         def build_element(obj_row, diagram_row)
+          @current_obj_row = obj_row
           style_hash = DiagramStyleParser.parse(obj_row.objectstyle)
           Ea::Model::DiagramElement.new(
             id: IdNormalizer.synthetic("de", diagram_row.diagram_id,
@@ -123,9 +124,25 @@ module Ea
           raw = style_hash[:fontsz]
           return nil if raw.nil? || raw.to_s.empty?
 
+          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)
 
-          (raw.to_f / 10).round
+          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"
         end
 
         def build_connectors(diagram_row)

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

@@ -26,23 +26,35 @@ module Ea
           # cumulative integer textLength fits bounds.width - 15.
           # Verified against EA-published reference SVGs.
           def wrapped_lines(context, body)
-            usable = context.bounds.width - 15
+            # EA's note wrap padding is 4: lines fit bounds.width - 4
+            # (9BA1CE54: width 214, longest line tl 210). Pitch and
+            # first-line offset scale with the note font (9pt: pitch
+            # 16 = size+7, first line at bounds.y + 18 = size+9), and
+            # each paragraph break adds one blank pitch row
+            # (paragraph 2 starts 32 after the last line of
+            # paragraph 1).
+            usable = context.bounds.width - 4
             size = context.size
             family = context.family
-            body.to_s.split(/\n/).flat_map do |para|
-              wrap_paragraph(para, usable, size, family)
-            end.each_with_index.map do |line, idx|
-              y = context.bounds.y + context.theme.note.text_y_offset +
-                  (idx * context.theme.note.line_height)
-              TextRenderer.new(
-                content: line,
-                x: context.bounds.x + context.theme.note.text_x_offset,
-                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
-              ).to_svg
+            pitch = size + 7
+            first_offset = size + 9
+            y_index = 0
+            paragraphs = body.to_s.split(/\n/).reject { |p| p.strip.empty? }
+            paragraphs.flat_map do |para|
+              lines = wrap_paragraph(para, usable, size, context.family)
+              lines.each_with_index.map do |line, i|
+                y = context.bounds.y + first_offset + ((y_index + i) * pitch)
+                TextRenderer.new(
+                  content: line,
+                  x: context.bounds.x + context.theme.note.text_x_offset,
+                  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
+                ).to_svg
+              end.tap { y_index += lines.size + 1 }
             end
           end
 

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

@@ -19,8 +19,10 @@ module Ea
               )
             elsif context.model_element.is_a?(Ea::Model::Package) ||
                   context.model_element.is_a?(Ea::Model::Note)
-              label = package_label(context.model_element)
-              stereotype = package_stereotype(context.model_element)
+              # Notes keep the folder silhouette but never render a
+              # label (EA publishes note bodies only).
+              label = package_label(context.model_element) if context.model_element.is_a?(Ea::Model::Package)
+              stereotype = package_stereotype(context.model_element) if context.model_element.is_a?(Ea::Model::Package)
               Element::PackageShapeRenderer.render(
                 context.bounds,
                 fill: context.fill, stroke: context.stroke,

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.45"
+  VERSION = "0.6.47"
 end

metadata

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