xmi 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa0a37c2b3b4d95e09706d9c2a3dee947622edd45342ed735c1fe346ef325929
-  data.tar.gz: f3ce4cdb7dd6dd3fdda0478013f3ce87d4de70f400ec45f0c3b3a5388aaa1e15
+  metadata.gz: cf6faff1b8093081d01e1a58aa0f226c3803855f8ff172759708e87afd046454
+  data.tar.gz: 14a1169f7ea7294d7b6e995bc631432ed222dd98785e5ecd928788135c095a0f
 SHA512:
-  metadata.gz: 243e5f497c1093cc90018d20b8a436239c8d535e4073aafc41d9af11a22c1f3eb06306854bbe0f59a74d4fbc0e036943bfa4a34c59a4ba8c046d5a595ee4301c
-  data.tar.gz: 27167737fd6433c5e3e927b1454754c4b85e5ffe7bc31fc719ae53e3cb0e0e7ca7899c1745e6e51f867803f35c28c254c909a509f398ea4379b1454d057dc322
+  metadata.gz: 89bef5249d1599e1b15a9b30b8a81a51b8a804aad1747705370ec17b21d70205b2680630ecda4308b85252fed01cbca548de2764c9bbef296fc951f29ebcfd6d
+  data.tar.gz: 72245cd81433e6d6942b7b7a3448d8008b5523524bc1dad0b8537fdceb57e8981a747e3e7f4e44d70c12514cf9869d9876425eafce0692d5a00f28d3de0ecb10

data/.gitignore

@@ -9,3 +9,6 @@
 
 # rspec failure tracking
 .rspec_status
+.ruby-version
+.vscode
+Gemfile.lock

data/README.adoc

@@ -42,20 +42,20 @@ xmi_root_model = Xmi::Sparx::SparxRoot2013.from_xml(xml_content)
 
 This method takes the path to an XMI file and generate the Ruby objects.
 
-=== Loading MDG Extensions and Generate Ruby Classes and Modules Dynamically
+=== Loading Extensions and Generate Ruby Classes and Modules Dynamically
 
-To load an MDG extension from an XML file, use the `load_mdg_extension` method:
+To load an extension from an XML file, use the `load_extension` method:
 
 [source,ruby]
 ----
