xmi 0.6.1 → 0.6.2

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_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/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

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.6.2"
 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.6.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-07-09 00:00:00.000000000 Z
+date: 2026-07-18 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,10 @@ 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/replace.rb
 - lib/xmi/root.rb
 - lib/xmi/sparx.rb

data/lib/tasks/benchmark_runner.rb

@@ -1,274 +0,0 @@
-# frozen_string_literal: true
-
-require "benchmark/ips"
-
-# Ensure lib/ is on the load path regardless of tmp location
-lib_path = File.expand_path(File.join(__dir__, "..", "..", "lib"))
-$LOAD_PATH.unshift(lib_path) unless $LOAD_PATH.include?(lib_path)
-
-require "xmi"
-
-# Pretty terminal formatting for benchmark output
-module Term
-  CLEAR   = "\e[0m"
-  BOLD    = "\e[1m"
-  DIM     = "\e[2m"
-  RED     = "\e[31m"
-  GREEN   = "\e[32m"
-  YELLOW  = "\e[33m"
-  CYAN    = "\e[36m"
-  MAGENTA = "\e[35m"
-
-  HL = "─"
-  VL = "│"
-  TL = "┌"
-  TR = "┐"
-  BL = "└"
-  BR = "┘"
-
-  def self.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 self.sep(char: HL, width: 78)
-    puts "#{DIM}#{char * width}#{CLEAR}"
-  end
-
-  def self.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 self.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
-
-class BenchmarkRunner
-  REPO_ROOT = File.expand_path(File.join(__dir__, "..", ".."))
-
-  # Benchmark configuration
-  DEFAULT_RUN_TIME = 5
-  DEFAULT_WARMUP = 2
-
-  # Category definitions with descriptions
-  CATEGORIES = {
-    xmi_parsing: {
-      name: "XMI Parsing",
-      icon: "📄",
-      description: "XMI parsing performance tests. Measures how quickly we can convert XMI files into Ruby objects.",
-      failure_means: "Slow XMI parsing impacts all downstream operations. A regression here means users will experience delays when processing XMI documents.",
-      compare_against: "Previous branch (main).",
-    },
-  }.freeze
-
-  # Test definitions
-  BENCHMARKS = {
-    xmi_parsing: [
-      { name: "XMI 2.4.2 (small)", method: :xmi_parse_242_small,
-        desc: "XMI 2.4.2 ~100KB file" },
-      { name: "XMI 2.4.2 (medium)", method: :xmi_parse_242_medium,
-        desc: "XMI 2.4.2 ~500KB file with extensions" },
-      { name: "XMI 2.4.2 (large)", method: :xmi_parse_242_large,
-        desc: "XMI 2.4.2 ~3.5MB file" },
-      { name: "XMI 2.5.1", method: :xmi_parse_251,
-        desc: "XMI 2.5.1 ~100KB file" },
-    ],
-  }.freeze
-
-  # Test data - fixture paths
-  FIXTURES = {
-    xmi_parse_242_small: "spec/fixtures/xmi-v2-4-2-default.xmi",
-    xmi_parse_242_medium: "spec/fixtures/xmi-v2-4-2-default-with-citygml.xmi",
-    xmi_parse_242_large: "spec/fixtures/full-242.xmi",
-    xmi_parse_251: "spec/fixtures/ea-xmi-2.5.1.xmi",
-  }.freeze
-
-  def initialize(run_time: nil, warmup: nil, benchmark: nil)
-    @run_time = run_time || DEFAULT_RUN_TIME
-    @warmup = warmup || DEFAULT_WARMUP
-    @benchmark = benchmark
-    @results = {}
-    @env_shown = false
-    @all_results = []
-  end
-
-  def run_benchmarks
-    Term.header("XMI Performance Benchmarks", color: Term::CYAN)
-
-    unless @env_shown
-      Term.env_info(RUBY_VERSION, RUBY_PLATFORM)
-      @env_shown = true
-    end
-
-    BENCHMARKS.each do |category, tests|
-      run_category(category, tests)
-    end
-
-    print_summary
-
-    @results
-  end
-
-  private
-
-  def run_category(category, tests)
-    config = CATEGORIES[category]
-    Term.category(
-      config[:name],
-      icon: config[:icon],
-      description: config[:description],
-      failure_means: config[:failure_means],
-      compare_against: config[:compare_against],
-    )
-
-    category_results = []
-
-    tests.each do |test|
-      # Redirect stdout during benchmark
-      original_stdout = $stdout
-      $stdout = StringIO.new
-
-      result = run_single_test(test[:method])
-      (result[:lower] + result[:upper]) / 2.0
-      category_results << { name: test[:name], result: result }
-
-      # Restore stdout
-      $stdout = original_stdout
-    end
-
-    # Print results
-    puts "  #{'Benchmark'.ljust(40)} #{'IPS'.rjust(12)} #{'Deviation'.rjust(12)}"
-    puts "  #{Term::DIM}#{Term::HL * 66}#{Term::CLEAR}"
-
-    category_results.each do |r|
-      ips = (r[:result][:lower] + r[:result][:upper]) / 2.0
-      deviation = calculate_deviation(r[:result])
-      label = "#{config[:name]}: #{r[:name]}"
-      @all_results << { label: label, ips: ips }
-      @results[label] = r[:result]
-
-      puts "  #{r[:name].ljust(40)} #{format('%.2f',
-                                             ips).rjust(12)} #{format('%.1f%%',
-                                                                      deviation).rjust(12)}"
-    end
-
-    puts
-  end
-
-  def run_single_test(method)
-    fixture_path = FIXTURES[method]
-    raise "Unknown fixture: #{method}" unless fixture_path
-
-    # Try to resolve fixture path relative to REPO_ROOT
-    full_path = File.join(REPO_ROOT, fixture_path)
-    unless File.exist?(full_path)
-      # Fallback: try current directory
-      full_path = fixture_path
-    end
-
-    xml_content = File.read(full_path)
-
-    case method
-    when :xmi_parse_242_small, :xmi_parse_242_medium, :xmi_parse_242_large, :xmi_parse_251
-      measure_time { Xmi::Sparx::Root.parse_xml(xml_content) }
-    else
-      raise "Unknown benchmark: #{method}"
-    end
-  end
-
-  def measure(&)
-    job = Benchmark::IPS::Job.new
-    job.config(time: @run_time, warmup: @warmup)
-    job.report("test", &)
-    job.run
-
-    entry = job.full_report.entries.first
-    samples = entry.stats.samples
-
-    return { lower: 0, upper: 0 } if samples.empty?
-
-    mean = samples.sum.to_f / samples.size
-    variance = samples.sum { |x| (x - mean)**2 } / (samples.size - 1)
-    std_dev = Math.sqrt(variance)
-    error_margin = std_dev / mean
-    error_pct = error_margin.round(4)
-
-    { lower: mean.round(4) * (1 - error_pct),
-      upper: mean.round(4) * (1 + error_pct) }
-  end
-
-  def measure_time
-    times = []
-    iterations = 5
-
-    iterations.times do
-      start_t = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-      yield
-      finish_t = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-      times << (finish_t - start_t)
-    end
-
-    mean = times.sum / times.size
-    variance = times.sum { |t| (t - mean)**2 } / (times.size - 1)
-    std_dev = Math.sqrt(variance)
-
-    # Use conservative estimates for time-based measurement
-    lower_time = [mean - std_dev, mean * 0.5].max
-    lower_ips = (1.0 / (lower_time * 1.5)).round(4)
-    upper_ips = (1.0 / mean).round(4)
-
-    # For fast operations, estimate more conservatively
-    if mean < 0.001
-      upper_ips = (1.0 / mean).round(4)
-      lower_ips = (upper_ips * 0.8).round(4)
-    end
-
-    { lower: lower_ips, upper: upper_ips }
-  end
-
-  def calculate_deviation(metrics)
-    return 0 if metrics[:upper].zero?
-
-    ((metrics[:upper] - metrics[:lower]) / metrics[:upper] * 100).round(1)
-  end
-
-  def print_summary
-    puts
-    Term.sep(width: 78)
-    puts
-    puts "  #{Term::BOLD}#{Term::MAGENTA}SUMMARY#{Term::CLEAR}"
-    puts
-
-    @all_results.each do |r|
-      puts "  #{r[:label].ljust(60)} #{format('%.2f', r[:ips]).rjust(10)} IPS"
-    end
-
-    puts
-    puts "  #{Term::DIM}#{@all_results.length} benchmarks completed#{Term::CLEAR}"
-    puts
-  end
-end

data/lib/tasks/performance_comparator.rb

@@ -1,88 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "performance_helpers"
-
-class PerformanceComparator
-  REPO_ROOT = File.expand_path(File.join(__dir__, "..", ".."))
-  DEFAULT_RUN_TIME = 10
-  DEFAULT_THRESHOLD = 0.10 # 10% (more lenient for complex operations)
-  DEFAULT_BASE = "main"
-  TMP_PERF_DIR = File.join(REPO_ROOT, "tmp", "performance")
-  BENCH_SCRIPT = File.join(TMP_PERF_DIR, "benchmark_runner.rb")
-
-  def run
-    setup_environment
-    run_benchmarks_comparison
-  ensure
-    cleanup
-  end
-
-  private
-
-  def setup_environment
-    Dir.chdir(REPO_ROOT)
-    FileUtils.mkdir_p(TMP_PERF_DIR)
-    FileUtils.cp(File.join(REPO_ROOT, "lib", "tasks", "benchmark_runner.rb"),
-                 BENCH_SCRIPT)
-
-    PerformanceHelpers.load_into_namespace(PerformanceHelpers::Current,
-                                           BENCH_SCRIPT)
-    PerformanceHelpers.clone_base_repo(DEFAULT_BASE, TMP_PERF_DIR, BENCH_SCRIPT)
-  end
-
-  def run_benchmarks_comparison
-    all_current = {}
-    all_base = {}
-
-    puts PerformanceHelpers::Term.header("Performance Comparison", color: PerformanceHelpers::CYAN)
-    puts
-    puts "  #{PerformanceHelpers::DIM}Comparing#{PerformanceHelpers::CLEAR}:"
-    puts "  #{PerformanceHelpers::CYAN}  Current#{PerformanceHelpers::CLEAR}: #{PerformanceHelpers.current_branch}"
-    puts "  #{PerformanceHelpers::CYAN}  Base#{PerformanceHelpers::CLEAR}: #{DEFAULT_BASE}"
-    puts "  #{PerformanceHelpers::CYAN}  Threshold#{PerformanceHelpers::CLEAR}: #{(DEFAULT_THRESHOLD * 100).round(0)}% regression allowed"
-    puts
-
-    # Run all benchmarks
-    base_runner = PerformanceHelpers::Base::BenchmarkRunner.new(
-      run_time: DEFAULT_RUN_TIME,
-    )
-    current_runner = PerformanceHelpers::Current::BenchmarkRunner.new(
-      run_time: DEFAULT_RUN_TIME,
-    )
-
-    PerformanceHelpers.run_benchmarks(
-      base_runner,
-      current_runner,
-      DEFAULT_THRESHOLD,
-      all_base,
-      all_current,
-    )
-
-    summary = PerformanceHelpers.summary_report(
-      all_current,
-      all_base,
-      DEFAULT_BASE,
-      DEFAULT_RUN_TIME,
-      DEFAULT_THRESHOLD,
-    )
-
-    handle_results(summary)
-  end
-
-  def handle_results(summary)
-    puts
-    if summary[:regressions].any?
-      puts "  #{PerformanceHelpers::RED}#{PerformanceHelpers::BOLD}❌ PERFORMANCE REGRESSIONS DETECTED#{PerformanceHelpers::CLEAR}"
-      puts "  #{PerformanceHelpers::RED}#{summary[:regressions].length} benchmark(s) regressed beyond threshold#{PerformanceHelpers::CLEAR}"
-      puts
-      exit(1)
-    else
-      puts "  #{PerformanceHelpers::GREEN}#{PerformanceHelpers::BOLD}✅ ALL BENCHMARKS PASSED#{PerformanceHelpers::CLEAR}"
-      puts
-    end
-  end
-
-  def cleanup
-    FileUtils.rm_rf(TMP_PERF_DIR)
-  end
-end