xmi 0.5.11 → 0.6.0

data/lib/xmi/uml/interface.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Xmi
+  module Uml
+    # UML `<packagedElement xmi:type="uml:Interface">`. Contract
+    # declaration carrying owned_operation children.
+    class Interface < PackagedElement
+    end
+  end
+end

data/lib/xmi/uml/interface_realization.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Xmi
+  module Uml
+    # UML `<interfaceRealization>` element — a typed relationship
+    # between a Class and an Interface it implements. Distinct from
+    # the generic Realization element in Sparx XMI; using the typed
+    # element preserves the implementing-class ↔ Interface contract
+    # information that would otherwise be collapsed into a generic
+    # `packagedElement type="uml:Realization"`.
+    class InterfaceRealization < Base
+      attribute :name, :string
+      attribute :client, :string
+      attribute :supplier, :string
+      attribute :contract, :string
+
+      xml do
+        root "interfaceRealization"
+        map_attribute "name", to: :name
+        map_attribute "client", to: :client
+        map_attribute "supplier", to: :supplier
+        map_attribute "contract", to: :contract
+      end
+    end
+  end
+end

data/lib/xmi/uml/literal_boolean.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Xmi
+  module Uml
+    # UML 2.5 §9.8.2.7 — a literal boolean value specification.
+    class LiteralBoolean < ValueSpecification
+      attribute :value, :boolean
+
+      xml do
+        root "literalBoolean"
+        map_attribute "value", to: :value
+      end
+    end
+  end
+end

data/lib/xmi/uml/literal_integer.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Xmi
+  module Uml
+    # UML 2.5 §9.8.2.6 — a literal integer value specification.
+    class LiteralInteger < ValueSpecification
+      attribute :value, :integer
+
+      xml do
+        root "literalInteger"
+        map_attribute "value", to: :value
+      end
+    end
+  end
+end

data/lib/xmi/uml/literal_null.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Xmi
+  module Uml
+    # UML 2.5 §9.8.2.4 — a literal null value specification. Carries
+    # no `value` attribute; presence of a LiteralNull child indicates
+    # the slot is explicitly null (vs. absent).
+    class LiteralNull < ValueSpecification
+      xml do
+        root "literalNull"
+      end
+    end
+  end
+end

data/lib/xmi/uml/literal_string.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Xmi
+  module Uml
+    # UML 2.5 §9.8.2.5 — a literal string value specification.
+    class LiteralString < ValueSpecification
+      attribute :value, :string
+
+      xml do
+        root "literalString"
+        map_attribute "value", to: :value
+      end
+    end
+  end
+end

data/lib/xmi/uml/literal_unlimited_natural.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Xmi
+  module Uml
+    # UML 2.5 §9.8.2.8 — a literal unlimited-natural value
+    # specification. `value` is "*" for unbounded.
+    class LiteralUnlimitedNatural < ValueSpecification
+      attribute :value, :string
+
+      xml do
+        root "literalUnlimitedNatural"
+        map_attribute "value", to: :value
+      end
+    end
+  end
+end

data/lib/xmi/uml/lower_value.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Xmi
+  module Uml
+    class LowerValue < DefaultValue
+      xml do
+        root "lowerValue"
+      end
+    end
+  end
+end

data/lib/xmi/uml/opaque_expression.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Xmi
+  module Uml
+    # UML `<opaqueExpression>` element — used as the body of a Slot's
+    # `<value>` element and as the language-bodied body of behavioral
+    # features. Sparx EA serialises instance-specification values as
+    # OpaqueExpression with a `body` attribute carrying the literal
+    # expression text.
+    #
+    # Per UML 2.5 §8.3, `body` and `language` are parallel arrays
+    # (`String [*]`): `body[i]` is written in `language[i]`. Most
+    # Sparx output carries a single pair; we model the collection
+    # form so multi-language expressions round-trip without loss.
+    class OpaqueExpression < ValueSpecification
+      attribute :body, :string, collection: true
+      attribute :language, :string, collection: true
+      attribute :body_attribute, :string
+      attribute :language_attribute, :string
+
+      xml do
+        root "opaqueExpression"
+        map_attribute "body", to: :body_attribute
+        map_attribute "language", to: :language_attribute
+
+        map_element "body", to: :body
+        map_element "language", to: :language
+      end
+    end
+  end
+end

data/lib/xmi/uml/owned_attribute.rb

@@ -2,30 +2,45 @@
 
 module Xmi
   module Uml
-    class OwnedAttribute < Lutaml::Model::Serializable
-      skip_reference_registration
-      attribute :type, ::Xmi::Type::XmiType
-      attribute :id, ::Xmi::Type::XmiId
+    class OwnedAttribute < Base
       attribute :association, :string
       attribute :name, :string
-      attribute :is_derived, :string
+      attribute :visibility, :string
+      attribute :is_derived, :boolean
+      attribute :is_id, :boolean
+      attribute :is_ordered, :boolean
+      attribute :is_unique, :boolean
+      attribute :is_read_only, :boolean
+      # `default` is the XMI attribute form (string shortcut);
+      # `default_value` below is the child <defaultValue> element
+      # (ValueSpecification). UML 2.5 Property carries both shapes.
+      attribute :default, :string
+      attribute :aggregation, :string
       attribute :uml_type, Uml::Type
-      attribute :upper_value, UpperValue
-      attribute :lower_value, LowerValue
+      attribute :upper_value, ValueSpecification, polymorphic: true
+      attribute :lower_value, ValueSpecification, polymorphic: true
+      attribute :default_value, ValueSpecification, polymorphic: true
 
       xml do
         root "ownedAttribute"
-        namespace ::Xmi::Namespace::Omg::Uml
-
-        map_attribute "type", to: :type
-        map_attribute "id", to: :id
         map_attribute "association", to: :association
         map_attribute "name", to: :name
+        map_attribute "visibility", to: :visibility
         map_attribute "isDerived", to: :is_derived
+        map_attribute "isID", to: :is_id
+        map_attribute "isOrdered", to: :is_ordered
+        map_attribute "isUnique", to: :is_unique
+        map_attribute "isReadOnly", to: :is_read_only
+        map_attribute "default", to: :default
+        map_attribute "aggregation", to: :aggregation
 
         map_element "type", to: :uml_type
-        map_element "upperValue", to: :upper_value
-        map_element "lowerValue", to: :lower_value
+        map_element "upperValue", to: :upper_value,
+                                  polymorphic: VALUE_SPECIFICATION_POLYMORPHIC_MAP
+        map_element "lowerValue", to: :lower_value,
+                                  polymorphic: VALUE_SPECIFICATION_POLYMORPHIC_MAP
+        map_element "defaultValue", to: :default_value,
+                                    polymorphic: VALUE_SPECIFICATION_POLYMORPHIC_MAP
       end
     end
   end

data/lib/xmi/uml/owned_comment.rb

@@ -2,10 +2,7 @@
 
 module Xmi
   module Uml
-    class OwnedComment < Lutaml::Model::Serializable
-      skip_reference_registration
-      attribute :type, ::Xmi::Type::XmiType
-      attribute :id, ::Xmi::Type::XmiId
+    class OwnedComment < Base
       attribute :name, :string
       attribute :body_element, :string
       attribute :body_attribute, :string
@@ -14,10 +11,6 @@ module Xmi
 
       xml do
         root "ownedComment"
-        namespace ::Xmi::Namespace::Omg::Uml
-
-        map_attribute "type", to: :type
-        map_attribute "id", to: :id
         map_attribute "name", to: :name
         map_attribute "body", to: :body_attribute
         map_attribute "annotatedElement", to: :annotated_attribute

data/lib/xmi/uml/owned_element.rb

@@ -2,10 +2,10 @@
 
 module Xmi
   module Uml
-    class OwnedElement < Lutaml::Model::Serializable
-      skip_reference_registration
-      attribute :type, ::Xmi::Type::XmiType
-      attribute :id, ::Xmi::Type::XmiId
+    # UMLDI `<ownedElement>` — a diagram element (shape, label, etc.).
+    # Carries text, optional nested ownedElement children, bounds,
+    # and source/target/waypoint for connectors.
+    class OwnedElement < ::Xmi::UmlDi::Base
       attribute :text, :string
       attribute :model_element, :string
       attribute :owned_element, OwnedElement, collection: true
@@ -16,10 +16,6 @@ module Xmi
 
       xml do
         root "ownedElement"
-        namespace ::Xmi::Namespace::Omg::UmlDi
-
-        map_attribute "type", to: :type
-        map_attribute "id", to: :id
         map_attribute "text", to: :text
         map_attribute "modelElement", to: :model_element
 

data/lib/xmi/uml/owned_end.rb

@@ -2,31 +2,34 @@
 
 module Xmi
   module Uml
-    class OwnedEnd < Lutaml::Model::Serializable
-      skip_reference_registration
-      attribute :type, ::Xmi::Type::XmiType
-      attribute :id, ::Xmi::Type::XmiId
+    class OwnedEnd < Base
       attribute :association, :string
       attribute :name, :string
+      attribute :visibility, :string
+      attribute :aggregation, :string
       attribute :uml_type, Uml::Type
       attribute :member_end, :string
-      attribute :lower, :integer
-      attribute :upper, :integer
+      attribute :upper_value, ValueSpecification, polymorphic: true
+      attribute :lower_value, ValueSpecification, polymorphic: true
+      attribute :default_value, ValueSpecification, polymorphic: true
       attribute :is_composite, :boolean
 
       xml do
         root "ownedEnd"
-        namespace ::Xmi::Namespace::Omg::Uml
-
-        map_attribute "type", to: :type
-        map_attribute "id", to: :id
         map_attribute "association", to: :association
         map_attribute "name", to: :name
+        map_attribute "visibility", to: :visibility
+        map_attribute "aggregation", to: :aggregation
         map_attribute "memberEnd", to: :member_end
-        map_attribute "lower", to: :lower
-        map_attribute "upper", to: :upper
         map_attribute "isComposite", to: :is_composite
+
         map_element "type", to: :uml_type
+        map_element "upperValue", to: :upper_value,
+                                  polymorphic: VALUE_SPECIFICATION_POLYMORPHIC_MAP
+        map_element "lowerValue", to: :lower_value,
+                                  polymorphic: VALUE_SPECIFICATION_POLYMORPHIC_MAP
+        map_element "defaultValue", to: :default_value,
+                                    polymorphic: VALUE_SPECIFICATION_POLYMORPHIC_MAP
       end
     end
   end

data/lib/xmi/uml/owned_literal.rb

@@ -2,21 +2,13 @@
 
 module Xmi
   module Uml
-    class OwnedLiteral < Lutaml::Model::Serializable
-      skip_reference_registration
-      attribute :type, ::Xmi::Type::XmiType
-      attribute :id, ::Xmi::Type::XmiId
+    class OwnedLiteral < Base
       attribute :name, :string
       attribute :uml_type, Uml::Type
 
       xml do
         root "ownedLiteral"
-        namespace ::Xmi::Namespace::Omg::Uml
-
-        map_attribute "type", to: :type
-        map_attribute "id", to: :id
         map_attribute "name", to: :name
-
         map_element "type", to: :uml_type
       end
     end

data/lib/xmi/uml/owned_operation.rb

@@ -2,18 +2,25 @@
 
 module Xmi
   module Uml
-    class OwnedOperation < Lutaml::Model::Serializable
-      skip_reference_registration
-      attribute :id, ::Xmi::Type::XmiId
+    class OwnedOperation < Base
       attribute :name, :string
+      attribute :visibility, :string
+      attribute :is_static, :boolean
+      attribute :is_abstract, :boolean
+      attribute :is_query, :boolean
+      attribute :concurrency, :string
       attribute :owned_parameter, OwnedParameter, collection: true
       attribute :precondition, Precondition
       attribute :uml_type, Uml::Type, collection: true
 
       xml do
         root "ownedOperation"
-        map_attribute "id", to: :id
         map_attribute "name", to: :name
+        map_attribute "visibility", to: :visibility
+        map_attribute "isStatic", to: :is_static
+        map_attribute "isAbstract", to: :is_abstract
+        map_attribute "isQuery", to: :is_query
+        map_attribute "concurrency", to: :concurrency
         map_element "ownedParameter", to: :owned_parameter, value_map: VALUE_MAP
         map_element "precondition", to: :precondition
         map_element "type", to: :uml_type, value_map: VALUE_MAP

data/lib/xmi/uml/owned_parameter.rb

@@ -2,28 +2,34 @@
 
 module Xmi
   module Uml
-    class OwnedParameter < Lutaml::Model::Serializable
-      skip_reference_registration
-      attribute :id, ::Xmi::Type::XmiId
+    class OwnedParameter < Base
       attribute :name, :string
       attribute :type, ::Xmi::Type::XmiType
       attribute :direction, :string
-      attribute :upper_value, UpperValue
-      attribute :lower_value, LowerValue
-      attribute :default_value, DefaultValue
+      attribute :visibility, :string
+      attribute :is_ordered, :boolean
+      attribute :is_unique, :boolean
+      attribute :effect, :string
+      attribute :upper_value, ValueSpecification, polymorphic: true
+      attribute :lower_value, ValueSpecification, polymorphic: true
+      attribute :default_value, ValueSpecification, polymorphic: true
 
       xml do
         root "ownedParameter"
-        namespace ::Xmi::Namespace::Omg::Uml
-
-        map_attribute "id", to: :id
         map_attribute "name", to: :name
         map_attribute "type", to: :type
         map_attribute "direction", to: :direction
+        map_attribute "visibility", to: :visibility
+        map_attribute "isOrdered", to: :is_ordered
+        map_attribute "isUnique", to: :is_unique
+        map_attribute "effect", to: :effect
 
-        map_element "upperValue", to: :upper_value
-        map_element "lowerValue", to: :lower_value
-        map_element "defaultValue", to: :default_value
+        map_element "upperValue", to: :upper_value,
+                                  polymorphic: VALUE_SPECIFICATION_POLYMORPHIC_MAP
+        map_element "lowerValue", to: :lower_value,
+                                  polymorphic: VALUE_SPECIFICATION_POLYMORPHIC_MAP
+        map_element "defaultValue", to: :default_value,
+                                    polymorphic: VALUE_SPECIFICATION_POLYMORPHIC_MAP
       end
     end
   end

data/lib/xmi/uml/package.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Xmi
+  module Uml
+    # UML `<packagedElement xmi:type="uml:Package">`. Container for
+    # nested packagedElement children.
+    class Package < PackagedElement
+    end
+  end
+end

data/lib/xmi/uml/package_import.rb

@@ -2,18 +2,6 @@
 
 module Xmi
   module Uml
-    class ImportedPackage < Lutaml::Model::Serializable
-      skip_reference_registration
-      attribute :href, :string
-
-      xml do
-        root "importedPackage"
-        namespace ::Xmi::Namespace::Omg::Uml
-
-        map_attribute "href", to: :href
-      end
-    end
-
     class PackageImport < Lutaml::Model::Serializable
       attribute :id, ::Xmi::Type::XmiId
       attribute :imported_package, ImportedPackage

data/lib/xmi/uml/packaged_element.rb

@@ -2,11 +2,42 @@
 
 module Xmi
   module Uml
-    class PackagedElement < Lutaml::Model::Serializable
-      skip_reference_registration
-      attribute :type, ::Xmi::Type::XmiType
-      attribute :id, ::Xmi::Type::XmiId
+    # Shared polymorphic dispatch map for any attribute whose value
+    # is a PackagedElement dispatched on `xmi:type`. Used by the
+    # 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.
+    PACKAGED_ELEMENT_POLYMORPHIC_MAP = {
+      attribute: "xmi:type",
+      class_map: {
+        "uml:Class" => "Xmi::Uml::UmlClass",
+        "uml:Association" => "Xmi::Uml::Association",
+        "uml:AssociationClass" => "Xmi::Uml::AssociationClass",
+        "uml:Interface" => "Xmi::Uml::Interface",
+        "uml:InstanceSpecification" => "Xmi::Uml::InstanceSpecification",
+        "uml:DataType" => "Xmi::Uml::DataType",
+        "uml:PrimitiveType" => "Xmi::Uml::PrimitiveType",
+        "uml:Enumeration" => "Xmi::Uml::Enumeration",
+        "uml:Package" => "Xmi::Uml::Package",
+        "uml:Realization" => "Xmi::Uml::Realization",
+        "uml:Dependency" => "Xmi::Uml::Dependency",
+        "uml:Signal" => "Xmi::Uml::Signal",
+        "uml:Extension" => "Xmi::Uml::Extension",
+        "uml:Stereotype" => "Xmi::Uml::Stereotype",
+        "uml:Usage" => "Xmi::Uml::Usage",
+      },
+    }.freeze
+
+    class PackagedElement < Base
       attribute :name, :string
+      attribute :visibility, :string
+      attribute :is_abstract, :boolean
+      attribute :is_leaf, :boolean
+      attribute :is_active, :boolean
+      attribute :classifier, :string
       attribute :member_end, :string
       attribute :member_ends, MemberEnd, collection: true
       attribute :owned_literal, OwnedLiteral, collection: true
@@ -16,19 +47,24 @@ module Xmi
       attribute :supplier, :string
       attribute :client, :string
 
-      attribute :packaged_element, PackagedElement, collection: true
+      attribute :packaged_element, PackagedElement, collection: true,
+                                                    polymorphic: true
       attribute :owned_end, OwnedEnd, collection: true
       attribute :owned_attribute, OwnedAttribute, collection: true
       attribute :owned_comment, OwnedComment, collection: true
       attribute :generalization, AssociationGeneralization, collection: true
+      attribute :interface_realization, InterfaceRealization, collection: true
+      attribute :slot, Slot, collection: true
+      attribute :specification, Specification
 
       xml do
         root "packagedElement"
-        namespace ::Xmi::Namespace::Omg::Uml
-
-        map_attribute "type", to: :type
-        map_attribute "id", to: :id
         map_attribute "name", to: :name
+        map_attribute "visibility", to: :visibility
+        map_attribute "isAbstract", to: :is_abstract
+        map_attribute "isLeaf", to: :is_leaf
+        map_attribute "isActive", to: :is_active
+        map_attribute "classifier", to: :classifier
         map_attribute "memberEnd", to: :member_end
 
         # EA specific
@@ -36,14 +72,18 @@ module Xmi
         map_attribute "client", to: :client
 
         map_element "generalization", to: :generalization, value_map: VALUE_MAP
+        map_element "interfaceRealization", to: :interface_realization,
+                                            value_map: VALUE_MAP
         map_element "ownedComment", to: :owned_comment, value_map: VALUE_MAP
         map_element "ownedEnd", to: :owned_end, value_map: VALUE_MAP
         map_element "ownedLiteral", to: :owned_literal, value_map: VALUE_MAP
         map_element "ownedAttribute", to: :owned_attribute, value_map: VALUE_MAP
         map_element "ownedOperation", to: :owned_operation, value_map: VALUE_MAP
         map_element "packagedElement", to: :packaged_element,
-                                       value_map: VALUE_MAP
+                                       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
       end
     end
   end

data/lib/xmi/uml/precondition.rb

@@ -2,20 +2,13 @@
 
 module Xmi
   module Uml
-    class Precondition < Lutaml::Model::Serializable
-      skip_reference_registration
-      attribute :id, ::Xmi::Type::XmiId
+    class Precondition < Base
       attribute :name, :string
-      attribute :type, ::Xmi::Type::XmiType
       attribute :specification, Specification
 
       xml do
         root "precondition"
-        namespace ::Xmi::Namespace::Omg::Uml
-
-        map_attribute "id", to: :id
         map_attribute "name", to: :name
-        map_attribute "type", to: :type
         map_element "specification", to: :specification
       end
     end

data/lib/xmi/uml/primitive_type.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Xmi
+  module Uml
+    # UML `<packagedElement xmi:type="uml:PrimitiveType">`.
+    # Built-in primitive (string, integer, boolean, etc.).
+    class PrimitiveType < PackagedElement
+    end
+  end
+end

data/lib/xmi/uml/profile.rb

@@ -2,37 +2,23 @@
 
 module Xmi
   module Uml
-    module ProfileAttributes
-      def self.included(klass)
-        klass.class_eval do
-          attribute :packaged_element, PackagedElement, collection: true
-          attribute :package_import, PackageImport, collection: true
-          attribute :id, ::Xmi::Type::XmiId
-          attribute :name, :string
-          # attribute :xmi, :string
-          # attribute :uml, :string
-          attribute :ns_prefix, :string
-
-          # Is this an EA thing?
-          attribute :metamodel_reference, :string
-        end
-      end
-    end
-
-    class Profile < Lutaml::Model::Serializable
-      skip_reference_registration
-      include ProfileAttributes
-
+    # UML `<Profile>` element (UML 2.5 §22.3). A stereotyped package
+    # that extends the UML metamodel. Carries owned comments, package
+    # imports, nested packaged elements, and profile-specific metadata
+    # (nsPrefix, metamodelReference).
+    class Profile < Base
+      attribute :name, :string
+      attribute :ns_prefix, :string
+      attribute :metamodel_reference, :string
+      attribute :packaged_element, PackagedElement, collection: true
+      attribute :package_import, PackageImport, collection: true
       attribute :owned_comment, OwnedComment, collection: true
 
       xml do
         root "Profile"
-        namespace ::Xmi::Namespace::Omg::Uml
-
-        map_attribute "id", to: :id
         map_attribute "name", to: :name
-        map_attribute "metamodelReference", to: :metamodel_reference
         map_attribute "nsPrefix", to: :ns_prefix
+        map_attribute "metamodelReference", to: :metamodel_reference
 
         map_element "ownedComment", to: :owned_comment, value_map: VALUE_MAP
         map_element "packageImport", to: :package_import, value_map: VALUE_MAP