ea 0.5.2 → 0.6.0

data/lib/ea/transformers/qea_to_xmi/visibility.rb

@@ -3,19 +3,16 @@
 module Ea
   module Transformers
     module QeaToXmi
-      # Pure-function mapper from EA's integer scope/containment codes
-      # to UML visibility / aggregation wire strings.
+      # Pure-function mapper from EA's scope/aggregation codes to UML
+      # visibility / aggregation wire strings.
       #
-      # EA stores visibility as an integer in `t_attribute.scope`,
-      # `t_operation.scope`, `t_object.scope`. The encoding:
+      # QEA databases store scope as text in `t_attribute.Scope`,
+      # `t_operation.Scope`, `t_object.Scope`: "Public", "Private",
+      # "Protected", "Package". The integer codes (0-3, same order) are
+      # kept as a fallback for EAP-era databases.
       #
-      #   0 → Public
-      #   1 → Private
-      #   2 → Protected
-      #   3 → Package
-      #
-      # EA stores aggregation kind in `t_connector.sourcecontainment`
-      # and `t_connector.destcontainment`. The encoding:
+      # Aggregation kind comes from `t_connector.sourceisaggregate` /
+      # `destisaggregate` (via Transformer#containment_for). The encoding:
       #
       #   0 → None (omitted)
       #   1 → Shared (UML aggregation="shared")
@@ -23,6 +20,13 @@ module Ea
       #
       # Wire-side values are lower-case per the UML XMI schema.
       module Visibility
