ea 0.6.71 → 0.6.72

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d92a28114b6cefd52d187f0ef2df4e5cbce55230607e10fa0bc8ca1c2b355434
-  data.tar.gz: 3f6a7d83031a48cd713ea87ed50efc3d49e204ec8a1b0278a6f0a435b6766cce
+  metadata.gz: d8e91b80d0c035a0deb3122b5ac8cd20b482ff6c49e6fab312d4a003602bc5a1
+  data.tar.gz: bccd0383c8f54915b80e028f4fa7e8468bb0ab71a09508d1e2e35a39682e3892
 SHA512:
-  metadata.gz: '08102b851ec4bcc5e44c6b175e8ecc0f2b76a0cae11b0ae449b85b6080659a16578d2663b666181d770277a53f77c34e5403bcead7974008e4676ccd374846dd'
-  data.tar.gz: ecd88b4905c9b80ae88f81dc528c23611caa2d07c202eb361c3c259b2d0a71c62af66d108ba5f971b69f4f84fe8370094a43aea7fbef8d838f48700457041281
+  metadata.gz: 3ec29aeeb4158f28141c881b67f07b3fa92fa834f05e478a1ea812827e679842754797e6e0bf195c106a96e63fc657d929bf3eecd9894379de7d473d5e9ed78d
+  data.tar.gz: 6be8d9f42a0e5a9d88cbe0dabca9242021aef148ef2bdbf5731a9b226173aae4da68931cfbc9b89ed23148e530e2632c98299a121e4b1fe45388b71c9f292948

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

@@ -12,6 +12,27 @@ module Ea
           DEFAULT_CONTENT_X_OFFSET = 22
 
           DEFAULT_FONT_UNIT = "pt"
+          # EA seats each group-header row («...» following a
+          # non-stereotype row) 4px below the uniform pitch (XSD
+          # schema diagrams: attr row 68 -> «XSDelement» 85 -> row 98;
+          # single-header boxes like «Property» sit at the first row
+          # and keep the plain pitch).
+          GROUP_HEADER_LEAD = 4
+
+          def self.group_lead_offsets(lines)
+            extra = 0
+            lines.each_with_index.map do |line, idx|
+              stereo = line.to_s.strip.start_with?("«")
+              prev_stereo = idx.positive? ? lines[idx - 1].to_s.strip.start_with?("«") : true
+              extra += GROUP_HEADER_LEAD if stereo && idx.positive? && !prev_stereo
+              extra
+            end
+          end
+
+          def self.group_lead_total(lines)
+            group_lead_offsets(lines).last.to_i
+          end
+
           # EA seats compartment stereotype headers («Property») 12px
           # from the box edge and spaces rows 13px at 7pt.
           STEREOTYPE_HEADER_X_OFFSET = 12
@@ -32,9 +53,10 @@ module Ea
                           content_x_offset: nil)
 
             line_h = size + ROW_LINE_OFFSET
+            offsets = group_lead_offsets(lines)
             text_blocks = []
             lines.each_with_index do |line, idx|
-              y = first_y + (idx * line_h)
+              y = first_y + (idx * line_h) + offsets[idx]
               visibility, rest = split_visibility(line)
               if visibility
                 unless visibility.strip.empty?

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

@@ -39,6 +39,7 @@ module Ea
                           divider_offset: 8,
                           attr_line_offset: 6,
                           attr_first_offset: 7,
+                          attr_group_lead: 0,
                           header_ghost: false,
                           header_ghost_tight: false)
             @bounds = bounds
@@ -55,6 +56,7 @@ module Ea
             @divider_offset = divider_offset
             @attr_line_offset = attr_line_offset
             @attr_first_offset = attr_first_offset
+            @attr_group_lead = attr_group_lead
             @header_ghost = header_ghost
             @header_ghost_tight = header_ghost_tight
           end
@@ -108,7 +110,8 @@ module Ea
           def attr_bottom_y
             return attr_first_y unless attr_lines_count&.positive?
 
-            attr_first_y + (attr_lines_count - 1) * (size + (attr_line_offset || 6))
+            attr_first_y + (attr_lines_count - 1) * (size + (attr_line_offset || 6)) +
+              @attr_group_lead.to_i
           end
 
           def op_divider_y

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

@@ -176,7 +176,8 @@ module Ea
                                            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))
+                                           enum_literals_count: enum_row_count_for(classifier),
+                                                 attr_group_lead: Element::AttributeRenderer.group_lead_total(attr_lines))
           # 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
@@ -198,7 +199,8 @@ module Ea
                                              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))
+                                           enum_literals_count: enum_row_count_for(classifier),
+                                                 attr_group_lead: Element::AttributeRenderer.group_lead_total(attr_lines))
           end
           # EA suppresses the operations compartment when its rows
           # overflow the stored box height (same rule as attributes)
@@ -217,7 +219,8 @@ module Ea
                                              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))
+                                           enum_literals_count: enum_row_count_for(classifier),
+                                                 attr_group_lead: Element::AttributeRenderer.group_lead_total(attr_lines))
           elsif op_lines.any? && geometry.op_first_y &&
              geometry.op_bottom_y.to_i > bounds.y + bounds.height
             op_lines = []
@@ -226,7 +229,8 @@ module Ea
                                              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))
+                                           enum_literals_count: enum_row_count_for(classifier),
+                                                 attr_group_lead: Element::AttributeRenderer.group_lead_total(attr_lines))
           end
           # Real attributes grow the DRAWN box past the stored
           # height instead of being dropped (0CABA7D7: stored h44
@@ -295,7 +299,8 @@ module Ea
         def compartment_geometry(bounds, size, attr_lines, op_lines,
                                  tagged_count, header_lines, classifier: nil,
                                  constraints_count: 0, marker_count: 0,
-                                 enum_literals_count: 0)
+                                 enum_literals_count: 0,
+                                 attr_group_lead: 0)
           CompartmentGeometry.new(bounds: bounds, size: size,
                                    header_ghost: header_lines.any? &&
                                                   %i[italic italic_tight].include?(header_lines.first.last),
@@ -312,7 +317,8 @@ module Ea
                                    header_line_offset: theme.compartments.header_line_offset,
                                    divider_offset: divider_offset_for(header_lines, classifier),
                                    attr_line_offset: theme.compartments.attr_line_offset,
-                                   attr_first_offset: attr_first_offset_for(attr_lines))
+                                   attr_first_offset: attr_first_offset_for(attr_lines),
+                                   attr_group_lead: attr_group_lead)
         end
 
         # EA seats a stereotype line 3px higher than a bare class name

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.71"
+  VERSION = "0.6.72"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ea
 version: !ruby/object:Gem::Version
-  version: 0.6.71
+  version: 0.6.72
 platform: ruby
 authors:
 - Ribose Inc.
@@ -14,16 +14,16 @@ dependencies:
   name: lutaml-model
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: lutaml-path
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,16 @@ dependencies:
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: xmi
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +98,16 @@ dependencies:
   name: liquid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement