ea 0.6.74 → 0.6.76

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9c1ef6bdc2910e595f6273edf3c1174ad436e97cf1e64fe36eebe987aaae2f9
-  data.tar.gz: 225f122ba3ad0b656676727487830b8627690a939826bfdc47a8cefd5b3a0e4a
+  metadata.gz: 8d640b92ddedcf36076a62091fc344a08b85622ede3bee3855541d6705a2ebde
+  data.tar.gz: ebe4c9068300d79db3aeb0e42494c0dc6175ad638e8e3ca580b39d007fef7170
 SHA512:
-  metadata.gz: 6d529c6c5341f735f8bc322b2be5e98d2ef4227aac85c30fe6fe54c1a66ca6f802c921a5bf1615ddef2d89944da8d5e79e7b9550926fe99167561dd7f80fe61a
-  data.tar.gz: 3f21953290853b36681e25b87332edd9aba7c0de8f40794c83e16dab896658a5a1627026cae8c0e941d4754ff0bb09ca6aab6b207646acb76dde982ad1c7ee4a
+  metadata.gz: 8b025f70911f4c5648c2dce0cc314d2b4276c849cb653886bc0e1276d8d61362af98ffd529089415cd15359b1a04d1f866bf71adbbd183fc76b1b689bb41c68f
+  data.tar.gz: c682bb77194678ea2652a0e23a1d595c35b0e31d11a94c93ffebbbbf6a55beb3424e148a4dfd9293bf1509faf59430d1bf438eb743527f4f9550d82e4ef57709

data/lib/ea/model/property.rb

@@ -17,6 +17,7 @@ module Ea
       # column value is non-numeric; rendered as-is by the SVG line
       # builder while computed-unbounded uppers render as "*".
       attribute :multiplicity_upper_raw, :string   # -1 means "many"
+      attribute :multiplicity_lower_raw, :string   # literal text bounds ("size")
       # Verbatim stored cardinality text (e.g. "*", "1..1", "n") for
       # association ends; EA renders connector-end multiplicities
       # exactly as stored rather than from parsed bounds.

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

@@ -30,6 +30,7 @@ module Ea
             type_name: normalize_type(row.type),
             qualified_name: "#{owner_object.name}::#{row.name}",
             multiplicity_lower: parse_lower(row),
+            multiplicity_lower_raw: raw_bound(row.lowerbound),
             multiplicity_upper_raw: raw_upper(row),
             multiplicity_upper: parse_upper(row),
             default_value: row.default,
@@ -52,7 +53,17 @@ module Ea
         # render as "*" (verified against EA-published SVGs).
         def raw_upper(row)
           raw = row.upperbound.to_s
-          raw.match?(/\A[nN]\z/) ? raw.downcase : nil
+          return raw.downcase if raw.match?(/\A[nN]\z/)
+
+          raw_bound(raw)
+        end
+
+        # Literal text bounds EA displays verbatim in brackets
+        # ('elements: Character [size]' - LowerBound/UpperBound both
+        # 'size').
+        def raw_bound(value)
+          raw = value.to_s
+          raw.empty? || raw.match?(/\A\d+\z/) ? nil : raw
         end
 
         def normalize_type(type)

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

@@ -100,8 +100,16 @@ module Ea
           def multiplicity
             lower = property.multiplicity_lower
             upper = property.multiplicity_upper
+            if lower == 1 && upper == 1
+              raw = property.multiplicity_lower_raw
+              # Literal text bounds EA displays verbatim ('elements:
+              # Character [size]' - stored bounds 'size'/'size' parse
+              # to the 1..1 default).
+              return "[#{raw}]" if raw && raw == property.multiplicity_upper_raw
+
+              return ""
+            end
             return "" if lower.nil? && upper.nil?
-            return "" if lower == 1 && upper == 1
 
             "[#{lower || 0}..#{bound_text(upper)}]"
           end

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

@@ -121,10 +121,17 @@ module Ea
           # EA's op block: first row 21 below the last attribute row
           # (9pt... 7pt: attr_bottom + 21), uniform 13px pitch across
           # attrs AND ops (6D4C665D: attrs ..520, ops 541..658 step 13).
+          # Attribute-empty boxes anchor on the divider instead:
+          # first op at divider + 14 (001A64C1: EA ops 104 vs our
+          # 125 when attrs were absent).
           def op_first_y
             return nil unless op_lines_count&.positive?
 
-            attr_bottom_y + size + 14
+            if attr_lines_count.to_i.positive?
+              attr_bottom_y + size + 14
+            else
+              divider_y + size + 7
+            end
           end
 
           def op_bottom_y

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.74"
+  VERSION = "0.6.76"
 end

metadata

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