xmi 0.5.10 → 0.5.12

data/lib/xmi/sparx/element/extended_properties.rb

@@ -11,6 +11,7 @@ module Xmi
 
         xml do
           root "extendedProperties"
+          namespace ::Xmi::Namespace::Omg::Xmi
 
           map_attribute "tagged", to: :tagged
           map_attribute "package_name", to: :package_name

data/lib/xmi/sparx/element/flags.rb

@@ -15,6 +15,7 @@ module Xmi
 
         xml do
           root "flags"
+          namespace ::Xmi::Namespace::Omg::Xmi
 
           map_attribute "iscontrolled", to: :is_controlled
           map_attribute "isprotected", to: :is_protected

data/lib/xmi/sparx/element/links.rb

@@ -11,6 +11,7 @@ module Xmi
 
         xml do
           root "links"
+          namespace ::Xmi::Namespace::Omg::Xmi
 
           map_element "Association", to: :association, value_map: VALUE_MAP
           map_element "Generalization", to: :generalization,

data/lib/xmi/sparx/element/model.rb

@@ -13,7 +13,7 @@ module Xmi
 
         xml do
           root "model"
-          namespace ::Xmi::Namespace::Omg::Uml
+          namespace ::Xmi::Namespace::Omg::Xmi
 
           map_attribute "package", to: :package
           map_attribute "package2", to: :package2

data/lib/xmi/sparx/element/package_properties.rb

@@ -11,6 +11,7 @@ module Xmi
 
         xml do
           root "packagedproperties"
+          namespace ::Xmi::Namespace::Omg::Xmi
 
           map_attribute "version", to: :version
           map_attribute "xmiver", to: :xmiver

data/lib/xmi/sparx/element/paths.rb

@@ -9,6 +9,7 @@ module Xmi
 
         xml do
           root "paths"
+          namespace ::Xmi::Namespace::Omg::Xmi
 
           map_attribute "xmlpath", to: :xmlpath
         end

data/lib/xmi/sparx/element/project.rb

@@ -15,6 +15,7 @@ module Xmi
 
         xml do
           root "project"
+          namespace ::Xmi::Namespace::Omg::Xmi
 
           map_attribute "author", to: :author
           map_attribute "version", to: :version

data/lib/xmi/sparx/element/properties.rb

@@ -21,6 +21,7 @@ module Xmi
 
         xml do
           root "properties"
+          namespace ::Xmi::Namespace::Omg::Xmi
 
           map_attribute "name", to: :name
           map_attribute "type", to: :type

data/lib/xmi/sparx/element/stereotype.rb

@@ -9,6 +9,7 @@ module Xmi
 
         xml do
           root "stereotype"
+          namespace ::Xmi::Namespace::Omg::Xmi
 
           map_attribute "stereotype", to: :stereotype
         end

data/lib/xmi/sparx/element/style.rb

@@ -9,6 +9,7 @@ module Xmi
 
         xml do
           root "style"
+          namespace ::Xmi::Namespace::Omg::Xmi
 
           map_attribute "appearance", to: :appearance
         end

data/lib/xmi/sparx/element/styleex.rb

@@ -9,6 +9,7 @@ module Xmi
 
         xml do
           root "styleex"
+          namespace ::Xmi::Namespace::Omg::Xmi
 
           map_attribute "value", to: :value
         end

data/lib/xmi/sparx/element/tag.rb

@@ -12,6 +12,7 @@ module Xmi
 
         xml do
           root "tag"
+          namespace ::Xmi::Namespace::Omg::Xmi
 
           map_attribute "id", to: :id
           map_attribute "name", to: :name
@@ -25,6 +26,7 @@ module Xmi
 
         xml do
           root "tags"
+          namespace ::Xmi::Namespace::Omg::Xmi
           map_element "tag", to: :tags, value_map: VALUE_MAP
         end
       end

data/lib/xmi/sparx/element/times.rb

@@ -12,6 +12,7 @@ module Xmi
 
         xml do
           root "times"
+          namespace ::Xmi::Namespace::Omg::Xmi
 
           map_attribute "created", to: :created
           map_attribute "modified", to: :modified

data/lib/xmi/sparx/element/xrefs.rb

@@ -9,6 +9,7 @@ module Xmi
 
         xml do
           root "xrefs"
+          namespace ::Xmi::Namespace::Omg::Xmi
 
           map_attribute "value", to: :value
         end

data/lib/xmi/sparx/mappings/base_mapping.rb

@@ -33,7 +33,7 @@ module Xmi
           VM = ::Xmi::VALUE_MAP
 
           # Extension element containing Sparx EA-specific metadata
-          map_element "Extension", to: :extension
+          map_element "Extension", to: :extension, form: :qualified
 
           # Modelica parameter elements (SysPhS profile)
           map_element "ModelicaParameter", to: :modelica_parameter

data/lib/xmi/sparx/primitive_type.rb

@@ -9,6 +9,7 @@ module Xmi
 
         xml do
           root "primitivetypes"
+          namespace ::Xmi::Namespace::Omg::Xmi
 
           map_element "packagedElement", to: :packaged_element,
                                          value_map: VALUE_MAP

data/lib/xmi/uml/association.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require_relative "packaged_element"
+
+module Xmi
+  module Uml
+    # UML `<packagedElement xmi:type="uml:Association">`. Binary
+    # link between two types, carrying ownedEnd / memberEnd children.
+    class Association < PackagedElement
+    end
+  end
+end

data/lib/xmi/uml/association_class.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require_relative "packaged_element"
+
+module Xmi
+  module Uml
+    # 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
+    # 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 AssociationClass < PackagedElement
+    end
+  end
+end

data/lib/xmi/uml/association_generalization.rb

@@ -2,18 +2,11 @@
 
 module Xmi
   module Uml
-    class AssociationGeneralization < Lutaml::Model::Serializable
-      skip_reference_registration
-      attribute :type, ::Xmi::Type::XmiType
-      attribute :id, ::Xmi::Type::XmiId
+    class AssociationGeneralization < Base
       attribute :general, :string
 
       xml do
         root "generalization"
-        namespace ::Xmi::Namespace::Omg::Uml
-
-        map_attribute "type", to: :type
-        map_attribute "id", to: :id
         map_attribute "general", to: :general
       end
     end

data/lib/xmi/uml/base.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Xmi
+  module Uml
+    # Common base for concrete UML element classes.
+    #
+    # Each concrete UML class redeclares the same `xmi:type` discriminator,
+    # `xmi:id`, and UML namespace boilerplate. Inheriting from `Base`
+    # removes that duplication — subclasses declare only their unique
+    # attributes and `root` element name.
+    #
+    # Verified via spike: lutaml-model inherits attribute declarations,
+    # namespace, and map_attribute lines from the parent's `xml do` block.
+    # Subclasses override `root` and add their own attributes/mappings.
+    #
+    # Classes that don't fit this pattern (reference holders like
+    # AnnotatedElement/MemberEnd/Type, or UmlDi-namespaced elements like
+    # Bounds/Waypoint/Diagram) stay direct from Serializable.
+    class Base < Lutaml::Model::Serializable
+      skip_reference_registration
+      attribute :type, ::Xmi::Type::XmiType
+      attribute :id, ::Xmi::Type::XmiId
+
+      xml do
+        namespace ::Xmi::Namespace::Omg::Uml
+
+        map_attribute "type", to: :type
+        map_attribute "id", to: :id
+      end
+    end
+  end
+end

data/lib/xmi/uml/bounds.rb

@@ -13,7 +13,7 @@ module Xmi
 
       xml do
         root "bounds"
-        namespace ::Xmi::Namespace::Omg::Uml
+        namespace ::Xmi::Namespace::Omg::UmlDi
 
         map_attribute "type", to: :type
         map_attribute "id", to: :id
@@ -23,22 +23,5 @@ module Xmi
         map_attribute "width", to: :width
       end
     end
-
-    class Waypoint < Lutaml::Model::Serializable
-      attribute :type, ::Xmi::Type::XmiType
-      attribute :id, ::Xmi::Type::XmiId
-      attribute :x, :integer
-      attribute :y, :integer
-
-      xml do
-        root "waypoint"
-        namespace ::Xmi::Namespace::Omg::Uml
-
-        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/data_type.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require_relative "packaged_element"
+
+module Xmi
+  module Uml
+    # UML `<packagedElement xmi:type="uml:DataType">`. Classifier
+    # for type definitions (e.g. record shapes).
+    class DataType < PackagedElement
+    end
+  end
+end

data/lib/xmi/uml/default_value.rb

@@ -1,45 +1,18 @@
 # frozen_string_literal: true
 
+require_relative "value_specification"
+
 module Xmi
   module Uml
-    class DefaultValue < Lutaml::Model::Serializable
-      skip_reference_registration
-      attribute :type, ::Xmi::Type::XmiType
-      attribute :id, ::Xmi::Type::XmiId
+    # Default value wrapper. Semantically a ValueSpecification
+    # (UML 2.5 §9.8) — kept as a concrete subclass for backwards
+    # compatibility with code that constructs DefaultValue directly
+    # (e.g. the lutaml/ea transformer).
+    class DefaultValue < ValueSpecification
       attribute :value, :string
 
       xml do
         root "defaultValue"
-        namespace ::Xmi::Namespace::Omg::Uml
-
-        map_attribute "type", to: :type
-        map_attribute "id", to: :id
-        map_attribute "value", to: :value
-      end
-    end
-
-    class UpperValue < DefaultValue
-      skip_reference_registration
-
-      xml do
-        root "upperValue"
-        namespace ::Xmi::Namespace::Omg::Uml
-
-        map_attribute "type", to: :type
-        map_attribute "id", to: :id
-        map_attribute "value", to: :value
-      end
-    end
-
-    class LowerValue < DefaultValue
-      skip_reference_registration
-
-      xml do
-        root "lowerValue"
-        namespace ::Xmi::Namespace::Omg::Uml
-
-        map_attribute "type", to: :type
-        map_attribute "id", to: :id
         map_attribute "value", to: :value
       end
     end

data/lib/xmi/uml/dependency.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require_relative "packaged_element"
+
+module Xmi
+  module Uml
+    # 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
+    # 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 Dependency < PackagedElement
+    end
+  end
+end

data/lib/xmi/uml/enumeration.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require_relative "packaged_element"
+
+module Xmi
+  module Uml
+    # UML `<packagedElement xmi:type="uml:Enumeration">`. Named
+    # set of enumeration literals.
+    class Enumeration < PackagedElement
+    end
+  end
+end

data/lib/xmi/uml/extension.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require_relative "packaged_element"
+
+module Xmi
+  module Uml
+    # UML `<packagedElement xmi:type="uml:Extension">`. An extension
+    # 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
+    # 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 Extension < PackagedElement
+    end
+  end
+end

data/lib/xmi/uml/imported_package.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+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
+  end
+end

data/lib/xmi/uml/instance_specification.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require_relative "packaged_element"
+
+module Xmi
+  module Uml
+    # UML `<packagedElement xmi:type="uml:InstanceSpecification">`.
+    # A named instance of a classifier, carrying slot children that
+    # hold the instance's values for each defining feature.
+    class InstanceSpecification < PackagedElement
+    end
+  end
+end

data/lib/xmi/uml/interface.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require_relative "packaged_element"
+
+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,13 @@
+# frozen_string_literal: true
+
+require_relative "default_value"
+
+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