xmi 0.6.1 → 0.7.0

data/lib/xmi/performance/term.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module Xmi
+  module Performance
+    # Terminal formatting for benchmark output. Colors live on the
+    # parent Xmi::Performance module; box-drawing characters here.
+    module Term
+      extend self
+
+      HL = "─"
+      VL = "│"
+      TL = "┌"
+      TR = "┐"
+      BL = "└"
+      BR = "┘"
+
+      def header(title, color: CYAN)
+        width = 78
+        line = HL * width
+        puts
+        puts "#{color}#{TL}#{line}#{TR}#{CLEAR}"
+        puts "#{color}#{VL}#{CLEAR}  #{BOLD}#{color}#{title}#{CLEAR}#{' ' * (width - title.length - 4)}#{color}#{VL}#{CLEAR}"
+        puts "#{color}#{BL}#{line}#{BR}#{CLEAR}"
+      end
+
+      def sep(char: HL, width: 78)
+        puts "#{DIM}#{char * width}#{CLEAR}"
+      end
+
+      def env_info(ruby_version, platform)
+        puts
+        puts "  #{DIM}Environment:#{CLEAR}"
+        puts "  #{VL}  Ruby #{ruby_version} on #{platform}#{' ' * (60 - ruby_version.length - platform.length)}#{VL}"
+        puts "  #{DIM}#{BL}#{HL * 76}#{BR}#{CLEAR}"
+        puts
+      end
+
+      def category(title, icon:, description:, failure_means:,
+compare_against: nil)
+        puts
+        puts "#{CYAN}#{VL}#{CLEAR}  #{BOLD}#{MAGENTA}#{icon} #{title}#{CLEAR}"
+        puts
+        puts "  #{DIM}#{description}#{CLEAR}"
+        puts
+
+        if compare_against
+          puts "  #{CYAN}Comparing against:#{CLEAR} #{compare_against}"
+          puts
+        end
+
+        puts "  #{YELLOW}⚠️  Failure means:#{CLEAR} #{failure_means}"
+        puts
+        sep(width: 76)
+        puts
+      end
+    end
+  end
+end

data/lib/xmi/performance.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Xmi
+  # Benchmarking and performance comparison tooling.
+  #
+  # Loaded on demand via autoload — never required at gem runtime.
+  # The rake tasks in lib/tasks/performance.rake load this module
+  # through `require "xmi"` and reference Xmi::Performance::*
+  # constants.
+  module Performance
+    autoload :Helpers, "xmi/performance/helpers"
+    autoload :Comparator, "xmi/performance/comparator"
+    autoload :Runner, "xmi/performance/runner"
+    autoload :Term, "xmi/performance/term"
+
+    # ANSI color codes shared by Term, Helpers, Comparator, and Runner.
+    CLEAR   = "\e[0m"
+    BOLD    = "\e[1m"
+    DIM     = "\e[2m"
+    CYAN    = "\e[36m"
+    GREEN   = "\e[32m"
+    YELLOW  = "\e[33m"
+    RED     = "\e[31m"
+    GRAY    = "\e[90m"
+    MAGENTA = "\e[35m"
+  end
+end

data/lib/xmi/sparx/index.rb

@@ -190,6 +190,7 @@ module Xmi
 
           # Recurse into children
           walk_packaged_elements(pe.packaged_element, pe)
+          walk_packaged_elements(pe.nested_classifier, pe)
         end
       end
 

data/lib/xmi/uml/association_class.rb

@@ -5,7 +5,7 @@ module Xmi
     # UML `<packagedElement xmi:type="uml:AssociationClass">`. An
     # association that is also a class (UML 2.5 §11.4).
     #
-    # Phase A of TODO.next/01: subclass is a type tag on
+    # Phase A: subclass is a type tag on
     # PackagedElement. The union-bag attribute set is inherited
     # unchanged so existing consumers keep working. Phase B
     # (narrowing attrs to the subclass) is future work.

data/lib/xmi/uml/component.rb

@@ -9,7 +9,7 @@ module Xmi
     # interface_realization — but signals a different deployment role
     # to consumers.
     #
-    # Phase A of TODO.next/01: subclass is a type tag on
+    # Phase A: subclass is a type tag on
     # PackagedElement. The union-bag attribute set is inherited
     # unchanged so existing consumers keep working.
     class Component < PackagedElement

data/lib/xmi/uml/dependency.rb

@@ -5,7 +5,7 @@ module Xmi
     # UML `<packagedElement xmi:type="uml:Dependency">`. A relationship
     # between a client and supplier packageable element.
     #
