xmi 0.3.6 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 302b69df31217eb74d01a40473d3ed50a35af959c331be1424aadd2262759703
-  data.tar.gz: 63d413fddf71518961876467bc6a87bd99686e3c3367f9e3510921c4047765da
+  metadata.gz: cc142c4dafa8b6f642915fc177a55d64667b39503164533e4acd2f57dc4a5882
+  data.tar.gz: 8ea7bac17a8ce090cc39c019571ef1d6d91096c3b868c9e1246114f5a49a8d37
 SHA512:
-  metadata.gz: 4b484e2d65d687acb0671498f36929a5eaf30ef9275460ee0a66f716f38a5d088795dd9e5c10833e004d12304c1d544b8622c25fb88b79fcf5eb0a453ba9f267
-  data.tar.gz: d4da102f2b81e27e0b4a8fd62817d3bf0ba2cb9b2e33dece2ccb56b21c9664af72e2df628a7e4e031799b03b699e284477520e39b07fe3cfd9a4c57663bce4e9
+  metadata.gz: a189f14845f4bd56540e1d6b0373a7cab2ec56c7b12572ccdfb9f01365994d90dfdc45802994433bc398fa417979ea6183c82d131bf9b6dd9b5484f4eb7439d3
+  data.tar.gz: 034a0986c647977cfa682611df764f7f8ff7859b40aa82ca61e8bef20000f24ec96b5af2bfc3de0cc9aeececfc0a23b3d1f62a4fb7e7a9f52268a77878f2fe1f

data/lib/xmi/ea_root.rb

@@ -202,7 +202,7 @@ module Xmi
         [apply_types_lines, apply_types_nodes]
       end
 
-      def gen_generic_klass(node)
+      def gen_generic_klass(node, from_klass = nil) # rubocop:disable Metrics/MethodLength
         node_name = get_klass_name_from_node(node)
         attributes_lines, map_attributes_lines = gen_klass_tags(node)
         apply_types_lines, apply_types_nodes = gen_apply_types(node)
@@ -211,18 +211,34 @@ module Xmi
           apply_types_lines, apply_types_nodes
         )
 
+        map_attributes_lines = node_map_attributes(node_name,
+                                                   from_klass, map_attributes_lines)
         xml_mapping = replace_xml_mapping(node_name, map_attributes_lines)
 
-        replace_klass_template(node_name, attributes_lines, xml_mapping)
+        replace_klass_template(node_name, attributes_lines,
+                               xml_mapping, from_klass)
       end
 
-      def gen_klass_apply_types(attributes_lines, map_attributes_lines, apply_types_lines, apply_types_nodes)
+      def node_map_attributes(node_name, from_klass, map_attributes_lines)
+        if from_klass && @node_map.key?(from_klass.to_sym)
+          map_attributes_lines += @node_map[from_klass.to_sym].to_s
+        else
+          @node_map ||= {}
+          @node_map[node_name.to_sym] = map_attributes_lines
+        end
+
+        map_attributes_lines
+      end
+
+      def gen_klass_apply_types(attributes_lines, map_attributes_lines, apply_types_lines, apply_types_nodes) # rubocop:disable Metrics/MethodLength
         unless apply_types_nodes.empty?
           attributes_lines += apply_types_lines
           apply_types_nodes.each do |n|
             apply_types = n.attribute_nodes.map(&:value)
             apply_types.each do |apply_type|
-              map_attributes_lines += gen_map_attribute_line("base_#{apply_type}", "base_#{apply_type}")
+              map_attributes_lines += gen_map_attribute_line(
+                "base_#{apply_type}", "base_#{apply_type}"
+              )
             end
           end
         end
@@ -251,9 +267,11 @@ module Xmi
           .rstrip
       end
 
-      def replace_klass_template(node_name, attributes_lines, xml_mapping)
+      def replace_klass_template(node_name, attributes_lines, xml_mapping,
+                                 from_klass = nil)
         abstract_klass_name = get_klass_name_from_node(@abstract_klass_node)
-        root_tag_line = "def self.root_tag; \"#{node_name}\"; end"
+        abstract_klass_name = from_klass if from_klass
+        root_tag_line = "def self.root_tag = \"#{node_name}\""
 
         KLASS_TEMPLATE
           .gsub("#KLASS_NAME#", Shale::Utils.classify(node_name))
@@ -267,6 +285,16 @@ module Xmi
         nodes = xmi_doc.xpath("//UMLProfiles//Stereotypes//Stereotype[not(contains(@isAbstract, 'true'))]")
         klasses_lines = ""
 
+        klasses_lines += "#{gen_generic_klasses_wo_base_stereotypes(nodes)}\n"
+        klasses_lines += "#{gen_generic_klasses_w_base_stereotypes(nodes)}\n"
+
+        klasses_lines
+      end
+
+      def gen_generic_klasses_wo_base_stereotypes(nodes)
+        nodes = nodes.select { |n| n.attributes["baseStereotypes"].nil? }
+        klasses_lines = ""
+
         nodes.each do |node|
           klasses_lines += "#{gen_generic_klass(node)}\n"
         end
@@ -274,6 +302,18 @@ module Xmi
         klasses_lines
       end
 
+      def gen_generic_klasses_w_base_stereotypes(nodes)
+        nodes = nodes.reject { |n| n.attributes["baseStereotypes"].nil? }
+        klasses_lines = ""
+
+        nodes.each do |node|
+          base_stereotypes = node.attributes["baseStereotypes"].value
+          klasses_lines += "#{gen_generic_klass(node, base_stereotypes)}\n"
+        end
+
+        klasses_lines
+      end
+
       def gen_klasses(xmi_doc)
         @abstract_klass_node = get_abstract_klass_node(xmi_doc)
         klasses_lines = ""
@@ -289,13 +329,8 @@ module Xmi
       end
 
       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"
-        end.value
-        namespace_uri = node.attribute_nodes.find do |attr|
-          attr.name == "URI"
-        end.value
+        namespace_key = get_module_name_from_definition(xmi_doc)
+        namespace_uri = get_module_uri(xmi_doc)
 
         { name: namespace_key, uri: namespace_uri }
       end
@@ -308,7 +343,24 @@ module Xmi
       end
 
       def get_module_name(xmi_doc)
-        xmi_doc.root.name.split(".").first.capitalize
+        get_module_name_from_definition(xmi_doc).capitalize
+      end
+
+      def get_module_name_from_definition(xmi_doc)
+        node = xmi_doc.at_xpath("//UMLProfile/Documentation")
+        node.attribute_nodes.find { |attr| attr.name == "name" }&.value
+      end
+
+      def get_module_uri(xmi_doc)
+        node = xmi_doc.at_xpath("//UMLProfile/Documentation")
+        uri = node.attribute_nodes.find { |attr| attr.name == "URI" }&.value
+
+        return uri if uri
+
+        name = get_module_name_from_definition(xmi_doc)
+        ver = node.attribute_nodes.find { |attr| attr.name == "version" }&.value
+
+        "http://www.sparxsystems.com/profiles/#{name}/#{ver}"
       end
     end
   end

data/lib/xmi/extensions/gml.rb

@@ -37,15 +37,87 @@ module Xmi
         end
       end
 
+      class DataType < Shale::Mapper
+        attribute :is_collection, Shale::Type::String
+        attribute :no_property_type, Shale::Type::String
+        attribute :base_class, Shale::Type::String
+
+        xml do
+          root "DataType"
+
+          map_attribute "isCollection", to: :is_collection
+          map_attribute "noPropertyType", to: :no_property_type
+          map_attribute "base_Class", to: :base_class
+        end
+      end
+
+      class Union < Shale::Mapper
+        attribute :is_collection, Shale::Type::String
+        attribute :no_property_type, Shale::Type::String
+        attribute :base_class, Shale::Type::String
+
+        xml do
+          root "Union"
+
+          map_attribute "isCollection", to: :is_collection
+          map_attribute "noPropertyType", to: :no_property_type
+          map_attribute "base_Class", to: :base_class
+        end
+      end
+
+      class Enumeration < Shale::Mapper
+        attribute :base_enumeration, Shale::Type::String
+
+        xml do
+          root "Enumeration"
+
+          map_attribute "base_Enumeration", to: :base_enumeration
+        end
+      end
+
+      class Type < Shale::Mapper
+        attribute :is_collection, Shale::Type::String
+        attribute :no_property_type, Shale::Type::String
+        attribute :base_class, Shale::Type::String
+
+        xml do
+          root "Type"
+
+          map_attribute "isCollection", to: :is_collection
+          map_attribute "noPropertyType", to: :no_property_type
+          map_attribute "base_Class", to: :base_class
+        end
+      end
+
+      class FeatureType < Shale::Mapper
+        attribute :is_collection, Shale::Type::String
+        attribute :no_property_type, Shale::Type::String
+        attribute :base_class, Shale::Type::String
+        attribute :by_value_property_type, Shale::Type::String
+
+        xml do
+          root "FeatureType"
+
+          map_attribute "isCollection", to: :is_collection
+          map_attribute "noPropertyType", to: :no_property_type
+          map_attribute "base_Class", to: :base_class
+          map_attribute "byValuePropertyType", to: :by_value_property_type
+        end
+      end
+
       class Property < Shale::Mapper
         attribute :sequence_number, Shale::Type::String
         attribute :base_property, Shale::Type::String
+        attribute :is_metadata, Shale::Type::String
+        attribute :inline_or_by_reference, Shale::Type::String
 
         xml do
           root "property"
 
           map_attribute "sequenceNumber", to: :sequence_number
           map_attribute "base_Property", to: :base_property
+          map_attribute "isMetadata", to: :is_metadata
+          map_attribute "inlineOrByReference", to: :inline_or_by_reference
         end
       end
     end

data/lib/xmi/sparx.rb

@@ -957,6 +957,11 @@ module Xmi
           attribute :eauml_import, EaRoot::Eauml::Import, collection: true
           attribute :gml_application_schema, EaRoot::Gml::ApplicationSchema, collection: true
           attribute :gml_code_list, EaRoot::Gml::CodeList, collection: true
+          attribute :gml_data_type, EaRoot::Gml::CodeList, collection: true
+          attribute :gml_union, EaRoot::Gml::CodeList, collection: true
+          attribute :gml_enumeration, EaRoot::Gml::CodeList, collection: true
+          attribute :gml_type, EaRoot::Gml::CodeList, collection: true
+          attribute :gml_feature_type, EaRoot::Gml::CodeList, collection: true
           attribute :gml_property, EaRoot::Gml::Property, collection: true
         end
       end
@@ -1002,6 +1007,21 @@ module Xmi
       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"
@@ -1054,6 +1074,21 @@ module Xmi
       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"

data/lib/xmi/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xmi
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-10 00:00:00.000000000 Z
+date: 2024-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri