xmi 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f0cb0851f52b18efcab9a97ee6787a82799446b120ba911020b782e34303104
-  data.tar.gz: 4c2b976f39d3c270aa4cddbdcb4ef4c27e58a53cede30b864e48e3972dcaf368
+  metadata.gz: 3d7aab70974d7d4b208cb997049d1c03f8a2ec6680fbf3315ca8cf3f034ef90c
+  data.tar.gz: 5e27cde7e482acbf00591f6216161847f9e73dacaf3885c794acd6d982fe8fef
 SHA512:
-  metadata.gz: 6bd6dd8e063b532e04316afc0a95bc7985d7505a7f94e5c2554450885e86b45a34f58f206dfeb1bff1b4962bfc6032fd02deb074fda7133aaa57527b65d4c24a
-  data.tar.gz: 5d9a87db0164d03eae68b64de929c535e31c49c702f7c23abe73566feba8f9ca5e3457a81fc0721ee3b0200fee65aea2ad3192a97f935a3b24d0c19064911aaf
+  metadata.gz: 1dbec019dc36b1a0e174fe0712708b8f1e3c11bdbed28e5abd8812d62c9429c0b5d1673319b815b22c6050dc4e5eaa059c7cb595f545ccb04fe5d47bc6879508
+  data.tar.gz: '094a8476d95e174ef9889865e654435de13924efa497cd225247d50d7d245f13085e67dadc2a468d72ad5120b56ea9228b6b960cf8e93d6e6361a4c7482a2772'

data/.gitignore

@@ -12,3 +12,4 @@
 .ruby-version
 .vscode
 Gemfile.lock
+.DS_Store

data/.rubocop.yml

@@ -1,7 +1,7 @@
 AllCops:
   TargetRubyVersion: 3.0
   Exclude:
-    - "lib/xmi/uml13/**/*.rb"
+    - "references/codes/**/*.rb"
     - "vendor/bundle/**/*"
 
 Style/StringLiterals:

data/README.adoc

@@ -37,7 +37,7 @@ To convert XMI file into Ruby objects, run:
 ----
 xml = "path/to/your/file.xmi"
 xml_content = File.read(xml)
-xmi_root_model = Xmi::Sparx::SparxRoot2013.from_xml(xml_content)
+xmi_root_model = Xmi::Sparx::SparxRoot.parse_xml(xml_content)
 ----
 
 This method takes the path to an XMI file and generate the Ruby objects.
@@ -52,12 +52,12 @@ Xmi::EaRoot.load_extension("path/to/your/extension.xml")
 
 xml = "path/to/your/file.xmi"
 xml_content = File.read(xml)
-xmi_root_model = Xmi::Sparx::SparxRoot2013.from_xml(xml_content)
+xmi_root_model = Xmi::Sparx::SparxRoot.parse_xml(xml_content)
 ----
 
 `Xmi::EaRoot.load_extension` takes the path to an XML file and generate the
 Ruby classes and modules defined in XML file dynamically.
-Then, you can generate Ruby objects by `Xmi::Sparx::SparxRoot2013.from_xml`.
+Then, you can generate Ruby objects by `Xmi::Sparx::SparxRoot.parse_xml`.
 
 === Output Classes and Modules Generated from Extension into Ruby Files
 

data/lib/xmi/ea_root.rb

@@ -62,10 +62,8 @@ module Xmi
       def update_mappings(module_name)
         new_klasses = all_new_klasses(module_name)
         map_elements = construct_shale_xml_mappings(new_klasses, module_name)
-        sparx_roots.each do |sparx_root|
-          update_shale_attributes(new_klasses, sparx_root, module_name)
-          update_shale_xml_mappings(map_elements, sparx_root)
-        end
+        update_shale_attributes(new_klasses, Xmi::Sparx::SparxRoot, module_name)
+        update_shale_xml_mappings(map_elements, Xmi::Sparx::SparxRoot)
       end
 
       def construct_shale_xml_mappings(new_klasses, module_name) # rubocop:disable Metrics/MethodLength
