xmi 0.3.11 → 0.3.12

data/lib/xmi/uml.rb

@@ -2,8 +2,8 @@
 
 module Xmi
   module Uml
-    class AnnotatedElement < Shale::Mapper
-      attribute :idref, Shale::Type::String
+    class AnnotatedElement < Lutaml::Model::Serializable
+      attribute :idref, :string
 
       xml do
         root "annotatedElement"
@@ -12,9 +12,9 @@ module Xmi
       end
     end
 
-    class Type < Shale::Mapper
-      attribute :idref, Shale::Type::String
-      attribute :href, Shale::Type::String
+    class Type < Lutaml::Model::Serializable
+      attribute :idref, :string
+      attribute :href, :string
 
       xml do
         root "type"
@@ -24,8 +24,8 @@ module Xmi
       end
     end
 
-    class MemberEnd < Shale::Mapper
-      attribute :idref, Shale::Type::String
+    class MemberEnd < Lutaml::Model::Serializable
+      attribute :idref, :string
 
       xml do
         root "memberEnd"
@@ -37,20 +37,20 @@ module Xmi
     module OwnedEndAttributes
       def self.included(klass) # rubocop:disable Metrics/MethodLength
         klass.class_eval do
-          attribute :type, Shale::Type::String
-          attribute :id, Shale::Type::String
-          attribute :association, Shale::Type::String
-          attribute :name, Shale::Type::String
+          attribute :type, :string
+          attribute :id, :string
+          attribute :association, :string
+          attribute :name, :string
           attribute :uml_type, Uml::Type
           attribute :member_end, MemberEnd
-          attribute :lower, Shale::Type::Integer
-          attribute :upper, Shale::Type::Integer
-          attribute :is_composite, Shale::Type::Boolean
+          attribute :lower, :integer
+          attribute :upper, :integer
+          attribute :is_composite, :boolean
         end
       end
     end
 
-    class OwnedEnd < Shale::Mapper
+    class OwnedEnd < Lutaml::Model::Serializable
       include OwnedEndAttributes
 
       xml do
@@ -68,10 +68,10 @@ module Xmi
       end
     end
 
-    class DefaultValue < Shale::Mapper
-      attribute :type, Shale::Type::String
-      attribute :id, Shale::Type::String
-      attribute :value, Shale::Type::String
+    class DefaultValue < Lutaml::Model::Serializable
+      attribute :type, :string
+      attribute :id, :string
+      attribute :value, :string
 
       xml do
         root "defaultValue"
@@ -102,10 +102,10 @@ module Xmi
       end
     end
 
-    class OwnedLiteral < Shale::Mapper
-      attribute :type, Shale::Type::String
-      attribute :id, Shale::Type::String
-      attribute :name, Shale::Type::String
+    class OwnedLiteral < Lutaml::Model::Serializable
+      attribute :type, :string
+      attribute :id, :string
+      attribute :name, :string
       attribute :uml_type, Uml::Type
 
       xml do
@@ -115,18 +115,18 @@ module Xmi
         map_attribute "id", to: :id, namespace: "http://www.omg.org/spec/XMI/20131001", prefix: "xmi"
         map_attribute "name", to: :name
 
-        map_element "type", to: :uml_type
+        map_element "type", to: :uml_type, namespace: nil, prefix: nil
       end
     end
 
     module OwnedAttributeAttributes
       def self.included(klass)
         klass.class_eval do
-          attribute :type, Shale::Type::String
-          attribute :id, Shale::Type::String
-          attribute :association, Shale::Type::String
-          attribute :name, Shale::Type::String
-          attribute :is_derived, Shale::Type::String
+          attribute :type, :string
+          attribute :id, :string
+          attribute :association, :string
+          attribute :name, :string
+          attribute :is_derived, :string
           attribute :uml_type, Uml::Type
           attribute :upper_value, UpperValue
           attribute :lower_value, LowerValue
@@ -134,7 +134,7 @@ module Xmi
       end
     end
 
-    class OwnedAttribute < Shale::Mapper
+    class OwnedAttribute < Lutaml::Model::Serializable
       include OwnedAttributeAttributes
 
       xml do
@@ -146,17 +146,17 @@ module Xmi
         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
+        map_element "type", to: :uml_type, namespace: nil, prefix: nil
+        map_element "upperValue", to: :upper_value, namespace: nil, prefix: nil
+        map_element "lowerValue", to: :lower_value, namespace: nil, prefix: nil
       end
     end
 
-    class OwnedParameter < Shale::Mapper
-      attribute :id, Shale::Type::String
-      attribute :name, Shale::Type::String
-      attribute :type, Shale::Type::String
-      attribute :direction, Shale::Type::String
+    class OwnedParameter < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :name, :string
+      attribute :type, :string
+      attribute :direction, :string
       attribute :upper_value, UpperValue
       attribute :lower_value, LowerValue
       attribute :default_value, DefaultValue
@@ -169,16 +169,16 @@ module Xmi
         map_attribute "type", to: :type, namespace: "http://www.omg.org/spec/XMI/20131001", prefix: "xmi"
         map_attribute "direction", to: :direction
 
-        map_element "upperValue", to: :upper_value
-        map_element "lowerValue", to: :lower_value
-        map_element "defaultValue", to: :default_value
+        map_element "upperValue", to: :upper_value, namespace: nil, prefix: nil
+        map_element "lowerValue", to: :lower_value, namespace: nil, prefix: nil
+        map_element "defaultValue", to: :default_value, namespace: nil, prefix: nil
       end
     end
 
-    class Specification < Shale::Mapper
-      attribute :id, Shale::Type::String
-      attribute :type, Shale::Type::String
-      attribute :language, Shale::Type::String
+    class Specification < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :type, :string
+      attribute :language, :string
 
       xml do
         root "specification"
@@ -188,10 +188,10 @@ module Xmi
       end
     end
 
-    class Precondition < Shale::Mapper
-      attribute :id, Shale::Type::String
-      attribute :name, Shale::Type::String
-      attribute :type, Shale::Type::String
+    class Precondition < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :name, :string
+      attribute :type, :string
       attribute :specification, Specification
 
       xml do
@@ -199,13 +199,13 @@ module Xmi
         map_attribute "id", to: :id, namespace: "http://www.omg.org/spec/XMI/20131001", prefix: "xmi"
         map_attribute "name", to: :name
         map_attribute "type", to: :type, namespace: "http://www.omg.org/spec/XMI/20131001", prefix: "xmi"
-        map_element "specification", to: :specification
+        map_element "specification", to: :specification, namespace: nil, prefix: nil
       end
     end
 
-    class OwnedOperation < Shale::Mapper
-      attribute :id, Shale::Type::String
-      attribute :name, Shale::Type::String
+    class OwnedOperation < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :name, :string
       attribute :owned_parameter, OwnedParameter, collection: true
       attribute :precondition, Precondition
       attribute :uml_type, Uml::Type, collection: true
@@ -214,55 +214,54 @@ module Xmi
         root "ownedOperation"
         map_attribute "id", to: :id, namespace: "http://www.omg.org/spec/XMI/20131001", prefix: "xmi"
         map_attribute "name", to: :name
-        map_element "ownedParameter", to: :owned_parameter
-        map_element "precondition", to: :precondition
-        map_element "type", to: :uml_type
+        map_element "ownedParameter", to: :owned_parameter, namespace: nil, prefix: nil
+        map_element "precondition", to: :precondition, namespace: nil, prefix: nil
+        map_element "type", to: :uml_type, namespace: nil, prefix: nil
       end
     end
 
     module OwnedCommentAttributes
       def self.included(klass)
         klass.class_eval do
-          attribute :type, Shale::Type::String
-          attribute :id, Shale::Type::String
-          attribute :body_element, Shale::Type::String
-          attribute :body_attribute, Shale::Type::String
-          attribute :annotated_attribute, Shale::Type::String
+          attribute :type, :string
+          attribute :id, :string
+          attribute :name, :string
+          attribute :body_element, :string
+          attribute :body_attribute, :string
+          attribute :annotated_attribute, :string
           attribute :annotated_element, AnnotatedElement
         end
       end
     end
 
-    class OwnedComment < Shale::Mapper
+    class OwnedComment < Lutaml::Model::Serializable
       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/20131001", 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/20131001", 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
+        map_element "body", to: :body_element, namespace: nil, prefix: nil
       end
     end
 
     module AssociationGeneralizationAttributes
       def self.included(klass)
         klass.class_eval do
-          attribute :type, Shale::Type::String
-          attribute :id, Shale::Type::String
-          attribute :general, Shale::Type::String
+          attribute :type, :string
+          attribute :id, :string
+          attribute :general, :string
         end
       end
     end
 
-    class AssociationGeneralization < Shale::Mapper
+    class AssociationGeneralization < Lutaml::Model::Serializable
       include AssociationGeneralizationAttributes
 
       xml do
@@ -277,22 +276,22 @@ module Xmi
     module PackagedElementAttributes
       def self.included(klass) # rubocop:disable Metrics/MethodLength
         klass.class_eval do
-          attribute :type, Shale::Type::String
-          attribute :id, Shale::Type::String
-          attribute :name, Shale::Type::String
-          attribute :member_end, Shale::Type::String
+          attribute :type, :string
+          attribute :id, :string
+          attribute :name, :string
+          attribute :member_end, :string
           attribute :member_ends, MemberEnd, collection: true
           attribute :owned_literal, OwnedLiteral, collection: true
           attribute :owned_operation, OwnedOperation, collection: true
 
           # EA specific
-          attribute :supplier, Shale::Type::String
-          attribute :client, Shale::Type::String
+          attribute :supplier, :string
+          attribute :client, :string
         end
       end
     end
 
-    class PackagedElement < Shale::Mapper
+    class PackagedElement < Lutaml::Model::Serializable
       include PackagedElementAttributes
       attribute :packaged_element, PackagedElement, collection: true
       attribute :owned_end, OwnedEnd, collection: true
@@ -312,24 +311,24 @@ module Xmi
         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
+        map_element "generalization", to: :generalization, namespace: nil, prefix: nil
+        map_element "ownedComment", to: :owned_comment, namespace: nil, prefix: nil
+        map_element "ownedEnd", to: :owned_end, namespace: nil, prefix: nil
+        map_element "ownedLiteral", to: :owned_literal, namespace: nil, prefix: nil
+        map_element "ownedAttribute", to: :owned_attribute, namespace: nil, prefix: nil
+        map_element "ownedOperation", to: :owned_operation, namespace: nil, prefix: nil
+        map_element "packagedElement", to: :packaged_element, namespace: nil, prefix: nil
+        map_element "memberEnd", to: :member_ends, namespace: nil, prefix: nil
       end
     end
 
-    class Bounds < Shale::Mapper
-      attribute :type, Shale::Type::String
-      attribute :id, Shale::Type::String
-      attribute :x, Shale::Type::Integer
-      attribute :y, Shale::Type::Integer
-      attribute :height, Shale::Type::Integer
-      attribute :width, Shale::Type::Integer
+    class Bounds < Lutaml::Model::Serializable
+      attribute :type, :string
+      attribute :id, :string
+      attribute :x, :integer
+      attribute :y, :integer
+      attribute :height, :integer
+      attribute :width, :integer
 
       xml do
         root "bounds"
@@ -343,11 +342,11 @@ module Xmi
       end
     end
 
-    class Waypoint < Shale::Mapper
-      attribute :type, Shale::Type::String
-      attribute :id, Shale::Type::String
-      attribute :x, Shale::Type::Integer
-      attribute :y, Shale::Type::Integer
+    class Waypoint < Lutaml::Model::Serializable
+      attribute :type, :string
+      attribute :id, :string
+      attribute :x, :integer
+      attribute :y, :integer
 
       xml do
         root "waypoint"
@@ -359,15 +358,15 @@ module Xmi
       end
     end
 
