xmi 0.5.10 → 0.5.12

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

@@ -16,7 +16,7 @@ module Xmi
 
       xml do
         root "ownedElement"
-        namespace ::Xmi::Namespace::Omg::Uml
+        namespace ::Xmi::Namespace::Omg::UmlDi
 
         map_attribute "type", to: :type
         map_attribute "id", to: :id

data/lib/xmi/uml/owned_end.rb

@@ -2,33 +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 :type_attr, :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 "type", to: :type_attr
-        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,12 @@
+# frozen_string_literal: true
+
+require_relative "packaged_element"
+
+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

@@ -1,19 +1,9 @@
 # frozen_string_literal: true
 
+require_relative "imported_package"
+
 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,12 @@
+# frozen_string_literal: true
+
+require_relative "packaged_element"
+
+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

@@ -1,24 +1,9 @@
 # frozen_string_literal: true
 
+require_relative "profile_attributes"
+
 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

data/lib/xmi/uml/profile_application.rb

@@ -1,21 +1,9 @@
 # frozen_string_literal: true
 
+require_relative "profile_application_applied_profile"
+
 module Xmi
   module Uml
-    class ProfileApplicationAppliedProfile < Lutaml::Model::Serializable
-      skip_reference_registration
-      attribute :type, ::Xmi::Type::XmiType
-      attribute :href, :string
-
-      xml do
-        root "appliedProfile"
-        namespace ::Xmi::Namespace::Omg::Uml
-
-        map_attribute "type", to: :type
-        map_attribute "href", to: :href
-      end
-    end
-
     class ProfileApplication < Lutaml::Model::Serializable
       attribute :type, ::Xmi::Type::XmiType
       attribute :id, ::Xmi::Type::XmiId

data/lib/xmi/uml/profile_application_applied_profile.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Xmi
+  module Uml
+    # UML `<appliedProfile>` element — href reference to a Profile
+    # that has been applied to a Package. Child of `<profileApplication>`.
+    class ProfileApplicationAppliedProfile < Lutaml::Model::Serializable
+      skip_reference_registration
+      attribute :type, ::Xmi::Type::XmiType
+      attribute :href, :string
+
+      xml do
+        root "appliedProfile"
+        namespace ::Xmi::Namespace::Omg::Uml
+
+        map_attribute "type", to: :type
+        map_attribute "href", to: :href
+      end
+    end
+  end
+end

data/lib/xmi/uml/profile_attributes.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+# Shared attribute declarations for Profile-like classes.
+# Mixed into Profile via `include ProfileAttributes`.
+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 :ns_prefix, :string
+          attribute :metamodel_reference, :string
+        end
+      end
+    end
+  end
+end

data/lib/xmi/uml/realization.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require_relative "packaged_element"
+
+module Xmi
+  module Uml
+    # UML `<packagedElement xmi:type="uml:Realization">`. Generic
+    # realization relationship. Note Sparx EA collapses strict
+    # `<interfaceRealization>` into this generic form; see
+    # InterfaceRealization for the strict-OMG form.
+    class Realization < PackagedElement
+    end
+  end
+end

data/lib/xmi/uml/signal.rb

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

data/lib/xmi/uml/slot.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Xmi
+  module Uml
+    class Slot < Base
+      attribute :defining_feature, :string
+      attribute :value, ValueSpecification, collection: true, polymorphic: true
+
+      xml do
+        root "slot"
+        map_attribute "definingFeature", to: :defining_feature
+
+        map_element "value", to: :value,
+                             polymorphic: VALUE_SPECIFICATION_POLYMORPHIC_MAP
+      end
+    end
+  end
+end

data/lib/xmi/uml/specification.rb

@@ -2,19 +2,14 @@
 
 module Xmi
   module Uml
-    class Specification < Lutaml::Model::Serializable
-      skip_reference_registration
-      attribute :id, ::Xmi::Type::XmiId
-      attribute :type, ::Xmi::Type::XmiType
+    class Specification < Base
       attribute :language, :string
+      attribute :content, :string
 
       xml do
         root "specification"
-        namespace ::Xmi::Namespace::Omg::Uml
-
-        map_attribute "id", to: :id
-        map_attribute "type", to: :type
         map_attribute "language", to: :language
+        map_content to: :content
       end
     end
   end

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,29 +1,25 @@
 # 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
-        map_element "Diagram", to: :diagram
+                                       polymorphic: PACKAGED_ELEMENT_POLYMORPHIC_MAP
+        map_element "Diagram", to: :diagram, form: :qualified
         map_element "profileApplication", to: :profile_application,
                                           value_map: VALUE_MAP
       end

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