ea 0.6.15 → 0.6.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d69a2edfc36e402cd81b0eda6c4eb5c43cb0fda3ad8c46fcc2e4e5d1de63d8ec
-  data.tar.gz: d5bfb484b0d84399bfe8e54fd874374a7200dbb3e667dc47f0330f5f65a6531f
+  metadata.gz: 23adcefba5c783bfccc47f9cbb8d8cdf327431629857a4a7b46b67bbef529b21
+  data.tar.gz: ad21177acd96ceaa4e4c0e30cf47073e6ae333639a8673ebc9771ee6ddd8d2d3
 SHA512:
-  metadata.gz: ba29936fcceaa22430339e69dd4db37a47fd39b7c6c474484740fb8d218014a1c0a4bfa84fc6ab09fd90adf4402e65cf51fbf96cd3e63cc8e116c45065ba4a07
-  data.tar.gz: 947511083114075e9ad373e11f20c1c4dcea02cd9f5b35da4719243430a2228322da6922bb6b95903fd63a30cc6568ac12d6d5b353a02e633b567cbbc674eaa5
+  metadata.gz: 6a8b2a05a0ab5dd288494d62b24f7911a40e823db514a20a6ed6ee9897c2290b997b3b85d5580d6ba4bad516ed8da96f4b44f4eb69a69b064b38c50e8193faea
+  data.tar.gz: f66f47990a91b56ee9d25c4e714355f4bbe603fd6f77418e8bfb022b7b71e0dff4d1ebb712a1404493fbb6a1d2a21f452f789999b38bdb098081e0216fbcf6ac

data/lib/ea/fonts/metrics.rb

@@ -99,6 +99,44 @@ module Ea
       def cp_key(ch)
         format("U+%04X", ch.ord)
       end
+
+      # Resolves the four Carlito style TTFs through the fontist gem
+      # (system index + downloaded formulas). Empty when fontist is
+      # unavailable or Carlito is not installed.
+      def carlito_font_files
+        require "fontist"
+        styles = %w[Regular Bold Italic BoldItalic]
+        Fontist::SystemFont.find("Carlito").filter_map do |path|
+          next unless path.downcase.end_with?(".ttf")
+
+          style = File.basename(path, ".ttf").delete_prefix("Carlito-")
+          match = styles.find { |s| s.casecmp?(style) }
+          next unless match
+
+          [match, path]
+        end.to_h
+      rescue LoadError, StandardError => e
+        raise if ENV['EA_FONTS_DEBUG']
+
+        {}
+      end
+
+      # Reads advance widths from a TTF via the fontian gem (used by
+      # `rake fonts:validate` to re-derive the tables).
+      def advances_from_font(path)
+        require "fontisan"
+        font = Fontisan::FontLoader.load(path)
+        hmtx = font.table("hmtx")
+        hmtx.parse_with_context(font.table("hhea").number_of_h_metrics,
+                                font.table("maxp").num_glyphs)
+        upem = font.table("head").units_per_em
+        cmap = font.table("cmap").unicode_mappings
+        cmap.each_with_object({}) do |(cp, gid), out|
+          adv = hmtx.metric_for(gid)[:advance_width]
+          out[cp] = (adv.to_f / upem).round(4) if adv
+        end
+      end
+
     end
   end
 end

data/lib/ea/model/classifier.rb

@@ -15,6 +15,8 @@ module Ea
       attribute :package_id, :string # containing package
       attribute :package_name, :string # containing package name
       attribute :is_abstract, :boolean, default: false
+      attribute :is_root, :boolean, default: false
+      attribute :is_leaf, :boolean, default: false
       attribute :visibility, :string
       attribute :model_kind, :string, default: -> { "classifier" }
       attribute :properties, Property, collection: true, initialize_empty: true
@@ -31,6 +33,8 @@ module Ea
         map "packageId", to: :package_id
         map "packageName", to: :package_name
         map "isAbstract", to: :is_abstract, render_default: true
+        map "isRoot", to: :is_root, render_default: true
+        map "isLeaf", to: :is_leaf, render_default: true
         map "visibility", to: :visibility
         map "modelKind", to: :model_kind, render_default: true
         map "properties", to: :properties, render_empty: true

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

@@ -94,6 +94,8 @@ module Ea
             package_name: package_name_for(object),
             qualified_name: qualified_name_for(object),
             is_abstract: abstract?(object),
+            is_root: object.isroot.to_i == 1,
+            is_leaf: object.isleaf.to_i == 1,
             visibility: visibility_from_scope(object.scope),
             properties: properties_for(object),
             operations: OperationBuilder.new(database).build_all_for(object),

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

@@ -20,6 +20,8 @@ module Ea
           attr_reader :bounds, :size, :header_lines_count,
                       :attr_lines_count, :op_lines_count,
                       :tagged_values_count,
+                      :constraints_count,
+                      :enum_literals_count,
                       :header_top_padding, :header_line_offset,
                       :divider_offset, :attr_line_offset,
                       :attr_first_offset
@@ -27,6 +29,8 @@ module Ea
           def initialize(bounds:, size:, header_lines_count:,
                           attr_lines_count:, op_lines_count:,
                           tagged_values_count:,
+                          constraints_count: 0,
+                          enum_literals_count: 0,
                           header_top_padding: 12,
                           header_line_offset: 6,
                           divider_offset: 8,
@@ -38,6 +42,8 @@ module Ea
             @attr_lines_count = attr_lines_count
             @op_lines_count = op_lines_count
             @tagged_values_count = tagged_values_count
+            @constraints_count = constraints_count
+            @enum_literals_count = enum_literals_count
             @header_top_padding = header_top_padding
             @header_line_offset = header_line_offset
             @divider_offset = divider_offset
@@ -102,11 +108,24 @@ module Ea
           # present). EA does not emit a separate divider — the
           # italic "tags" header marks the compartment.
           def tagged_value_first_y
-            return nil unless tagged_values_count&.positive?
+            return nil unless tagged_values_count.to_i.positive? || constraints_count.to_i.positive?
 
-            base = attr_bottom_y
-            base = op_bottom_y if op_lines_count&.positive?
-            base + size + 5
+            content_bottom_y + size + 5
+          end
+
+          # The lowest content edge among attributes, enum literals,
+          # and operations — the anchor for trailing compartments.
+          def content_bottom_y
+            bottoms = [attr_bottom_y]
+            bottoms << enum_literals_bottom_y if enum_literals_count.to_i.positive?
+            bottoms << op_bottom_y if op_lines_count.to_i.positive?
+            bottoms.compact.max
+          end
+
+          def enum_literals_bottom_y
+            return nil unless enum_literal_first_y
+
+            enum_literal_first_y + ([enum_literals_count, 1].max - 1) * (size + 6)
           end
         end
       end

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

@@ -82,7 +82,9 @@ 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,
+                                           constraints_count: constraints_for(classifier).size,
+                                           enum_literals_count: enum_literals_for(classifier).size)
           # EA suppresses the whole attribute compartment when it does
           # not fit the stored box height (never truncates rows) - the
           # AOS box on CityFurniture hides its association property
@@ -92,7 +94,9 @@ module Ea
             attr_lines = []
             geometry = compartment_geometry(bounds, size, attr_lines, op_lines,
                                              tagged_values_for(classifier).size,
-                                             header_lines)
+                                             header_lines,
+                                             constraints_count: constraints_for(classifier).size,
+                                           enum_literals_count: enum_literals_for(classifier).size)
           end
           # EA suppresses the operations compartment when its rows
           # overflow the stored box height (same rule as attributes).
@@ -101,7 +105,9 @@ module Ea
             op_lines = []
             geometry = compartment_geometry(bounds, size, attr_lines, op_lines,
                                              tagged_values_for(classifier).size,
-                                             header_lines)
+                                             header_lines,
+                                             constraints_count: constraints_for(classifier).size,
+                                           enum_literals_count: enum_literals_for(classifier).size)
           end
           RenderContext.new(
             element: element,
@@ -130,12 +136,15 @@ module Ea
         end
 
         def compartment_geometry(bounds, size, attr_lines, op_lines,
-                                 tagged_count, header_lines)
+                                 tagged_count, header_lines,
+                                 constraints_count: 0, enum_literals_count: 0)
           CompartmentGeometry.new(bounds: bounds, size: size,
                                    header_lines_count: header_lines.size,
                                    attr_lines_count: attr_lines.size,
                                    op_lines_count: op_lines.size,
                                    tagged_values_count: tagged_count,
+                                   constraints_count: constraints_count,
+                                   enum_literals_count: enum_literals_count,
                                    header_top_padding: header_padding_for(header_lines),
                                    header_line_offset: theme.compartments.header_line_offset,
                                    divider_offset: theme.compartments.divider_offset,
@@ -185,7 +194,24 @@ module Ea
         def constraints_for(classifier)
           return [] unless classifier.is_a?(Ea::Model::Classifier)
 
-          classifier.constraints || []
+          marker_line = root_leaf_marker_for(classifier)
+          marker = marker_line ? [marker_constraint(marker_line)] : []
+          marker + (classifier.constraints || [])
+        end
+
+        # EA renders the element's Root/Leaf checkboxes as {root},
+        # {leaf}, or {root,leaf} first in the constraints compartment
+        # (t_object.IsRoot/IsLeaf — verified on LanguageCode boxes).
+        def root_leaf_marker_for(classifier)
+          parts = []
+          parts << "root" if classifier.is_root
+          parts << "leaf" if classifier.is_leaf
+          parts.empty? ? nil : "{#{parts.join(',')}}"
+        end
+
+        def marker_constraint(text)
+          name = text[1..-2]
+          Ea::Model::Constraint.new(name: name, kind: "Marker")
         end
 
         # EA renders the off-canvas parent classifier's name as an

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.15"
+  VERSION = "0.6.17"
 end

data/lib/tasks/fonts.rake

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require "ea/fonts/metrics"
+
+namespace :fonts do
+  desc "Validate the shipped Carlito metrics against Fontist-resolved TTFs"
+  task :validate do
+    files = Ea::Fonts::Metrics.carlito_font_files
+    abort "Carlito not resolvable via Fontist — install it first" if files.empty?
+
+    shipped = JSON.parse(File.read(Ea::Fonts::Metrics::DATA_PATH))["advance"]
+    style_key = { "regular" => "regular", "bold" => "bold",
+                  "italic" => "italic", "bold_italic" => "bold_italic",
+                  "bolditalic" => "bold_italic" }
+    drift = []
+
+    files.each do |style, path|
+      table = shipped[style_key[style.downcase]]
+      actual = Ea::Fonts::Metrics.advances_from_font(path)
+      missing = actual.keys.count { |cp| table[format("U+%04X", cp)].nil? }
+      puts "  (shipped table lacks #{missing} of #{actual.size} codepoints — skipped)"
+      actual.each do |cp, adv|
+        key = format("U+%04X", cp)
+        ours = table[key]
+        next if ours.nil? || (ours - adv).abs <= 0.0005
+
+        drift << format("%s %s: json=%s font=%s", style, key, ours, adv)
+      end
+      puts "#{style}: #{path} — #{actual.size} codepoints checked"
+    end
+
+    if drift.empty?
+      puts "carlito_metrics.json matches the Fontist-resolved fonts."
+    else
+      puts "DRIFT (#{drift.size} entries):"
+      drift.first(20).each { |line| puts "  #{line}" }
+      exit 1
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ea
 version: !ruby/object:Gem::Version
-  version: 0.6.15
+  version: 0.6.17
 platform: ruby
 authors:
 - Ribose Inc.
@@ -999,6 +999,7 @@ files:
 - lib/ea/xmi/lookup_service.rb
 - lib/ea/xmi/parser.rb
 - lib/ea/xml_escape.rb
+- lib/tasks/fonts.rake
 - lib/tasks/svg_bench.rake
 - reference-docs/enterprise-architect-appearance-dialogs/appearance-1-diagram-1-themes-list.png
 - reference-docs/enterprise-architect-appearance-dialogs/appearance-1-diagram-1-themes.png