-    class OwnedElement < Shale::Mapper
-      attribute :type, Shale::Type::String
-      attribute :id, Shale::Type::String
-      attribute :text, Shale::Type::String
-      attribute :model_element, Shale::Type::String
+    class OwnedElement < Lutaml::Model::Serializable
+      attribute :type, :string
+      attribute :id, :string
+      attribute :text, :string
+      attribute :model_element, :string
       attribute :owned_element, OwnedElement, collection: true
       attribute :bounds, Bounds, collection: true
-      attribute :source, Shale::Type::String
-      attribute :target, Shale::Type::String
+      attribute :source, :string
+      attribute :target, :string
       attribute :waypoint, Waypoint
 
       xml do
@@ -378,27 +377,27 @@ module Xmi
         map_attribute "text", to: :text
         map_attribute "modelElement", to: :model_element
 
-        map_element "ownedElement", to: :owned_element
-        map_element "bounds", to: :bounds
-        map_element "source", to: :source
-        map_element "target", to: :target
-        map_element "waypoint", to: :waypoint
+        map_element "ownedElement", to: :owned_element, namespace: nil, prefix: nil
+        map_element "bounds", to: :bounds, namespace: nil, prefix: nil
+        map_element "source", to: :source, namespace: nil, prefix: nil
+        map_element "target", to: :target, namespace: nil, prefix: nil
+        map_element "waypoint", to: :waypoint, namespace: nil, prefix: nil
       end
     end
 
     module DiagramAttributes
       def self.included(klass)
         klass.class_eval do
-          attribute :type, Shale::Type::String
-          attribute :id, Shale::Type::String
-          attribute :is_frame, Shale::Type::Boolean
-          attribute :model_element, Shale::Type::String
+          attribute :type, :string
+          attribute :id, :string
+          attribute :is_frame, :boolean
+          attribute :model_element, :string
           attribute :owned_element, OwnedElement, collection: true
         end
       end
     end
 
-    class Diagram < Shale::Mapper
+    class Diagram < Lutaml::Model::Serializable
       include DiagramAttributes
 
       xml do
@@ -414,9 +413,9 @@ module Xmi
       end
     end
 
-    class ProfileApplicationAppliedProfile < Shale::Mapper
-      attribute :type, Shale::Type::String
-      attribute :href, Shale::Type::String
+    class ProfileApplicationAppliedProfile < Lutaml::Model::Serializable
+      attribute :type, :string
+      attribute :href, :string
 
       xml do
         root "appliedProfile"
@@ -426,9 +425,9 @@ module Xmi
       end
     end
 
-    class ProfileApplication < Shale::Mapper
-      attribute :type, Shale::Type::String
-      attribute :id, Shale::Type::String
+    class ProfileApplication < Lutaml::Model::Serializable
+      attribute :type, :string
+      attribute :id, :string
       attribute :applied_profile, ProfileApplicationAppliedProfile
 
       xml do
@@ -437,12 +436,12 @@ module Xmi
         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_element "appliedProfile", to: :applied_profile
+        map_element "appliedProfile", to: :applied_profile, namespace: nil, prefix: nil
       end
     end
 
-    class ImportedPackage < Shale::Mapper
-      attribute :href, Shale::Type::String
+    class ImportedPackage < Lutaml::Model::Serializable
+      attribute :href, :string
 
       xml do
         root "importedPackage"
@@ -454,13 +453,13 @@ module Xmi
     module PackageImportAttributes
       def self.included(klass)
         klass.class_eval do
-          attribute :id, Shale::Type::String
+          attribute :id, :string
           attribute :imported_package, ImportedPackage
         end
       end
     end
 
-    class PackageImport < Shale::Mapper
+    class PackageImport < Lutaml::Model::Serializable
       include PackageImportAttributes
 
       xml do
@@ -476,14 +475,14 @@ module Xmi
     module UmlModelAttributes
       def self.included(klass)
         klass.class_eval do
-          attribute :type, Shale::Type::String
-          attribute :name, Shale::Type::String
+          attribute :type, :string
+          attribute :name, :string
           attribute :profile_application, ProfileApplication, collection: true
         end
       end
     end
 
-    class UmlModel < Shale::Mapper
+    class UmlModel < Lutaml::Model::Serializable
       include UmlModelAttributes
       attribute :packaged_element, PackagedElement, collection: true
       attribute :package_import, PackageImport, collection: true
@@ -509,19 +508,19 @@ module Xmi
         klass.class_eval do
           attribute :packaged_element, PackagedElement, collection: true
           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
+          attribute :id, :string
+          attribute :name, :string
+          # attribute :xmi, :string
+          # attribute :uml, :string
+          attribute :ns_prefix, :string
 
           # Is this an EA thing?
-          attribute :metamodel_reference, Shale::Type::String
+          attribute :metamodel_reference, :string
         end
       end
     end
 
-    class Profile < Shale::Mapper
+    class Profile < Lutaml::Model::Serializable
       include ProfileAttributes
       attribute :owned_comment, OwnedComment, collection: true
 
@@ -533,9 +532,9 @@ module Xmi
         map_attribute "metamodelReference", to: :metamodel_reference
         map_attribute "nsPrefix", to: :ns_prefix
 
-        map_element "ownedComment", to: :owned_comment
+        map_element "ownedComment", to: :owned_comment, namespace: nil, prefix: nil
         map_element "packageImport", to: :package_import, namespace: nil, prefix: nil
-        map_element "packagedElement", to: :packaged_element
+        map_element "packagedElement", to: :packaged_element, namespace: nil, prefix: nil
       end
     end
   end

data/lib/xmi/version.rb

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

data/lib/xmi.rb

@@ -1,17 +1,22 @@
 # frozen_string_literal: true
 
-require "shale"
+require "lutaml/model"
+require "lutaml/model/xml_adapter/nokogiri_adapter"
+# require "lutaml/model/json_adapter/standard_json_adapter"
+# require "lutaml/model/yaml_adapter/standard_yaml_adapter"
 
-unless Shale.xml_adapter
-  require "shale/adapter/nokogiri"
-  Shale.xml_adapter = Shale::Adapter::Nokogiri
+Lutaml::Model::Config.configure do |config|
+  config.xml_adapter = Lutaml::Model::XmlAdapter::NokogiriAdapter
+  # config.yaml_adapter = Lutaml::Model::YamlAdapter::StandardYamlAdapter
+  # config.json_adapter = Lutaml::Model::JsonAdapter::StandardJsonAdapter
 end
 
-# add a function to check type
-module Shale
-  class Mapper
-    def type?(test_type)
-      !!type ? type == test_type : false
+module Lutaml
+  module Model
+    class Serializable
+      def type?(test_type)
+        !!type ? type == test_type : false
+      end
     end
   end
 end
@@ -31,5 +36,6 @@ require_relative "xmi/extension"
 require_relative "xmi/replace"
 require_relative "xmi/ea_root"
 require_relative "xmi/uml"
+require_relative "xmi/the_custom_profile"
 require_relative "xmi/root"
 require_relative "xmi/sparx"

data/xmi.gemspec

@@ -31,8 +31,8 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 3.0.0"
 
+  spec.add_runtime_dependency "lutaml-model"
   spec.add_runtime_dependency "nokogiri"
-  spec.add_runtime_dependency "shale"
 
   spec.add_development_dependency "pry", "~> 0.12.2"
   spec.add_development_dependency "rake", "~> 13.0"

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: xmi
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.12
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-05 00:00:00.000000000 Z
+date: 2025-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: lutaml-model
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shale
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,6 +137,7 @@ files:
 - lib/xmi/replace.rb
 - lib/xmi/root.rb
 - lib/xmi/sparx.rb
+- lib/xmi/the_custom_profile.rb
 - lib/xmi/uml.rb
 - lib/xmi/version.rb
 - sig/xmi.rbs
@@ -148,7 +149,7 @@ metadata:
   homepage_uri: https://github.com/lutaml/xmi
   source_code_uri: https://github.com/lutaml/xmi
   changelog_uri: https://github.com/lutaml/xmi/releases
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -164,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.27
-signing_key: 
+signing_key:
 specification_version: 4
 summary: XMI data model parser
 test_files: []