xmi 0.5.11 → 0.5.12

data/lib/xmi/uml/stereotype.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require_relative "packaged_element"
+
+module Xmi
+  module Uml
+    # UML `<packagedElement xmi:type="uml:Stereotype">. A stereotype
+    # 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
+    # PackagedElement. The union-bag attribute set is inherited
+    # unchanged so existing consumers keep working. Phase B
+    # (narrowing attrs to the subclass) is future work.
+    class Stereotype < PackagedElement
+    end
+  end
+end

data/lib/xmi/uml/uml_class.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require_relative "packaged_element"
+
+module Xmi
+  module Uml
+    # 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
+    # PackagedElement. The union-bag attribute set is inherited
+    # unchanged so existing consumers keep working. Phase B
+    # (narrowing attrs to the subclass) is future work.
+    class UmlClass < PackagedElement
+    end
+  end
+end

data/lib/xmi/uml/uml_model.rb

@@ -1,28 +1,24 @@
 # frozen_string_literal: true
 
+require_relative "packaged_element"
+
 module Xmi
   module Uml
-    class UmlModel < Lutaml::Model::Serializable
-      skip_reference_registration
-      attribute :id, ::Xmi::Type::XmiId
-      attribute :type, ::Xmi::Type::XmiType
+    class UmlModel < Base
       attribute :name, :string
       attribute :profile_application, ProfileApplication, collection: true
-      attribute :packaged_element, PackagedElement, collection: true
+      attribute :packaged_element, PackagedElement, collection: true,
+                                                    polymorphic: true
       attribute :package_import, PackageImport, collection: true
       attribute :diagram, Diagram
 
       xml do
         root "Model"
-        namespace ::Xmi::Namespace::Omg::Uml
-
-        map_attribute "id", to: :id
-        map_attribute "type", to: :type
         map_attribute "name", to: :name
 
         map_element "packageImport", to: :package_import, value_map: VALUE_MAP
         map_element "packagedElement", to: :packaged_element,
-                                       value_map: VALUE_MAP
+                                       polymorphic: PACKAGED_ELEMENT_POLYMORPHIC_MAP
         map_element "Diagram", to: :diagram, form: :qualified
         map_element "profileApplication", to: :profile_application,
                                           value_map: VALUE_MAP

data/lib/xmi/uml/upper_value.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require_relative "default_value"
+
+module Xmi
+  module Uml
+    class UpperValue < DefaultValue
+      xml do
+        root "upperValue"
+      end
+    end
+  end
+end

data/lib/xmi/uml/usage.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require_relative "packaged_element"
+
+module Xmi
+  module Uml
+    # UML `<packagedElement xmi:type="uml:Usage">. A Dependency
+    # 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
+    # PackagedElement. The union-bag attribute set is inherited
+    # unchanged so existing consumers keep working. Phase B
+    # (narrowing attrs to the subclass) is future work.
+    class Usage < PackagedElement
+    end
+  end
+end

data/lib/xmi/uml/value_specification.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Xmi
+  module Uml
+    # Abstract UML ValueSpecification. UML 2.5 §9.8 — the abstract
+    # parent of OpaqueExpression, LiteralString, LiteralInteger,
+    # LiteralBoolean, LiteralUnlimitedNatural, LiteralNull, etc.
+    #
+    # Used as the type of `Slot#value` and other polymorphic value
+    # attributes so the parser can dispatch on `xmi:type` to the
+    # right concrete subclass.
+    #
+    # Concrete subclasses live in their own files (literal_string.rb,
+    # opaque_expression.rb, etc.). Add new literals as a new file plus
+    # an entry in POLYMORPHIC_MAP below — OCP-friendly, no edits to
+    # callers.
+    class ValueSpecification < Base
+      attribute :type, ::Xmi::Type::XmiType, polymorphic_class: true
+
+      xml do
+        root "valueSpecification"
+        map_attribute "type", to: :type
+      end
+    end
+
+    # Shared polymorphic dispatch map for any attribute whose value
+    # is a ValueSpecification dispatched on `xmi:type`. Consumers:
+    # Slot#value, OwnedAttribute#upper_value/#lower_value/#default_value,
+    # OwnedEnd#upper_value/#lower_value/#default_value,
+    # OwnedParameter#upper_value/#lower_value/#default_value.
+    #
+    # The literal class names are string form because lutaml-model's
+    # resolve_polymorphic_class calls Object.const_get on the value.
+    VALUE_SPECIFICATION_POLYMORPHIC_MAP = {
+      attribute: "xmi:type",
+      class_map: {
+        "uml:OpaqueExpression" => "Xmi::Uml::OpaqueExpression",
+        "uml:LiteralString" => "Xmi::Uml::LiteralString",
+        "uml:LiteralInteger" => "Xmi::Uml::LiteralInteger",
+        "uml:LiteralBoolean" => "Xmi::Uml::LiteralBoolean",
+        "uml:LiteralUnlimitedNatural" => "Xmi::Uml::LiteralUnlimitedNatural",
+        "uml:LiteralNull" => "Xmi::Uml::LiteralNull",
+      },
+    }.freeze
+  end
+end

data/lib/xmi/uml/waypoint.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Xmi
+  module Uml
+    class Waypoint < Lutaml::Model::Serializable
+      skip_reference_registration
+      attribute :type, ::Xmi::Type::XmiType
+      attribute :id, ::Xmi::Type::XmiId
+      attribute :x, :integer
+      attribute :y, :integer
+
+      xml do
+        root "waypoint"
+        namespace ::Xmi::Namespace::Omg::UmlDi
+
+        map_attribute "type", to: :type
+        map_attribute "id", to: :id
+        map_attribute "x", to: :x
+        map_attribute "y", to: :y
+      end
+    end
+  end
+end

data/lib/xmi/uml.rb

@@ -2,12 +2,22 @@
 
 module Xmi
   module Uml
+    autoload :Base, "xmi/uml/base"
     autoload :AnnotatedElement, "xmi/uml/annotated_element"
     autoload :Type, "xmi/uml/type"
     autoload :MemberEnd, "xmi/uml/member_end"
     autoload :DefaultValue, "xmi/uml/default_value"
-    autoload :UpperValue, "xmi/uml/default_value"
-    autoload :LowerValue, "xmi/uml/default_value"
+    autoload :UpperValue, "xmi/uml/upper_value"
+    autoload :LowerValue, "xmi/uml/lower_value"
+    autoload :ValueSpecification, "xmi/uml/value_specification"
+    autoload :LiteralString, "xmi/uml/literal_string"
+    autoload :LiteralInteger, "xmi/uml/literal_integer"
+    autoload :LiteralBoolean, "xmi/uml/literal_boolean"
+    autoload :LiteralUnlimitedNatural, "xmi/uml/literal_unlimited_natural"
+    autoload :LiteralNull, "xmi/uml/literal_null"
+    autoload :OpaqueExpression, "xmi/uml/opaque_expression"
+    autoload :Slot, "xmi/uml/slot"
+    autoload :InterfaceRealization, "xmi/uml/interface_realization"
     autoload :OwnedEnd, "xmi/uml/owned_end"
     autoload :OwnedLiteral, "xmi/uml/owned_literal"
     autoload :OwnedAttribute, "xmi/uml/owned_attribute"
@@ -18,16 +28,32 @@ module Xmi
     autoload :OwnedComment, "xmi/uml/owned_comment"
     autoload :AssociationGeneralization, "xmi/uml/association_generalization"
     autoload :PackagedElement, "xmi/uml/packaged_element"
+    autoload :UmlClass, "xmi/uml/uml_class"
+    autoload :Association, "xmi/uml/association"
+    autoload :Interface, "xmi/uml/interface"
+    autoload :InstanceSpecification, "xmi/uml/instance_specification"
+    autoload :DataType, "xmi/uml/data_type"
+    autoload :PrimitiveType, "xmi/uml/primitive_type"
+    autoload :Enumeration, "xmi/uml/enumeration"
+    autoload :Package, "xmi/uml/package"
+    autoload :Realization, "xmi/uml/realization"
+    autoload :Dependency, "xmi/uml/dependency"
+    autoload :Signal, "xmi/uml/signal"
+    autoload :AssociationClass, "xmi/uml/association_class"
+    autoload :Extension, "xmi/uml/extension"
+    autoload :Stereotype, "xmi/uml/stereotype"
+    autoload :Usage, "xmi/uml/usage"
     autoload :Bounds, "xmi/uml/bounds"
-    autoload :Waypoint, "xmi/uml/bounds"
+    autoload :Waypoint, "xmi/uml/waypoint"
     autoload :OwnedElement, "xmi/uml/owned_element"
     autoload :Diagram, "xmi/uml/diagram"
-    autoload :ProfileApplicationAppliedProfile, "xmi/uml/profile_application"
+    autoload :ProfileApplicationAppliedProfile,
+             "xmi/uml/profile_application_applied_profile"
     autoload :ProfileApplication, "xmi/uml/profile_application"
-    autoload :ImportedPackage, "xmi/uml/package_import"
+    autoload :ImportedPackage, "xmi/uml/imported_package"
     autoload :PackageImport, "xmi/uml/package_import"
     autoload :UmlModel, "xmi/uml/uml_model"
-    autoload :ProfileAttributes, "xmi/uml/profile"
+    autoload :ProfileAttributes, "xmi/uml/profile_attributes"
     autoload :Profile, "xmi/uml/profile"
   end
 end