@@ -109,10 +107,6 @@ module Xmi
         sparx_root.class_eval(&new_mapping)
       end
 
-      def sparx_roots
-        [Xmi::Sparx::SparxRoot, Xmi::Sparx::SparxRoot2013]
-      end
-
       def all_new_klasses(module_name)
         Xmi::EaRoot.const_get(module_name).constants.select do |c|
           Xmi::EaRoot.const_get(module_name).const_get(c).is_a? Class

data/lib/xmi/root.rb

@@ -23,28 +23,6 @@ module Xmi
     include RootAttributes
     attribute :model, Uml::UmlModel
 
-    xml do
-      root "XMI"
-      namespace "http://www.omg.org/spec/XMI/20131001", "xmi"
-
-      map_attribute "id", to: :id
-      map_attribute "label", to: :label
-      map_attribute "uuid", to: :uuid
-      map_attribute "href", to: :href, namespace: nil, prefix: nil
-      map_attribute "idref", to: :idref
-      map_attribute "type", to: :type
-
-      map_element "Documentation", to: :documentation
-      map_element "Model", to: :model,
-                           namespace: "http://www.omg.org/spec/UML/20161101",
-                           prefix: "uml"
-    end
-  end
-
-  class Root2013 < Shale::Mapper
-    include RootAttributes
-    attribute :model, Uml::UmlModel2013
-
     xml do
       root "XMI"
       namespace "http://www.omg.org/spec/XMI/20131001", "xmi"

data/lib/xmi/sparx.rb

@@ -694,31 +694,9 @@ module Xmi
       end
     end
 
-    class SparxPrimitiveTypes2013 < Shale::Mapper
-      attribute :packaged_element, Uml::PackagedElement2013, collection: true
-
-      xml do
-        root "primitivetypes"
-
-        map_element "packagedElement", to: :packaged_element
-      end
-    end
-
     class SparxProfiles < Shale::Mapper
       attribute :profile, Uml::Profile, collection: true
 
-      xml do
-        root "profiles"
-
-        map_element "Profile", to: :profile,
-                               namespace: "http://www.omg.org/spec/UML/20161101",
-                               prefix: "uml"
-      end
-    end
-
-    class SparxProfiles2013 < Shale::Mapper
-      attribute :profile, Uml::Profile2013, collection: true
-
       xml do
         root "profiles"
 
@@ -843,7 +821,7 @@ module Xmi
           attribute :extender_id, Shale::Type::String
           attribute :elements, SparxElements
           attribute :connectors, SparxConnectors
-          attribute :primitive_types, SparxPrimitiveTypes2013
+          attribute :primitive_types, SparxPrimitiveTypes
           attribute :diagrams, SparxDiagrams
           attribute :ea_stub, SparxEAStub, collection: true
         end
@@ -875,31 +853,6 @@ module Xmi
       end
     end
 
-    class SparxExtension2013 < Shale::Mapper
-      include SparxExtensionAttributes
-      attribute :profiles, SparxProfiles2013
-
-      xml do
-        root "Extension"
-
-        map_attribute "id", to: :id, prefix: "xmi", namespace: "http://www.omg.org/spec/XMI/20131001"
-        map_attribute "label", to: :label, prefix: "xmi", namespace: "http://www.omg.org/spec/XMI/20131001"
-        map_attribute "uuid", to: :uuid, prefix: "xmi", namespace: "http://www.omg.org/spec/XMI/20131001"
-        map_attribute "href", to: :href
-        map_attribute "idref", to: :idref, prefix: "xmi", namespace: "http://www.omg.org/spec/XMI/20131001"
-        map_attribute "type", to: :type, prefix: "xmi", namespace: "http://www.omg.org/spec/XMI/20131001"
-        map_attribute "extender", to: :extender
-        map_attribute "extenderID", to: :extender_id
-
-        map_element "elements", to: :elements
-        map_element "connectors", to: :connectors
-        map_element "primitivetypes", to: :primitive_types
-        map_element "profiles", to: :profiles
-        map_element "diagrams", to: :diagrams
-        map_element "EAStub", to: :ea_stub
-      end
-    end
-
     class SparxSysPhS < Shale::Mapper
       attribute :base_package, Shale::Type::String
       attribute :name, Shale::Type::String
@@ -991,72 +944,44 @@ module Xmi
       include SparxRootAttributes
       attribute :extension, SparxExtension
 
-      @@default_mapping = <<-MAP # rubocop:disable Style/ClassVars
-      root "XMI"
-      namespace "http://www.omg.org/spec/XMI/20131001", "xmi"
+      class << self
+        def parse_xml(xml_content)
+          xml_content = fix_encoding(xml_content)
+          xml_content = replace_xmlns(xml_content)
+          xml_content = replace_relative_ns(xml_content)
 
-      map_attribute "id", to: :id
-      map_attribute "label", to: :label
-      map_attribute "uuid", to: :uuid
-      map_attribute "href", to: :href
-      map_attribute "idref", to: :idref
-      map_attribute "type", to: :type
+          from_xml(xml_content)
+        end
 
-      map_element "Extension", to: :extension
-      map_element "publicationDate", to: :publication_date,
-                                     namespace: "http://www.sparxsystems.com/profiles/thecustomprofile/1.0",
-                                     prefix: "thecustomprofile"
-      map_element "edition", to: :edition,
-                             namespace: "http://www.sparxsystems.com/profiles/thecustomprofile/1.0",
-                             prefix: "thecustomprofile"
-      map_element "number", to: :number,
-                            namespace: "http://www.sparxsystems.com/profiles/thecustomprofile/1.0",
-                            prefix: "thecustomprofile"
-      map_element "yearVersion", to: :year_version,
-                                 namespace: "http://www.sparxsystems.com/profiles/thecustomprofile/1.0",
-                                 prefix: "thecustomprofile"
-      map_element "ModelicaParameter", to: :modelica_parameter,
-                                       namespace: "http://www.sparxsystems.com/profiles/SysPhS/1.0",
-                                       prefix: "SysPhS"
-      map_element "import", to: :eauml_import,
-                            namespace: "http://www.sparxsystems.com/profiles/EAUML/1.0",
-                            prefix: "EAUML"
-      map_element "ApplicationSchema", to: :gml_application_schema,
-                            namespace: "http://www.sparxsystems.com/profiles/GML/1.0",
-                            prefix: "GML"
-      map_element "CodeList", to: :gml_code_list,
-                            namespace: "http://www.sparxsystems.com/profiles/GML/1.0",
-                            prefix: "GML"
-      map_element "DataType", to: :gml_data_type,
-                            namespace: "http://www.sparxsystems.com/profiles/GML/1.0",
-                            prefix: "GML"
-      map_element "Union", to: :gml_union,
-                            namespace: "http://www.sparxsystems.com/profiles/GML/1.0",
-                            prefix: "GML"
-      map_element "Enumeration", to: :gml_enumeration,
-                            namespace: "http://www.sparxsystems.com/profiles/GML/1.0",
-                            prefix: "GML"
-      map_element "Type", to: :gml_type,
-                            namespace: "http://www.sparxsystems.com/profiles/GML/1.0",
-                            prefix: "GML"
-      map_element "FeatureType", to: :gml_feature_type,
-                            namespace: "http://www.sparxsystems.com/profiles/GML/1.0",
-                            prefix: "GML"
-      map_element "property", to: :gml_property,
-                            namespace: "http://www.sparxsystems.com/profiles/GML/1.0",
-                            prefix: "GML"
-      MAP
+        private
 
-      @@mapping ||= @@default_mapping # rubocop:disable Style/ClassVars
+        def fix_encoding(xml_content)
+          return xml_content if xml_content.valid_encoding?
 
-      xml do
-        eval Xmi::Sparx::SparxRoot.class_variable_get("@@mapping") # rubocop:disable Security/Eval
-      end
-    end
+          xml_content
+            .encode("UTF-16be", invalid: :replace, replace: "?")
+            .encode("UTF-8")
+        end
 