+        TEXT_SCOPES = {
+          "public" => "public",
+          "private" => "private",
+          "protected" => "protected",
+          "package" => "package",
+        }.freeze
+
         SCOPE_MAP = {
           0 => "public",
           1 => "private",
@@ -39,13 +43,18 @@ module Ea
         module_function
 
         # @param raw [String, Integer, nil]
-        # @return [String, nil] UML visibility token, or nil if EA's
-        #   scope field is blank / unrecognised.
+        # @return [String, nil] UML visibility token. Returns nil for
+        #   blank/unrecognised values AND for the UML default ("public")
+        #   so the xmi gem omits the attribute — matching EA's output,
+        #   which doesn't emit visibility="public".
         def from_scope(raw)
-          return nil if raw.nil? || raw.to_s.strip.empty?
+          text = raw.to_s.strip
+          return nil if text.empty?
 
-          key = raw.to_i
-          SCOPE_MAP[key]
+          value = TEXT_SCOPES[text.downcase] || SCOPE_MAP[text.to_i]
+          return nil if value == "public"
+
+          value
         end
 
         # @param raw [String, Integer, nil]
@@ -59,11 +68,13 @@ module Ea
         end
 
         # @param raw [String, Integer, nil] EA's abstract flag ("1"/"0")
-        # @return [Boolean, nil] true / false, or nil if unspecified.
-        #   Returns actual Ruby booleans (not strings) — the xmi gem's
-        #   `is_*` attributes are typed as `:boolean`.
+        # @return [Boolean, nil] true when EA marks the element abstract,
+        #   nil when blank OR "0" (false). Returning nil for false makes
+        #   the xmi gem omit isAbstract="false" — matching EA's output,
+        #   which doesn't emit the default.
         def boolean_from_flag(raw)
           return nil if raw.nil? || raw.to_s.strip.empty?
+          return nil if raw.to_s == "0"
 
           raw.to_s == "1"
         end

data/lib/ea/transformers/qea_to_xmi.rb

@@ -22,8 +22,11 @@ module Ea
       autoload :GuidFormat,     "ea/transformers/qea_to_xmi/guid_format"
       autoload :Cardinality,    "ea/transformers/qea_to_xmi/cardinality"
       autoload :Visibility,     "ea/transformers/qea_to_xmi/visibility"
-      autoload :RunState,       "ea/transformers/qea_to_xmi/run_state"
-      autoload :AssociationEnd, "ea/transformers/qea_to_xmi/association_end"
+      autoload :RunState,           "ea/transformers/qea_to_xmi/run_state"
+      autoload :AssociationEnd,     "ea/transformers/qea_to_xmi/association_end"
+      autoload :ExtensionSerializer, "ea/transformers/qea_to_xmi/extension_serializer"
+      autoload :PrimitiveTypes,    "ea/transformers/qea_to_xmi/primitive_types"
+      autoload :ProfileSerializer, "ea/transformers/qea_to_xmi/profile_serializer"
     end
   end
 end

data/lib/ea/transformers.rb

@@ -24,11 +24,16 @@ module Ea
       # Walks the QEA tables directly — no intermediate UML model, no loss of
       # Sparx-specific concepts (stereotypes, tagged values, multiplicities,
       # diagrams, xrefs).
+      #
       # @param database [Ea::Qea::Database]
       # @param with_extensions [Boolean] emit EA-specific connectors+diagrams
+      # @param mdg_registry [Ea::Mdg::Registry, nil] when provided,
+      #   stereotype definitions from registered MDG technologies are
+      #   emitted as `<uml:Stereotype>` profile elements in the model
+      #   tree. MDGs can be swapped in/out at runtime (OCP).
       # @return [String] XMI XML
-      def qea_to_xmi(database, with_extensions: true)
-        QeaToXmi::Transformer.new(database).serialize(with_extensions: with_extensions)
+      def qea_to_xmi(database, with_extensions: true, mdg_registry: nil)
+        QeaToXmi::Transformer.new(database, mdg_registry: mdg_registry).serialize(with_extensions: with_extensions)
       end
     end
   end

data/lib/ea/validation.rb

@@ -1,4 +1,4 @@
-# frozen_string: true
+# frozen_string_literal: true
 
 module Ea
   # Top-level validation namespace. Hosts cross-cutting validators

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.5.2"
+  VERSION = "0.6.0"
 end

data/lib/ea/xmi/liquid_drops/attribute_drop.rb

@@ -35,11 +35,19 @@ module Ea
         end
 
         def definition
-          if @options[:with_assoc] && @model.association
-            @lookup.loopup_assoc_def(@model.association)
-          else
-            @model.definition
+          defn = if @options[:with_assoc] && @model.association
+                   @lookup.lookup_assoc_def(@model.association)
+                 else
+                   @model.definition
+                 end
+
+          if defn.nil? || defn.empty?
+            defn = @lookup.lookup_connector_def_by_associationclass(
+              @model.association,
+            )
           end
+
+          defn
         end
 
         def association

data/lib/ea/xmi/liquid_drops/klass_drop.rb

@@ -101,8 +101,7 @@ module Ea
         def attributes
           Array(@model.attributes).filter_map do |owned_attr|
             if @options[:with_assoc] || owned_attr.association.nil?
-              ::Ea::Xmi::LiquidDrops::AttributeDrop.new(owned_attr,
-                                                            @options)
+              ::Ea::Xmi::LiquidDrops::AttributeDrop.new(owned_attr, @options)
             end
           end
         end

data/lib/ea/xmi/lookup_service.rb

@@ -37,6 +37,10 @@ module Ea
         @parser.lookup_assoc_def(association)
       end
 
+      def lookup_connector_def_by_associationclass(xmi_id)
+        @parser.lookup_connector_def_by_associationclass(xmi_id)
+      end
+
       def fetch_connector(link_id)
         @parser.fetch_connector(link_id)
       end

data/lib/ea/xmi/parser.rb

@@ -73,6 +73,10 @@ module Ea
         xmi_index.find_connector(link_id)
       end
 
+      def fetch_connector_by_associationclass(associationclass)
+        connector_by_associationclass_lookup[associationclass]
+      end
+
       def fetch_definition_node_value(link_id, node_name)
         connector_node = fetch_connector(link_id)
         return nil unless connector_node
@@ -199,6 +203,11 @@ module Ea
         connector&.documentation&.value
       end
 
+      def lookup_connector_def_by_associationclass(association)
+        connector = fetch_connector_by_associationclass(association)
+        connector&.documentation&.value
+      end
+
       def get_ns_by_xmi_id(xmi_id)
         return unless xmi_id
 
@@ -703,7 +712,7 @@ module Ea
             gen_attr.xmi_id = attr.xmi_id
             gen_attr.is_derived = !!attr.is_derived
             gen_attr.cardinality = attr.cardinality
-            gen_attr.definition = attr.definition&.strip
+            gen_attr.definition = get_uml_general_attribute_definition(attr)
             gen_attr.association = attr.association
             gen_attr.has_association = !!attr.association
             gen_attr.type_ns = attr.type_ns
@@ -711,6 +720,14 @@ module Ea
         end
       end
 
+      def get_uml_general_attribute_definition(attr)
+        return attr.definition&.strip unless attr.association
+
+        attr.definition&.strip ||
+          lookup_assoc_def(attr.association) ||
+          lookup_connector_def_by_associationclass(attr.association)
+      end
+
       def set_uml_generalization(general_id)
         uml_general_obj, next_general_node_id = get_uml_general(general_id)
 
@@ -924,6 +941,18 @@ module Ea
         end
       end
 
+      def connector_by_associationclass_lookup
+        @connector_by_associationclass_lookup ||= begin
+          lookup = {}
+          connectors = @xmi_root_model.extension&.connectors&.connector || []
+          connectors.each do |con|
+            assoc_class = con.extended_properties&.associationclass
+            lookup[assoc_class] = con if assoc_class
+          end
+          lookup
+        end
+      end
+
       def index_connector_directions(con, lookup)
         %i[source target].each do |dir|
           idref = con.public_send(dir)&.idref

data/lib/ea/xml_escape.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Ea
+  # Shared XML entity escaping. Centralised so the four subsystems
+  # that emit XML/XMI/SVG (Transformers, Diff, Shapescript, Svg)
+  # share one implementation instead of four local copies with
+  # subtle differences (quote-escaping was inconsistent).
+  module XmlEscape
+    module_function
+
+    # @param text [Object] value to escape; nil-safe via to_s
+    # @return [String] XML-escaped text with &, <, >, " replaced
+    def call(text)
+      text.to_s
+          .gsub("&", "&amp;")
+          .gsub("<", "&lt;")
+          .gsub(">", "&gt;")
+          .gsub('"', "&quot;")
+    end
+  end
+end

data/lib/ea.rb

@@ -30,6 +30,8 @@ module Ea
   autoload :Query, "ea/query"
   autoload :Ocl, "ea/ocl"
   autoload :Validation, "ea/validation"
+  autoload :XmlEscape, "ea/xml_escape"
+  autoload :GuidFormat, "ea/guid_format"
 
   class << self
     # Parse an EA file into its native representation.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ea
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-08-03 00:00:00.000000000 Z
+date: 2026-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model
@@ -72,20 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -242,6 +236,23 @@ files:
 - TODO.complete/67-ocl-collection-ops.md
 - TODO.complete/68-ocl-comparison-ops.md
 - TODO.complete/69-spec-new-models.md
+- TODO.complete/70-specs-for-all-models.md
+- TODO.complete/71-autoload-audit.md
+- TODO.complete/72-extension-serializer-ocp-naming.md
+- TODO.complete/73-ocl-validator-latent-bugs.md
+- TODO.complete/74-visibility-symbol-dry.md
+- TODO.complete/75-database-table-collection-registry.md
+- TODO.complete/76-stale-todo-cleanup.md
+- TODO.complete/77-eliminate-banned-patterns-from-specs.md
+- TODO.complete/78-mdg-stereotype-emission.md
+- TODO.complete/79-equivalence-fixes.md
+- TODO.complete/80-performance-extension-serializer-indexes.md
+- TODO.complete/81-dry-scope-guid-extraction.md
+- TODO.complete/82-public-send-audit-conclusion.md
+- TODO.complete/83-dry-shared-xml-escape-guid-format.md
+- TODO.complete/84-ocp-markers-shape-registry.md
+- TODO.complete/85-frozen-literal-rubocop-normalize-type-spec.md
+- TODO.complete/86-frozen-sweep-lint-query-specs.md
 - TODO.complete/STATUS.md
 - TODO.diagrams/01-svg-measurement-harness.md
 - TODO.diagrams/01-xmi-extension-elements-parsing.md
@@ -609,6 +620,7 @@ files:
 - lib/ea/export/xsd/class_mapping.rb
 - lib/ea/export/xsd/generator.rb
 - lib/ea/export/xsd/namespace_registry.rb
+- lib/ea/guid_format.rb
 - lib/ea/image.rb
 - lib/ea/image/emf_renderer.rb
 - lib/ea/lint.rb
@@ -757,6 +769,7 @@ files:
 - lib/ea/qea/models/ea_tagged_value.rb
 - lib/ea/qea/models/ea_version.rb
 - lib/ea/qea/models/ea_xref.rb
+- lib/ea/qea/models/scope_predicate.rb
 - lib/ea/qea/repositories.rb
 - lib/ea/qea/repositories/base_repository.rb
 - lib/ea/qea/repositories/object_repository.rb
@@ -935,6 +948,7 @@ files:
 - lib/ea/svg/ea_emitter/render_context.rb
 - lib/ea/svg/ea_emitter/style.rb
 - lib/ea/svg/ea_emitter/text_renderer.rb
+- lib/ea/svg/ea_emitter/visibility_symbol.rb
 - lib/ea/svg/parity.rb
 - lib/ea/svg/parity/checker.rb
 - lib/ea/svg/parity/source.rb
@@ -950,8 +964,11 @@ files:
 - lib/ea/transformers/qea_to_xmi/association_end.rb
 - lib/ea/transformers/qea_to_xmi/cardinality.rb
 - lib/ea/transformers/qea_to_xmi/context.rb
+- lib/ea/transformers/qea_to_xmi/extension_serializer.rb
 - lib/ea/transformers/qea_to_xmi/guid_format.rb
 - lib/ea/transformers/qea_to_xmi/id_allocator.rb
+- lib/ea/transformers/qea_to_xmi/primitive_types.rb
+- lib/ea/transformers/qea_to_xmi/profile_serializer.rb
 - lib/ea/transformers/qea_to_xmi/run_state.rb
 - lib/ea/transformers/qea_to_xmi/transformer.rb
 - lib/ea/transformers/qea_to_xmi/visibility.rb
@@ -982,8 +999,8 @@ files:
 - lib/ea/xmi/liquid_drops/source_target_drop.rb
 - lib/ea/xmi/lookup_service.rb
 - lib/ea/xmi/parser.rb
+- lib/ea/xml_escape.rb
 - lib/tasks/svg_bench.rake
-- lutaml-uml-0.5.1.gem
 - 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
 - reference-docs/enterprise-architect-appearance-dialogs/appearance-1-diagram-2-gradients.png