data/lib/xmi/version.rb

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

data/lib/xmi.rb

@@ -27,11 +27,25 @@ require_relative "xmi/xmi_identity"
 module Xmi
   class Error < StandardError; end
 
-  # Shared value_map for XMI elements
-  # Used to handle nil, empty, and omitted values consistently
+  # Shared value_map for XMI elements.
+  #
+  # Parsing (`from:`) stays flexible: nil / empty / omitted all map
+  # to the symbol `:empty`, which the parser uses to materialise an
+  # empty model on the attribute. This preserves absence-vs-empty
+  # distinctions on the way IN.
+  #
+  # Serialization (`to:`) is generation-friendly: nil / empty /
+  # omitted all map to `:omitted`, which means "do not emit the
+  # element". This eliminates the post-processing step the ea gem
+  # previously needed (XmlSanitizer) to strip truly-empty elements
+  # that real Sparx XMI never carries.
+  #
+  # This is a breaking change from the previous symmetric VALUE_MAP
+  # (which emitted `<child/>` for empty collections). Consumers that
+  # relied on empty-element round-trip must update.
   VALUE_MAP = {
     from: { nil: :empty, empty: :empty, omitted: :empty },
-    to: { nil: :empty, empty: :empty, omitted: :empty },
+    to: { nil: :omitted, empty: :omitted, omitted: :omitted },
   }.freeze
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xmi
 version: !ruby/object:Gem::Version
-  version: 0.5.11
+  version: 0.5.12
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-06-29 00:00:00.000000000 Z
+date: 2026-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model
@@ -57,6 +57,9 @@ files:
 - Gemfile
 - README.adoc
 - Rakefile
+- TODO.next/01-packaged-element-typed-subclasses.md
+- TODO.next/03-real-sparx-instancespec-fixture.md
+- TODO.next/README.md
 - bin/console
 - bin/setup
 - docs/migration.md
@@ -159,11 +162,29 @@ files:
 - lib/xmi/type.rb
 - lib/xmi/uml.rb
 - lib/xmi/uml/annotated_element.rb
+- lib/xmi/uml/association.rb
+- lib/xmi/uml/association_class.rb
 - lib/xmi/uml/association_generalization.rb
+- lib/xmi/uml/base.rb
 - lib/xmi/uml/bounds.rb
+- lib/xmi/uml/data_type.rb
 - lib/xmi/uml/default_value.rb
+- lib/xmi/uml/dependency.rb
 - lib/xmi/uml/diagram.rb
+- lib/xmi/uml/enumeration.rb
+- lib/xmi/uml/extension.rb
+- lib/xmi/uml/imported_package.rb
+- lib/xmi/uml/instance_specification.rb
+- lib/xmi/uml/interface.rb
+- lib/xmi/uml/interface_realization.rb
+- lib/xmi/uml/literal_boolean.rb
+- lib/xmi/uml/literal_integer.rb
+- lib/xmi/uml/literal_null.rb
+- lib/xmi/uml/literal_string.rb
+- lib/xmi/uml/literal_unlimited_natural.rb
+- lib/xmi/uml/lower_value.rb
 - lib/xmi/uml/member_end.rb
+- lib/xmi/uml/opaque_expression.rb
 - lib/xmi/uml/owned_attribute.rb
 - lib/xmi/uml/owned_comment.rb
 - lib/xmi/uml/owned_element.rb
@@ -171,14 +192,27 @@ files:
 - lib/xmi/uml/owned_literal.rb
 - lib/xmi/uml/owned_operation.rb
 - lib/xmi/uml/owned_parameter.rb
+- lib/xmi/uml/package.rb
 - lib/xmi/uml/package_import.rb
 - lib/xmi/uml/packaged_element.rb
 - lib/xmi/uml/precondition.rb
+- lib/xmi/uml/primitive_type.rb
 - lib/xmi/uml/profile.rb
 - lib/xmi/uml/profile_application.rb
+- lib/xmi/uml/profile_application_applied_profile.rb
+- lib/xmi/uml/profile_attributes.rb
+- lib/xmi/uml/realization.rb
+- lib/xmi/uml/signal.rb
+- lib/xmi/uml/slot.rb
 - lib/xmi/uml/specification.rb
+- lib/xmi/uml/stereotype.rb
 - lib/xmi/uml/type.rb
+- lib/xmi/uml/uml_class.rb
 - lib/xmi/uml/uml_model.rb
+- lib/xmi/uml/upper_value.rb
+- lib/xmi/uml/usage.rb
+- lib/xmi/uml/value_specification.rb
+- lib/xmi/uml/waypoint.rb
 - lib/xmi/v20110701.rb
 - lib/xmi/v20131001.rb
 - lib/xmi/v20161101.rb