-    class SparxRoot2013 < Root2013
-      include SparxRootAttributes
-      attribute :extension, SparxExtension2013
+        def replace_xmlns(xml_content)
+          xml_content
+            .gsub(%r{xmlns:xmi="http://www.omg.org/spec/XMI/\d{8}},
+                  "xmlns:xmi=\"http://www.omg.org/spec/XMI/20131001")
+            .gsub(%r{xmlns:uml="http://www.omg.org/spec/UML/\d{8}},
+                  "xmlns:uml=\"http://www.omg.org/spec/UML/20131001")
+            .gsub(%r{xmlns:umldc="http://www.omg.org/spec/UML/\d{8}},
+                  "xmlns:umldc=\"http://www.omg.org/spec/UML/20131001")
+            .gsub(%r{xmlns:umldi="http://www.omg.org/spec/UML/\d{8}},
+                  "xmlns:umldi=\"http://www.omg.org/spec/UML/20131001")
+        end
+
+        def replace_relative_ns(xml_content)
+          xml_content.gsub(
+            /<(.*)xmlns="(.*)" targetNamespace="(.*)"(.*)>/,
+            '<\1xmlns="\3" targetNamespace="\3"\4>'
+          )
+        end
+      end
 
       @@default_mapping = <<-MAP # rubocop:disable Style/ClassVars
       root "XMI"
@@ -1117,7 +1042,7 @@ module Xmi
       @@mapping ||= @@default_mapping # rubocop:disable Style/ClassVars
 
       xml do
-        eval Xmi::Sparx::SparxRoot2013.class_variable_get("@@mapping") # rubocop:disable Security/Eval
+        eval Xmi::Sparx::SparxRoot.class_variable_get("@@mapping") # rubocop:disable Security/Eval
       end
     end
   end

data/lib/xmi/uml.rb

@@ -53,24 +53,6 @@ module Xmi
     class OwnedEnd < Shale::Mapper
       include OwnedEndAttributes
 
-      xml do
-        root "ownedEnd"
-
-        map_attribute "type", to: :type, namespace: "http://www.omg.org/spec/XMI/20161101", prefix: "xmi"
-        map_attribute "id", to: :id, namespace: "http://www.omg.org/spec/XMI/20161101", prefix: "xmi"
-        map_attribute "association", to: :association
-        map_attribute "name", to: :name
-        map_attribute "memberEnd", to: :member_end
-        map_attribute "type", to: :uml_type
-        map_attribute "lower", to: :lower
-        map_attribute "upper", to: :upper
-        map_attribute "isComposite", to: :is_composite
-      end
-    end
-
-    class OwnedEnd2013 < Shale::Mapper
-      include OwnedEndAttributes
-
       xml do
         root "ownedEnd"
 
@@ -155,24 +137,6 @@ module Xmi
     class OwnedAttribute < Shale::Mapper
       include OwnedAttributeAttributes
 
-      xml do
-        root "ownedAttribute"
-
-        map_attribute "type", to: :type, namespace: "http://www.omg.org/spec/XMI/20161101", prefix: "xmi"
-        map_attribute "id", to: :id, namespace: "http://www.omg.org/spec/XMI/20161101", prefix: "xmi"
-        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
-
-    class OwnedAttribute2013 < Shale::Mapper
-      include OwnedAttributeAttributes
-
       xml do
         root "ownedAttribute"
 
@@ -272,25 +236,6 @@ module Xmi
     class OwnedComment < Shale::Mapper
       include OwnedCommentAttributes
 
-      xml do
-        root "ownedComment"
-
-        map_attribute "type", to: :type, namespace: "http://www.omg.org/spec/XMI/20131001", prefix: "xmi"
-        map_attribute "type", to: :type, namespace: "http://www.omg.org/spec/XMI/20161101", prefix: "xmi"
-        map_attribute "id", to: :id, namespace: "http://www.omg.org/spec/XMI/20131001", prefix: "xmi"
-        map_attribute "id", to: :id, namespace: "http://www.omg.org/spec/XMI/20161101", prefix: "xmi"
-        map_attribute "name", to: :name
-        map_attribute "body", to: :body_attribute
-        map_attribute "annotatedElement", to: :annotated_attribute
-
-        map_element "annotatedElement", to: :annotated_element, prefix: nil, namespace: nil
-        map_element "body", to: :body_element
-      end
-    end
-
-    class OwnedComment2013 < Shale::Mapper
-      include OwnedCommentAttributes
-
       xml do
         root "ownedComment"
 
@@ -320,18 +265,6 @@ module Xmi
     class AssociationGeneralization < Shale::Mapper
       include AssociationGeneralizationAttributes
 
-      xml do
-        root "generalization"
-
-        map_attribute "type", to: :type, namespace: "http://www.omg.org/spec/XMI/20161101", prefix: "xmi"
-        map_attribute "id", to: :id, namespace: "http://www.omg.org/spec/XMI/20161101", prefix: "xmi"
-        map_attribute "general", to: :general
-      end
-    end
-
-    class AssociationGeneralization2013 < Shale::Mapper
-      include AssociationGeneralizationAttributes
-
       xml do
         root "generalization"
 
@@ -367,37 +300,6 @@ module Xmi
       attribute :owned_comment, OwnedComment, collection: true
       attribute :generalization, AssociationGeneralization, collection: true
 
-      xml do
-        root "packagedElement"
-
-        map_attribute "type", to: :type, namespace: "http://www.omg.org/spec/XMI/20161101", prefix: "xmi"
-        map_attribute "id", to: :id, namespace: "http://www.omg.org/spec/XMI/20161101", prefix: "xmi"
-        map_attribute "name", to: :name
-        map_attribute "memberEnd", to: :member_end
-
-        # EA specific
-        map_attribute "supplier", to: :supplier
-        map_attribute "client", to: :client
-
-        map_element "generalization", to: :generalization
-        map_element "ownedComment", to: :owned_comment
-        map_element "ownedEnd", to: :owned_end
-        map_element "ownedLiteral", to: :owned_literal
-        map_element "ownedAttribute", to: :owned_attribute
-        map_element "ownedOperation", to: :owned_operation
-        map_element "packagedElement", to: :packaged_element
-        map_element "memberEnd", to: :member_ends
-      end
-    end
-
-    class PackagedElement2013 < Shale::Mapper
-      include PackagedElementAttributes
-      attribute :packaged_element, PackagedElement2013, collection: true
-      attribute :owned_end, OwnedEnd2013, collection: true
-      attribute :owned_attribute, OwnedAttribute2013, collection: true
-      attribute :owned_comment, OwnedComment2013, collection: true
-      attribute :generalization, AssociationGeneralization2013, collection: true
-
       xml do
         root "packagedElement"
 
@@ -499,22 +401,6 @@ module Xmi
     class Diagram < Shale::Mapper
       include DiagramAttributes
 
-      xml do
-        root "Diagram"
-        namespace "http://www.omg.org/spec/UML/20161101/UMLDI", "umldi"
-
-        map_attribute "type", to: :type, namespace: "http://www.omg.org/spec/XMI/20131001", prefix: "xmi"
-        map_attribute "id", to: :id, namespace: "http://www.omg.org/spec/XMI/20131001", prefix: "xmi"
-        map_attribute "isFrame", to: :is_frame
-        map_attribute "modelElement", to: :model_element
-
-        map_element "ownedElement", to: :owned_element, namespace: nil, prefix: nil
-      end
-    end
-
-    class Diagram2013 < Shale::Mapper
-      include DiagramAttributes
-
       xml do
         root "Diagram"
         namespace "http://www.omg.org/spec/UML/20131001/UMLDI", "umldi"
@@ -577,19 +463,6 @@ module Xmi
     class PackageImport < Shale::Mapper
       include PackageImportAttributes
 
-      xml do
-        root "packageImport"
-
-        map_attribute "id", to: :id, namespace: "http://www.omg.org/spec/XMI/20131001", prefix: "xmi"
-        map_attribute "id", to: :id, namespace: "http://www.omg.org/spec/XMI/20161101", prefix: "xmi"
-
-        map_element "importedPackage", to: :imported_package, namespace: nil, prefix: nil
-      end
-    end
-
-    class PackageImport2013 < Shale::Mapper
-      include PackageImportAttributes
-
       xml do
         root "packageImport"
 
@@ -612,40 +485,20 @@ module Xmi
 
     class UmlModel < Shale::Mapper
       include UmlModelAttributes
-      attribute :packaged_element, PackagedElement2013, collection: true
-      attribute :package_import, PackageImport2013, collection: true
+      attribute :packaged_element, PackagedElement, collection: true
+      attribute :package_import, PackageImport, collection: true
       attribute :diagram, Diagram
 
       xml do
         root "Model"
-        namespace "http://www.omg.org/spec/UML/20161101", "uml"
+        namespace "http://www.omg.org/spec/UML/20131001", "uml"
 
         map_attribute "type", to: :type, namespace: "http://www.omg.org/spec/XMI/20131001", prefix: "xmi"
         map_attribute "name", to: :name
 
         map_element "packageImport", to: :package_import, namespace: nil, prefix: nil
         map_element "packagedElement", to: :packaged_element, namespace: nil, prefix: nil
-        map_element "Diagram", to: :diagram, namespace: "http://www.omg.org/spec/UML/20161101/UMLDI", prefix: "umldi"
-        map_element "profileApplication", to: :profile_application, namespace: nil, prefix: nil
-      end
-    end
-
-    class UmlModel2013 < Shale::Mapper
-      include UmlModelAttributes
-      attribute :packaged_element, PackagedElement2013, collection: true
-      attribute :package_import, PackageImport2013, collection: true
-      attribute :diagram, Diagram2013
-
-      xml do
-        root "Model"
-        namespace "http://www.omg.org/spec/UML/20161101", "uml"
-
-        map_attribute "type", to: :type, namespace: "http://www.omg.org/spec/XMI/20131001", prefix: "xmi"
-        map_attribute "name", to: :name
-
-        map_element "packageImport", to: :package_import, namespace: nil, prefix: nil
-        map_element "packagedElement", to: :packaged_element, namespace: nil, prefix: nil
-        map_element "Diagram", to: :diagram, namespace: "http://www.omg.org/spec/UML/20161101/UMLDI", prefix: "umldi"
+        map_element "Diagram", to: :diagram, namespace: "http://www.omg.org/spec/UML/20131001/UMLDI", prefix: "umldi"
         map_element "profileApplication", to: :profile_application, namespace: nil, prefix: nil
       end
     end
@@ -672,24 +525,6 @@ module Xmi
       include ProfileAttributes
       attribute :owned_comment, OwnedComment, collection: true
 
-      xml do
-        root "Profile"
-
-        map_attribute "id", to: :id, namespace: "http://www.omg.org/spec/XMI/20161101", prefix: "xmi"
-        map_attribute "name", to: :name
-        map_attribute "metamodelReference", to: :metamodel_reference
-        map_attribute "nsPrefix", to: :ns_prefix
-
-        map_element "ownedComment", to: :owned_comment
-        map_element "packageImport", to: :package_import, namespace: nil, prefix: nil
-        map_element "packagedElement", to: :packaged_element
-      end
-    end
-
-    class Profile2013 < Shale::Mapper
-      include ProfileAttributes
-      attribute :owned_comment, OwnedComment2013, collection: true
-
       xml do
         root "Profile"
 

data/lib/xmi/version.rb

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

data/lib/xmi.rb

@@ -33,4 +33,3 @@ require_relative "xmi/ea_root"
 require_relative "xmi/uml"
 require_relative "xmi/root"
 require_relative "xmi/sparx"
-# require_relative "xmi/uml13"