-Xmi::EaRoot.load_mdg_extension("path/to/your/mdg_extension.xml")
+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::EaRoot.load_mdg_extension` takes the path to an XML file and generate the
+`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`.
 

data/lib/xmi/ea_root.rb

@@ -45,17 +45,10 @@ module Xmi
     TEXT
 
     class << self
-      def load_mdg_extension(xml_path)
-        options = {}
-        options[:input_xml_path] = xml_path
-        options[:module_name] = "Mdg"
-        load_extension(options)
-        update_mdg_mappings
-      end
-
-      def load_extension(options)
-        @content = gen_content(options)
+      def load_extension(xml_path)
+        @content = gen_content(xml_path)
         Object.class_eval @content
+        update_mappings(@module_name)
       end
 
       def output_rb_file(output_rb_path)
@@ -64,35 +57,35 @@ module Xmi
 
       private
 
-      def update_mdg_mappings
-        mdg_klasses = all_mdg_klasses
-        map_elements = construct_shale_xml_mappings(mdg_klasses)
+      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(mdg_klasses, sparx_root)
+          update_shale_attributes(new_klasses, sparx_root, module_name)
           update_shale_xml_mappings(map_elements, sparx_root)
         end
       end
 
-      def construct_shale_xml_mappings(mdg_klasses)
+      def construct_shale_xml_mappings(new_klasses, module_name) # rubocop:disable Metrics/MethodLength
         map_elements = []
-        mdg_klasses.each do |klass|
-          next unless Xmi::EaRoot::Mdg.const_get(klass).respond_to? :root_tag
+        new_klasses.each do |klass|
+          next unless Xmi::EaRoot.const_get(module_name).const_get(klass)
+                                 .respond_to? :root_tag
 
           map_elements << MAP_ELEMENT
-                          .gsub("#ELEMENT_NAME#", Xmi::EaRoot::Mdg.const_get(klass).root_tag)
+                          .gsub("#ELEMENT_NAME#", Xmi::EaRoot.const_get(module_name).const_get(klass).root_tag)
                           .gsub("#ELEMENT_METHOD#", Shale::Utils.snake_case(klass.to_s))
-                          .gsub("#NAMESPACE#", @mdg_namespace[:uri])
-                          .gsub("#PREFIX#", @mdg_namespace[:name])
+                          .gsub("#NAMESPACE#", @def_namespace[:uri])
+                          .gsub("#PREFIX#", @def_namespace[:name])
         end
 
         map_elements
       end
 
-      def update_shale_attributes(mdg_klasses, sparx_root)
-        mdg_klasses.each do |klass|
+      def update_shale_attributes(new_klasses, sparx_root, module_name)
+        new_klasses.each do |klass|
           method_name = Shale::Utils.snake_case(klass)
-          full_klass_name = "Xmi::EaRoot::Mdg::#{klass}"
-
+          full_klass_name = "Xmi::EaRoot::#{module_name}::#{klass}"
           attr_line = "#{ATTRIBUTE_LINE.rstrip}, collection: true"
           attr_line = attr_line
                       .gsub("#TAG_NAME#", method_name)
@@ -118,9 +111,9 @@ module Xmi
         [Xmi::Sparx::SparxRoot, Xmi::Sparx::SparxRoot2013]
       end
 
-      def all_mdg_klasses
-        Xmi::EaRoot::Mdg.constants.select do |c|
-          Xmi::EaRoot::Mdg.const_get(c).is_a? Class
+      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
         end
       end
 
@@ -131,6 +124,8 @@ module Xmi
       end
 
       def get_klass_name_from_node(node)
+        return Shale::Mapper.to_s unless node
+
         node.attribute_nodes.find { |attr| attr.name == "name" }.value
       end
 
@@ -172,7 +167,12 @@ module Xmi
         [attributes_lines, tags]
       end
 
-      def gen_abstract_klass
+      def gen_abstract_klass # rubocop:disable Metrics/MethodLength
+        unless @abstract_klass_node
+          @abstract_tags = []
+          return ""
+        end
+
         attributes_lines = ""
         tags_lines, @abstract_tags = gen_tags(@abstract_klass_node)
         attributes_lines += tags_lines
@@ -266,12 +266,6 @@ module Xmi
         klasses_lines = ""
 
         nodes.each do |node|
-          # check baseStereotypes is abstract class
-          base_stereotypes = node.attribute_nodes.find do |attr|
-            attr.name == "baseStereotypes" && attr.value == get_klass_name_from_node(@abstract_klass_node)
-          end
-          next if base_stereotypes.nil?
-
           klasses_lines += "#{gen_generic_klass(node)}\n"
         end
 
@@ -292,7 +286,7 @@ module Xmi
           .gsub("#KLASSES#", gen_klasses(xmi_doc))
       end
 
-      def get_mdg_namespace(xmi_doc)
+      def get_namespace_from_definition(xmi_doc)
         node = xmi_doc.at_xpath("//UMLProfile/Documentation")
         namespace_key = node.attribute_nodes.find do |attr|
           attr.name == "name"
@@ -304,12 +298,15 @@ module Xmi
         { name: namespace_key, uri: namespace_uri }
       end
 
-      def gen_content(options)
-        xml = options[:input_xml_path]
-        module_name = options[:module_name].capitalize
-        xmi_doc = Nokogiri::XML(File.open(xml).read)
-        @mdg_namespace = get_mdg_namespace(xmi_doc)
-        gen_module(xmi_doc, module_name)
+      def gen_content(xml)
+        xmi_doc = Nokogiri::XML(File.read(xml))
+        @module_name = get_module_name(xmi_doc)
+        @def_namespace = get_namespace_from_definition(xmi_doc)
+        gen_module(xmi_doc, @module_name)
+      end
+
+      def get_module_name(xmi_doc)
+        xmi_doc.root.name.split(".").first.capitalize
       end
     end
   end

data/lib/xmi/sparx.rb

@@ -674,6 +674,16 @@ 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
 
@@ -786,6 +796,20 @@ module Xmi
       end
     end
 
+    class SparxEAStub < Shale::Mapper
+      attribute :id, Shale::Type::String
+      attribute :name, Shale::Type::String
+      attribute :uml_type, Shale::Type::String
+
+      xml do
+        root "diagrams"
+
+        map_attribute "id", to: :id, prefix: "xmi", namespace: "http://www.omg.org/spec/XMI/20131001"
+        map_attribute "name", to: :name
+        map_attribute "UMLType", to: :uml_type
+      end
+    end
+
     module SparxExtensionAttributes
       def self.included(klass) # rubocop:disable Metrics/MethodLength
         klass.class_eval do
@@ -799,8 +823,9 @@ module Xmi
           attribute :extender_id, Shale::Type::String
           attribute :elements, SparxElements
           attribute :connectors, SparxConnectors
-          attribute :primitive_types, SparxPrimitiveTypes
+          attribute :primitive_types, SparxPrimitiveTypes2013
           attribute :diagrams, SparxDiagrams
+          attribute :ea_stub, SparxEAStub, collection: true
         end
       end
     end
@@ -826,6 +851,7 @@ module Xmi
         map_element "primitivetypes", to: :primitive_types
         map_element "profiles", to: :profiles
         map_element "diagrams", to: :diagrams
+        map_element "EAStub", to: :ea_stub
       end
     end
 
@@ -850,6 +876,7 @@ module Xmi
         map_element "primitivetypes", to: :primitive_types
         map_element "profiles", to: :profiles
         map_element "diagrams", to: :diagrams
+        map_element "EAStub", to: :ea_stub
       end
     end
 

data/lib/xmi/uml.rb

@@ -649,6 +649,7 @@ module Xmi
       end
     end
 
+    # TODO: add attributes xmlns:uml and xmlns:xmi
     module ProfileAttributes
       def self.included(klass)
         klass.class_eval do
@@ -656,6 +657,8 @@ module Xmi
           attribute :package_import, PackageImport, collection: true
           attribute :id, Shale::Type::String
           attribute :name, Shale::Type::String
+          # attribute :xmi, Shale::Type::String
+          # attribute :uml, Shale::Type::String
           attribute :ns_prefix, Shale::Type::String
 
           # Is this an EA thing?

data/lib/xmi/version.rb

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

data/xmi.gemspec

@@ -34,10 +34,10 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "nokogiri"
   spec.add_runtime_dependency "shale"
 
-  spec.add_development_dependency "equivalent-xml"
   spec.add_development_dependency "pry", "~> 0.12.2"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.11"
+  spec.add_development_dependency "rspec-xml"
   spec.add_development_dependency "rubocop", "~> 1.58"
   # spec.add_development_dependency "xml-c14n"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xmi
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-02 00:00:00.000000000 Z
+date: 2024-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: equivalent-xml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.11'
+- !ruby/object:Gem::Dependency
+  name: rspec-xml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement