xmi 0.5.2 → 0.5.4

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

@@ -6,17 +6,12 @@ module Xmi
       # Base XML mapping class for Sparx EA XMI documents.
       #
       # This reusable mapping class encapsulates all the XML element → attribute
-      # mappings for SparxRoot, eliminating the previous eval hack.
+      # mappings for SparxRoot.
       #
       # @example Use in a model class
       #   class SparxRoot < Root
       #     xml SparxMappings::BaseMapping
       #   end
-      #
-      # @example Extend with additional mappings
-      #   class ExtendedRoot < Root
-      #     xml SparxMappings::GmlMapping
-      #   end
       class BaseMapping < Lutaml::Xml::Mapping
         xml do
           # Set the default namespace for element name resolution
@@ -35,6 +30,8 @@ module Xmi
             ::Xmi::Namespace::Sparx::CityGml,
           ]
 
+          VM = ::Xmi::VALUE_MAP
+
           # Extension element containing Sparx EA-specific metadata
           map_element "Extension", to: :extension
 
@@ -42,139 +39,18 @@ module Xmi
           map_element "ModelicaParameter", to: :modelica_parameter
 
           # UML import elements (EAUML profile)
-          map_element "import", to: :eauml_import,
-                                value_map: {
-                                  from: {
-                                    nil: :empty,
-                                    empty: :empty,
-                                    omitted: :empty,
-                                  },
-                                  to: {
-                                    nil: :empty,
-                                    empty: :empty,
-                                    omitted: :empty,
-                                  },
-                                }
+          map_element "import", to: :eauml_import, value_map: VM
 
-          # GML ApplicationSchema elements
+          # GML elements
           map_element "ApplicationSchema", to: :gml_application_schema,
-                                           value_map: {
-                                             from: {
-                                               nil: :empty,
-                                               empty: :empty,
-                                               omitted: :empty,
-                                             },
-                                             to: {
-                                               nil: :empty,
-                                               empty: :empty,
-                                               omitted: :empty,
-                                             },
-                                           }
-
-          # GML CodeList elements
-          map_element "CodeList", to: :gml_code_list,
-                                  value_map: {
-                                    from: {
-                                      nil: :empty,
-                                      empty: :empty,
-                                      omitted: :empty,
-                                    },
-                                    to: {
-                                      nil: :empty,
-                                      empty: :empty,
-                                      omitted: :empty,
-                                    },
-                                  }
-
-          # GML DataType elements
-          map_element "DataType", to: :gml_data_type,
-                                  value_map: {
-                                    from: {
-                                      nil: :empty,
-                                      empty: :empty,
-                                      omitted: :empty,
-                                    },
-                                    to: {
-                                      nil: :empty,
-                                      empty: :empty,
-                                      omitted: :empty,
-                                    },
-                                  }
-
-          # GML Union elements
-          map_element "Union", to: :gml_union,
-                               value_map: {
-                                 from: {
-                                   nil: :empty,
-                                   empty: :empty,
-                                   omitted: :empty,
-                                 },
-                                 to: {
-                                   nil: :empty,
-                                   empty: :empty,
-                                   omitted: :empty,
-                                 },
-                               }
-
-          # GML Enumeration elements
-          map_element "Enumeration", to: :gml_enumeration,
-                                     value_map: {
-                                       from: {
-                                         nil: :empty,
-                                         empty: :empty,
-                                         omitted: :empty,
-                                       },
-                                       to: {
-                                         nil: :empty,
-                                         empty: :empty,
-                                         omitted: :empty,
-                                       },
-                                     }
-
-          # GML Type elements
-          map_element "Type", to: :gml_type,
-                              value_map: {
-                                from: {
-                                  nil: :empty,
-                                  empty: :empty,
-                                  omitted: :empty,
-                                },
-                                to: {
-                                  nil: :empty,
-                                  empty: :empty,
-                                  omitted: :empty,
-                                },
-                              }
-
-          # GML FeatureType elements
-          map_element "FeatureType", to: :gml_feature_type,
-                                     value_map: {
-                                       from: {
-                                         nil: :empty,
-                                         empty: :empty,
-                                         omitted: :empty,
-                                       },
-                                       to: {
-                                         nil: :empty,
-                                         empty: :empty,
-                                         omitted: :empty,
-                                       },
-                                     }
-
-          # GML property elements
-          map_element "property", to: :gml_property,
-                                  value_map: {
-                                    from: {
-                                      nil: :empty,
-                                      empty: :empty,
-                                      omitted: :empty,
-                                    },
-                                    to: {
-                                      nil: :empty,
-                                      empty: :empty,
-                                      omitted: :empty,
-                                    },
-                                  }
+                                           value_map: VM
+          map_element "CodeList", to: :gml_code_list, value_map: VM
+          map_element "DataType", to: :gml_data_type, value_map: VM
+          map_element "Union", to: :gml_union, value_map: VM
+          map_element "Enumeration", to: :gml_enumeration, value_map: VM
+          map_element "Type", to: :gml_type, value_map: VM
+          map_element "FeatureType", to: :gml_feature_type, value_map: VM
+          map_element "property", to: :gml_property, value_map: VM
         end
       end
     end

data/lib/xmi/sparx/root.rb

@@ -22,18 +22,19 @@ module Xmi
       class << self
         # Parse XMI content into Ruby objects.
         #
-        # This method uses automatic version detection to handle different XMI
-        # namespace versions (e.g., XMI 20110701, 20131001, 20161101) and
-        # their corresponding UML versions.
+        # Uses the ParserPipeline for composable parsing steps:
+        # encoding fix → version detection → XML parsing → index building.
         #
         # @param xml_content [String] The raw XMI XML content
-        # @return [SparxRoot] The parsed Ruby object
+        # @return [SparxRoot] The parsed Ruby object with index built
         #
+        # @see Xmi::ParserPipeline
         # @see Xmi.parse
         def parse_xml(xml_content)
-          xml_content = fix_encoding(xml_content)
-          Xmi.init_versioning!
-          Xmi::VersionRegistry.parse_with_detected_version(xml_content, self)
+          ctx = ParserPipeline.run(
+            { xml: xml_content, root_class: self },
+          )
+          ctx[:root]
         end
 
         # Fix invalid UTF-8 encoding in the XML content.
@@ -55,6 +56,18 @@ module Xmi
 
       # Use the reusable BaseMapping class instead of eval hack
       xml SparxMappings::BaseMapping
+
+      # Build index for fast lookups
+      # @return [Sparx::Index]
+      def build_index
+        @index = Index.new(self)
+      end
+
+      # Access the index (builds on first access if needed)
+      # @return [Sparx::Index]
+      def index
+        @index || build_index
+      end
     end
   end
 end

data/lib/xmi/sparx.rb

@@ -19,5 +19,6 @@ module Xmi
     autoload :Extension, "xmi/sparx/extension"
     autoload :SparxRoot, "xmi/sparx/root"
     autoload :SparxMappings, "xmi/sparx/mappings"
+    autoload :Index, "xmi/sparx/index"
   end
 end

data/lib/xmi/uml/annotated_element.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Xmi
+  module Uml
+    class AnnotatedElement < Lutaml::Model::Serializable
+      attribute :idref, ::Xmi::Type::XmiIdRef
+
+      xml do
+        root "annotatedElement"
+        namespace ::Xmi::Namespace::Omg::Uml
+
+        map_attribute "idref", to: :idref
+      end
+    end
+  end
+end

data/lib/xmi/uml/association_generalization.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Xmi
+  module Uml
+    class AssociationGeneralization < Lutaml::Model::Serializable
+      attribute :type, ::Xmi::Type::XmiType
+      attribute :id, ::Xmi::Type::XmiId
+      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
+  end
+end

data/lib/xmi/uml/bounds.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Xmi
+  module Uml
+    class Bounds < Lutaml::Model::Serializable
+      attribute :type, ::Xmi::Type::XmiType
+      attribute :id, ::Xmi::Type::XmiId
+      attribute :x, :integer
+      attribute :y, :integer
+      attribute :height, :integer
+      attribute :width, :integer
+
+      xml do
+        root "bounds"
+        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
+        map_attribute "height", to: :height
+        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/default_value.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Xmi
+  module Uml
+    class DefaultValue < Lutaml::Model::Serializable
+      attribute :type, ::Xmi::Type::XmiType
+      attribute :id, ::Xmi::Type::XmiId
+      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
+      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
+      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
+  end
+end

data/lib/xmi/uml/diagram.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Xmi
+  module Uml
+    class Diagram < Lutaml::Model::Serializable
+      attribute :type, ::Xmi::Type::XmiType
+      attribute :id, ::Xmi::Type::XmiId
+      attribute :is_frame, :boolean
+      attribute :model_element, :string
+      attribute :owned_element, OwnedElement, collection: true
+
+      xml do
+        root "Diagram"
+        namespace ::Xmi::Namespace::Omg::UmlDi
+
+        map_attribute "type", to: :type
+        map_attribute "id", to: :id
+        map_attribute "isFrame", to: :is_frame
+        map_attribute "modelElement", to: :model_element
+
+        map_element "ownedElement", to: :owned_element, value_map: VALUE_MAP
+      end
+    end
+  end
+end

data/lib/xmi/uml/member_end.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Xmi
+  module Uml
+    class MemberEnd < Lutaml::Model::Serializable
+      attribute :idref, ::Xmi::Type::XmiIdRef
+
+      xml do
+        root "memberEnd"
+        namespace ::Xmi::Namespace::Omg::Uml
+
+        map_attribute "idref", to: :idref
+      end
+    end
+  end
+end