-    # Phase A of TODO.next/01: subclass is a type tag on
+    # Phase A: subclass is a type tag on
     # PackagedElement. The union-bag attribute set is inherited
     # unchanged so existing consumers keep working. Phase B
     # (narrowing attrs to the subclass) is future work.

data/lib/xmi/uml/extension.rb

@@ -6,7 +6,7 @@ module Xmi
     # associates a stereotype with a metaclass to make the stereotype
     # applicable to instances of that metaclass (UML 2.5 §22.3).
     #
-    # Phase A of TODO.next/01: subclass is a type tag on
+    # Phase A: subclass is a type tag on
     # PackagedElement. The union-bag attribute set is inherited
     # unchanged so existing consumers keep working. Phase B
     # (narrowing attrs to the subclass) is future work.

data/lib/xmi/uml/owned_attribute.rb

@@ -35,10 +35,11 @@ module Xmi
         map_attribute "aggregation", to: :aggregation
 
         map_element "type", to: :uml_type
-        map_element "upperValue", to: :upper_value,
-                                  polymorphic: VALUE_SPECIFICATION_POLYMORPHIC_MAP
+        # Sparx EA emits lowerValue before upperValue.
         map_element "lowerValue", to: :lower_value,
                                   polymorphic: VALUE_SPECIFICATION_POLYMORPHIC_MAP
+        map_element "upperValue", to: :upper_value,
+                                  polymorphic: VALUE_SPECIFICATION_POLYMORPHIC_MAP
         map_element "defaultValue", to: :default_value,
                                     polymorphic: VALUE_SPECIFICATION_POLYMORPHIC_MAP
       end

data/lib/xmi/uml/owned_comment.rb

@@ -7,7 +7,7 @@ module Xmi
       attribute :body_element, :string
       attribute :body_attribute, :string
       attribute :annotated_attribute, :string
-      attribute :annotated_element, AnnotatedElement
+      attribute :annotated_element, AnnotatedElement, collection: true
 
       xml do
         root "ownedComment"
@@ -15,7 +15,8 @@ module Xmi
         map_attribute "body", to: :body_attribute
         map_attribute "annotatedElement", to: :annotated_attribute
 
-        map_element "annotatedElement", to: :annotated_element
+        map_element "annotatedElement", to: :annotated_element,
+                                        value_map: VALUE_MAP
         map_element "body", to: :body_element
       end
     end

data/lib/xmi/uml/owned_element.rb

@@ -12,7 +12,7 @@ module Xmi
       attribute :bounds, Bounds, collection: true
       attribute :source, :string
       attribute :target, :string
-      attribute :waypoint, Waypoint
+      attribute :waypoint, Waypoint, collection: true
 
       xml do
         root "ownedElement"
@@ -23,7 +23,7 @@ module Xmi
         map_element "bounds", to: :bounds, value_map: VALUE_MAP
         map_element "source", to: :source
         map_element "target", to: :target
-        map_element "waypoint", to: :waypoint
+        map_element "waypoint", to: :waypoint, value_map: VALUE_MAP
       end
     end
   end

data/lib/xmi/uml/owned_end.rb

@@ -24,10 +24,11 @@ module Xmi
         map_attribute "isComposite", to: :is_composite
 
         map_element "type", to: :uml_type
-        map_element "upperValue", to: :upper_value,
-                                  polymorphic: VALUE_SPECIFICATION_POLYMORPHIC_MAP
+        # Sparx EA emits lowerValue before upperValue.
         map_element "lowerValue", to: :lower_value,
                                   polymorphic: VALUE_SPECIFICATION_POLYMORPHIC_MAP
+        map_element "upperValue", to: :upper_value,
+                                  polymorphic: VALUE_SPECIFICATION_POLYMORPHIC_MAP
         map_element "defaultValue", to: :default_value,
                                     polymorphic: VALUE_SPECIFICATION_POLYMORPHIC_MAP
       end

data/lib/xmi/uml/owned_parameter.rb

@@ -4,6 +4,23 @@ module Xmi
   module Uml
     class OwnedParameter < Base
       attribute :name, :string
+      # These are two DIFFERENT attributes that collide here:
+      #   xmi:type="uml:Parameter"  — the XMI metaclass discriminator
+      #   type="EAnone_void"        — Sparx's classifier reference
+      #
+      # Known limit: lutaml-model matches attributes by local name only,
+      # so both land in this one slot and whichever appears LAST in the
+      # input wins. They are not two spellings of one concept, and only
+      # one of them can survive a round trip.
+      #
+      # The slot stays xmi-namespaced, which keeps the discriminator —
+      # the general UML XMI shape this gem round-trips. Sparx's
+      # classifier reference still parses into it, but re-serializes as
+      # `xmi:type`. Restoring the Sparx spelling belongs to the Sparx
+      # exporter, not to this shared model: flipping it here would break
+      # the general case for every other consumer. Modelling both at
+      # once needs namespace-disjoint attribute deserialization
+      # upstream (lutaml-model#744).
       attribute :type, ::Xmi::Type::XmiType
       attribute :direction, :string
       attribute :visibility, :string
@@ -24,10 +41,11 @@ module Xmi
         map_attribute "isUnique", to: :is_unique
         map_attribute "effect", to: :effect
 
-        map_element "upperValue", to: :upper_value,
-                                  polymorphic: VALUE_SPECIFICATION_POLYMORPHIC_MAP
+        # Sparx EA emits lowerValue before upperValue.
         map_element "lowerValue", to: :lower_value,
                                   polymorphic: VALUE_SPECIFICATION_POLYMORPHIC_MAP
+        map_element "upperValue", to: :upper_value,
+                                  polymorphic: VALUE_SPECIFICATION_POLYMORPHIC_MAP
         map_element "defaultValue", to: :default_value,
                                     polymorphic: VALUE_SPECIFICATION_POLYMORPHIC_MAP
       end

data/lib/xmi/uml/packaged_element.rb

@@ -7,17 +7,23 @@ module Xmi
     # packaged_element recursion on PackagedElement itself, and by
     # UmlModel.packaged_element.
     #
-    # Phase A of TODO.next/01: subclasses are type tags on
-    # PackagedElement (no attrs narrowed). Phase B will narrow each
-    # subclass's attrs to its UML-2.5-conformant subset.
-    #
-    # Fallback contract: unknown or missing `xmi:type` resolves to
+    # Fallback contract: an unknown `xmi:type` resolves to
     # `Xmi::Uml::PackagedElement` (the union-bag base) via the
-    # class_map's default_proc. This avoids the lutaml-model
+    # class_map's Hash default value. This avoids the lutaml-model
     # `Object.const_get(nil)` TypeError when a Sparx XMI emits a
     # type we haven't modelled yet, at the cost of treating the
-    # element as generic. polymorphic_robustness_spec locks in the
-    # graceful-fallback behavior.
+    # element as generic. polymorphic_map_contract_spec and
+    # polymorphic_robustness_spec lock in the graceful-fallback
+    # behavior.
+    #
+    # Two paths land at the base:
+    # 1. Missing discriminator — lutaml-model's
+    #    `polymorphic_map_defined?` (lib/lutaml/model/attribute.rb)
+    #    short-circuits and returns the declared attribute type
+    #    (`PackagedElement`). The class_map default is not consulted.
+    # 2. Unknown discriminator — `polymorphic_map_defined?` is true,
+    #    the class_map lookup hits a missing key, and the Hash default
+    #    value supplies the fallback class name.
     PACKAGED_ELEMENT_POLYMORPHIC_MAP = {
       attribute: "xmi:type",
       class_map: Hash.new("Xmi::Uml::PackagedElement").merge!(
@@ -37,7 +43,7 @@ module Xmi
         "uml:Stereotype" => "Xmi::Uml::Stereotype",
         "uml:Usage" => "Xmi::Uml::Usage",
         "uml:Component" => "Xmi::Uml::Component",
-      ),
+      ).freeze,
     }.freeze
 
     class PackagedElement < Base
@@ -58,6 +64,10 @@ module Xmi
 
       attribute :packaged_element, PackagedElement, collection: true,
                                                     polymorphic: true
+      # Sparx EA nests child classifiers (a Class owned by a Class)
+      # as <nestedClassifier> rather than <packagedElement>.
+      attribute :nested_classifier, PackagedElement, collection: true,
+                                                     polymorphic: true
       attribute :owned_end, OwnedEnd, collection: true
       attribute :owned_attribute, OwnedAttribute, collection: true
       attribute :owned_comment, OwnedComment, collection: true
@@ -90,6 +100,8 @@ module Xmi
         map_element "ownedOperation", to: :owned_operation, value_map: VALUE_MAP
         map_element "packagedElement", to: :packaged_element,
                                        polymorphic: PACKAGED_ELEMENT_POLYMORPHIC_MAP
+        map_element "nestedClassifier", to: :nested_classifier,
+                                        polymorphic: PACKAGED_ELEMENT_POLYMORPHIC_MAP
         map_element "memberEnd", to: :member_ends, value_map: VALUE_MAP
         map_element "slot", to: :slot, value_map: VALUE_MAP
         map_element "specification", to: :specification

data/lib/xmi/uml/signal.rb

@@ -6,7 +6,7 @@ module Xmi
     # classifier that communicates the sending of a message instance
     # (UML 2.5 §17.4).
     #
-    # Phase A of TODO.next/01: subclass is a type tag on
+    # Phase A: subclass is a type tag on
     # PackagedElement. The union-bag attribute set is inherited
     # unchanged so existing consumers keep working. Phase B
     # (narrowing attrs to the subclass) is future work.

data/lib/xmi/uml/stereotype.rb

@@ -6,7 +6,7 @@ module Xmi
     # is a kind of class defined to extend the UML metamodel
     # (UML 2.5 §22.3).
     #
-    # Phase A of TODO.next/01: subclass is a type tag on
+    # Phase A: subclass is a type tag on
     # PackagedElement. The union-bag attribute set is inherited
     # unchanged so existing consumers keep working. Phase B
     # (narrowing attrs to the subclass) is future work.

data/lib/xmi/uml/uml_class.rb

@@ -5,7 +5,7 @@ module Xmi
     # UML `<packagedElement xmi:type="uml:Class">`. Classifier with
     # attributes, operations, and structural relationships.
     #
-    # Phase A of TODO.next/01: subclass is a type tag on
+    # Phase A: subclass is a type tag on
     # PackagedElement. The union-bag attribute set is inherited
     # unchanged so existing consumers keep working. Phase B
     # (narrowing attrs to the subclass) is future work.

data/lib/xmi/uml/usage.rb

@@ -6,7 +6,7 @@ module Xmi
     # subtype indicating that a client requires a supplier for its
     # proper functioning (UML 2.5 §19.3).
     #
-    # Phase A of TODO.next/01: subclass is a type tag on
+    # Phase A: subclass is a type tag on
     # PackagedElement. The union-bag attribute set is inherited
     # unchanged so existing consumers keep working. Phase B
     # (narrowing attrs to the subclass) is future work.

data/lib/xmi/uml/value_specification.rb

@@ -32,10 +32,16 @@ module Xmi
     # The literal class names are string form because lutaml-model's
     # resolve_polymorphic_class calls Object.const_get on the value.
     #
-    # Fallback contract: unknown or missing `xmi:type` resolves to
+    # Fallback contract: an unknown `xmi:type` resolves to
     # `Xmi::Uml::ValueSpecification` (the abstract base) via the
-    # class_map's default_proc. polymorphic_robustness_spec locks in
-    # the graceful-fallback behavior.
+    # class_map's Hash default value. polymorphic_map_contract_spec
+    # and polymorphic_robustness_spec lock in the graceful-fallback
+    # behavior.
+    #
+    # Two paths land at the base (see PACKAGED_ELEMENT_POLYMORPHIC_MAP
+    # for the full rationale): missing discriminator short-circuits via
+    # lutaml-model's `polymorphic_map_defined?`; unknown discriminator
+    # hits the Hash default value.
     VALUE_SPECIFICATION_POLYMORPHIC_MAP = {
       attribute: "xmi:type",
       class_map: Hash.new("Xmi::Uml::ValueSpecification").merge!(
@@ -45,7 +51,7 @@ module Xmi
         "uml:LiteralBoolean" => "Xmi::Uml::LiteralBoolean",
         "uml:LiteralUnlimitedNatural" => "Xmi::Uml::LiteralUnlimitedNatural",
         "uml:LiteralNull" => "Xmi::Uml::LiteralNull",
-      ),
+      ).freeze,
     }.freeze
   end
 end

data/lib/xmi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Xmi
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
 end

data/lib/xmi.rb

@@ -71,6 +71,7 @@ module Xmi
   autoload :CustomProfile, "xmi/custom_profile"
   autoload :Root, "xmi/root"
   autoload :Sparx, "xmi/sparx"
+  autoload :Performance, "xmi/performance"
 
   # Unified parsing API
   autoload :Parsing, "xmi/parsing"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xmi
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-07-09 00:00:00.000000000 Z
+date: 2026-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model
@@ -61,10 +61,7 @@ files:
 - bin/setup
 - docs/migration.md
 - docs/versioning.md
-- lib/tasks/benchmark_runner.rb
 - lib/tasks/performance.rake
-- lib/tasks/performance_comparator.rb
-- lib/tasks/performance_helpers.rb
 - lib/xmi.rb
 - lib/xmi/add.rb
 - lib/xmi/custom_profile.rb
@@ -97,6 +94,11 @@ files:
 - lib/xmi/namespace_registry.rb
 - lib/xmi/parser_pipeline.rb
 - lib/xmi/parsing.rb
+- lib/xmi/performance.rb
+- lib/xmi/performance/comparator.rb
+- lib/xmi/performance/helpers.rb
+- lib/xmi/performance/runner.rb
+- lib/xmi/performance/term.rb
 - lib/xmi/replace.rb
 - lib/xmi/root.rb
 - lib/xmi/sparx.rb