data/lib/xmi/uml/owned_attribute.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Xmi
+  module Uml
+    class OwnedAttribute < Lutaml::Model::Serializable
+      attribute :type, ::Xmi::Type::XmiType
+      attribute :id, ::Xmi::Type::XmiId
+      attribute :association, :string
+      attribute :name, :string
+      attribute :is_derived, :string
+      attribute :uml_type, Uml::Type
+      attribute :upper_value, UpperValue
+      attribute :lower_value, LowerValue
+
+      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 "isDerived", to: :is_derived
+
+        map_element "type", to: :uml_type
+        map_element "upperValue", to: :upper_value
+        map_element "lowerValue", to: :lower_value
+      end
+    end
+  end
+end

data/lib/xmi/uml/owned_comment.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Xmi
+  module Uml
+    class OwnedComment < Lutaml::Model::Serializable
+      attribute :type, ::Xmi::Type::XmiType
+      attribute :id, ::Xmi::Type::XmiId
+      attribute :name, :string
+      attribute :body_element, :string
+      attribute :body_attribute, :string
+      attribute :annotated_attribute, :string
+      attribute :annotated_element, AnnotatedElement
+
+      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
+
+        map_element "annotatedElement", to: :annotated_element
+        map_element "body", to: :body_element
+      end
+    end
+  end
+end

data/lib/xmi/uml/owned_element.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Xmi
+  module Uml
+    class OwnedElement < Lutaml::Model::Serializable
+      attribute :type, ::Xmi::Type::XmiType
+      attribute :id, ::Xmi::Type::XmiId
+      attribute :text, :string
+      attribute :model_element, :string
+      attribute :owned_element, OwnedElement, collection: true
+      attribute :bounds, Bounds, collection: true
+      attribute :source, :string
+      attribute :target, :string
+      attribute :waypoint, Waypoint
+
+      xml do
+        root "ownedElement"
+        namespace ::Xmi::Namespace::Omg::Uml
+
+        map_attribute "type", to: :type
+        map_attribute "id", to: :id
+        map_attribute "text", to: :text
+        map_attribute "modelElement", to: :model_element
+
+        map_element "ownedElement", to: :owned_element, value_map: VALUE_MAP
+        map_element "bounds", to: :bounds, value_map: VALUE_MAP
+        map_element "source", to: :source
+        map_element "target", to: :target
+        map_element "waypoint", to: :waypoint
+      end
+    end
+  end
+end

data/lib/xmi/uml/owned_end.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Xmi
+  module Uml
+    class OwnedEnd < Lutaml::Model::Serializable
+      attribute :type, ::Xmi::Type::XmiType
+      attribute :id, ::Xmi::Type::XmiId
+      attribute :association, :string
+      attribute :name, :string
+      attribute :type_attr, :string
+      attribute :uml_type, Uml::Type
+      attribute :member_end, :string
+      attribute :lower, :integer
+      attribute :upper, :integer
+      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 "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
+      end
+    end
+  end
+end

data/lib/xmi/uml/owned_literal.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Xmi
+  module Uml
+    class OwnedLiteral < Lutaml::Model::Serializable
+      attribute :type, ::Xmi::Type::XmiType
+      attribute :id, ::Xmi::Type::XmiId
+      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
+  end
+end

data/lib/xmi/uml/owned_operation.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Xmi
+  module Uml
+    class OwnedOperation < Lutaml::Model::Serializable
+      attribute :id, ::Xmi::Type::XmiId
+      attribute :name, :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_element "ownedParameter", to: :owned_parameter, value_map: VALUE_MAP
+        map_element "precondition", to: :precondition
+        map_element "type", to: :uml_type, value_map: VALUE_MAP
+      end
+    end
+  end
+end

data/lib/xmi/uml/owned_parameter.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Xmi
+  module Uml
+    class OwnedParameter < Lutaml::Model::Serializable
+      attribute :id, ::Xmi::Type::XmiId
+      attribute :name, :string
+      attribute :type, ::Xmi::Type::XmiType
+      attribute :direction, :string
+      attribute :upper_value, UpperValue
+      attribute :lower_value, LowerValue
+      attribute :default_value, DefaultValue
+
+      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_element "upperValue", to: :upper_value
+        map_element "lowerValue", to: :lower_value
+        map_element "defaultValue", to: :default_value
+      end
+    end
+  end
+end

data/lib/xmi/uml/package_import.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Xmi
+  module Uml
+    class ImportedPackage < Lutaml::Model::Serializable
+      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
+
+      xml do
+        root "packageImport"
+        namespace ::Xmi::Namespace::Omg::Uml
+
+        map_attribute "id", to: :id
+
+        map_element "importedPackage", to: :imported_package
+      end
+    end
+  end
+end