lutaml 0.9.39 → 0.9.41

data/lib/lutaml/uml/property.rb

@@ -3,24 +3,22 @@
 module Lutaml
   module Uml
     class Property < TopElement
-      attr_accessor :type, # rubocop:disable Naming/MethodName
-                    :aggregation,
-                    :association,
-                    :is_derived,
-                    :lowerValue,
-                    :upperValue
+      attribute :type, :string
+      attribute :aggregation, :string
+      attribute :association, :string
+      attribute :is_derived, :boolean, default: false
+      attribute :visibility, :string, default: "public"
+      attribute :lowerValue, :string, default: "1"
+      attribute :upperValue, :string, default: "1"
 
-      def initialize # rubocop:disable Lint/MissingSuper
-        @name = nil
-        @xmi_id = nil
-        @xmi_uuid = nil
-        @aggregation = nil
-        @association = nil
-        @namespace = nil
-        @is_derived = false
-        @visibility = "public"
-        @lowerValue = "1" # rubocop:disable Naming/VariableName
-        @upperValue = "1" # rubocop:disable Naming/VariableName
+      yaml do
+        map "type", to: :type
+        map "aggregation", to: :aggregation
+        map "association", to: :association
+        map "is_derived", to: :is_derived
+        map "visibility", to: :visibility
+        map "lowerValue", to: :lowerValue
+        map "upperValue", to: :upperValue
       end
     end
   end

data/lib/lutaml/uml/region.rb

@@ -3,7 +3,6 @@
 ##
 ## Behaviour metamodel
 ##
-
 module Lutaml
   module Uml
     class Region < TopElement

data/lib/lutaml/uml/state.rb

@@ -6,7 +6,15 @@
 module Lutaml
   module Uml
     class State < Vertex
-      attr_accessor :exit, :entry, :do_activity
+      attribute :exit, :string
+      attribute :entry, :string
+      attribute :do_activity, :string
+
+      yaml do
+        map "exit", to: :exit
+        map "entry", to: :entry
+        map "do_activity", to: :do_activity
+      end
     end
   end
 end

data/lib/lutaml/uml/state_machine.rb

@@ -3,7 +3,6 @@
 ##
 ## Behaviour metamodel
 ##
-
 module Lutaml
   module Uml
     class StateMachine < Behavior

data/lib/lutaml/uml/top_element.rb

@@ -2,57 +2,79 @@
 
 module Lutaml
   module Uml
-    class TopElement
-      include HasAttributes
-
-      attr_reader :definition
-      attr_accessor :name,
-                    :xmi_id,
-                    :xmi_uuid,
-                    :namespace,
-                    :keyword,
-                    :stereotype,
-                    :href,
-                    :visibility,
-                    :comments
-
-      # rubocop:disable Rails/ActiveRecordAliases
-      def initialize(attributes = {})
-        @visibility = "public"
-        @name = attributes["name"]
-        update_attributes(attributes)
-      end
-      # rubocop:enable Rails/ActiveRecordAliases
+    class TopElement < Lutaml::Model::Serializable
+      attribute :name, :string
+      attribute :xmi_id, :string
+      attribute :xmi_uuid, :string
+      attribute :namespace, NameSpace
+      attribute :keyword, :string
+      attribute :stereotype, :string, collection: true, default: -> { [] }
+      attribute :href, :string
+      attribute :visibility, :string, default: "public"
+      attribute :comments, :string, collection: true
 
-      def full_name # rubocop:disable Metrics/MethodLength
-        if name == nil
-          return nil
-        end
+      attribute :definition, :string
+      attribute :full_name, :string
 
-        the_name = name
-        next_namespace = namespace
+      yaml do
+        map "name", to: :name
+        map "xmi_id", to: :xmi_id
+        map "xmi_uuid", to: :xmi_uuid
+        map "namespace", to: :namespace
+        map "keyword", to: :keyword
+        map "stereotype", to: :stereotype
+        map "href", to: :href
+        map "visibility", to: :visibility
+        map "comments", to: :comments
 
-        while !next_namespace.nil?
-          the_name = if next_namespace.name.nil?
-                       "::#{the_name}"
-                     else
-                       "#{next_namespace.name}::#{the_name}"
-                     end
-          next_namespace = next_namespace.namespace
-        end
+        map "definition", to: :definition, with: {
+          to: :definition_to_yaml, from: :definition_from_yaml
+        }
+        map "full_name", with: {
+          to: :full_name_to_yaml, from: :full_name_from_yaml
+        }
+      end
 
-        the_name
+      def definition_to_yaml(model, doc)
+        doc["definition"] = model.definition if model.definition
       end
 
-      def definition=(value)
-        @definition = value
-          .to_s
+      def definition_from_yaml(model, value)
+        model.definition = value.to_s
           .gsub(/\\}/, "}")
           .gsub(/\\{/, "{")
           .split("\n")
           .map(&:strip)
           .join("\n")
       end
+
+      def full_name_to_yaml(model, doc) # rubocop:disable Metrics/MethodLength
+        return model.full_name if model.full_name
+
+        # If full_name is not set, calculate it
+        full_name = nil
+        if model.name == nil
+          return full_name
+        end
+
+        full_name = model.name
+        next_namespace = model.namespace
+
+        while !next_namespace.nil?
+          full_name = if next_namespace.name.nil?
+                        "::#{full_name}"
+                      else
+                        "#{next_namespace.name}::#{full_name}"
+                      end
+          next_namespace = next_namespace.namespace
+        end
+
+        doc["full_name"] = full_name
+      end
+
+      def full_name_from_yaml(model, value)
+        model.full_name = value
+      end
     end
   end
 end

data/lib/lutaml/uml/top_element_attribute.rb

@@ -2,32 +2,43 @@
 
 module Lutaml
   module Uml
-    class TopElementAttribute
-      include HasAttributes
-      include HasMembers
+    class TopElementAttribute < Lutaml::Model::Serializable
+      attribute :name, :string
+      attribute :visibility, :string, default: "public"
+      attribute :type, :string
+      attribute :id, :string
+      attribute :xmi_id, :string
+      attribute :contain, :string
+      attribute :static, :string
+      attribute :cardinality, Cardinality
+      attribute :keyword, :string
+      attribute :is_derived, :boolean, default: false
 
-      attr_reader :definition
-      attr_accessor :name,
-                    :visibility,
-                    :type,
-                    :id,
-                    :xmi_id,
-                    :contain,
-                    :static,
-                    :cardinality,
-                    :keyword,
-                    :is_derived
+      attribute :definition, :string
 
-      # rubocop:disable Rails/ActiveRecordAliases
-      def initialize(attributes = {})
-        @visibility = "public"
-        update_attributes(attributes)
+      yaml do
+        map "name", to: :name
+        map "visibility", to: :visibility
+        map "type", to: :type
+        map "id", to: :id
+        map "xmi_id", to: :xmi_id
+        map "contain", to: :contain
+        map "static", to: :static
+        map "cardinality", to: :cardinality
+        map "keyword", to: :keyword
+        map "is_derived", to: :is_derived
+
+        map "definition", to: :definition, with: {
+          to: :definition_to_yaml, from: :definition_from_yaml
+        }
+      end
+
+      def definition_to_yaml(model, doc)
+        doc["definition"] = model.definition if model.definition
       end
-      # rubocop:enable Rails/ActiveRecordAliases
 
-      def definition=(value)
-        @definition = value
-          .to_s
+      def definition_from_yaml(model, value)
+        model.definition = value.to_s
           .gsub(/\\}/, "}")
           .gsub(/\\{/, "{")
           .split("\n")

data/lib/lutaml/uml/transition.rb

@@ -6,7 +6,17 @@
 module Lutaml
   module Uml
     class Transition < TopElement
-      attr_accessor :source, :target, :guard, :effect
+      attribute :source, :string
+      attribute :target, :string
+      attribute :guard, :string
+      attribute :effect, :string
+
+      yaml do
+        map "source", to: :source
+        map "target", to: :target
+        map "guard", to: :guard
+        map "effect", to: :effect
+      end
     end
   end
 end

data/lib/lutaml/uml/trigger.rb

@@ -6,7 +6,11 @@
 module Lutaml
   module Uml
     class Trigger < TopElement
-      attr_accessor :event
+      attribute :event, :string
+
+      yaml do
+        map "event", to: :event
+      end
     end
   end
 end

data/lib/lutaml/uml/value.rb

@@ -2,24 +2,28 @@
 
 module Lutaml
   module Uml
-    class Value
-      include HasAttributes
-      include HasMembers
+    class Value < Lutaml::Model::Serializable
+      attribute :definition, :string
+      attribute :name, :string
+      attribute :id, :string
+      attribute :type, :string
 
-      attr_reader :definition
-      attr_accessor :name,
-                    :id,
-                    :type
+      yaml do
+        map "name", to: :name
+        map "id", to: :id
+        map "type", to: :type
 
-      # rubocop:disable Rails/ActiveRecordAliases
-      def initialize(attributes = {})
-        update_attributes(attributes)
+        map "definition", to: :definition, with: {
+          to: :definition_to_yaml, from: :definition_from_yaml
+        }
       end
-      # rubocop:enable Rails/ActiveRecordAliases
 
-      def definition=(value)
-        @definition = value
-          .to_s
+      def definition_to_yaml(model, doc)
+        doc["definition"] = model.definition if model.definition
+      end
+
+      def definition_from_yaml(model, value)
+        model.definition = value.to_s
           .gsub(/\\}/, "}")
           .gsub(/\\{/, "{")
           .split("\n")

data/lib/lutaml/uml.rb

@@ -1,10 +1,48 @@
 # frozen_string_literal: true
 
-require "lutaml/uml/version"
+require "lutaml/model"
+
+require "lutaml/uml/has_attributes"
+require "lutaml/uml/has_members"
+require "lutaml/uml/namespace"
+require "lutaml/uml/cardinality"
+require "lutaml/uml/fidelity"
+require "lutaml/uml/top_element"
+require "lutaml/uml/top_element_attribute"
+require "lutaml/uml/value"
+require "lutaml/uml/action"
+require "lutaml/uml/classifier"
+require "lutaml/uml/dependency"
+require "lutaml/uml/association"
+require "lutaml/uml/constraint"
+require "lutaml/uml/operation"
+require "lutaml/uml/class"
+require "lutaml/uml/data_type"
+require "lutaml/uml/enum"
+require "lutaml/uml/diagram"
+require "lutaml/uml/package"
+require "lutaml/uml/primitive_type"
+require "lutaml/uml/group"
+require "lutaml/uml/connector"
+require "lutaml/uml/connector_end"
+require "lutaml/uml/behavior"
+require "lutaml/uml/activity"
+require "lutaml/uml/vertex"
+require "lutaml/uml/state"
+require "lutaml/uml/final_state"
+require "lutaml/uml/property"
+require "lutaml/uml/port"
+require "lutaml/uml/document"
+
 require "lutaml/uml/parsers/dsl"
 require "lutaml/uml/parsers/yaml"
 require "lutaml/uml/parsers/attribute"
-require "lutaml/uml/formatter"
+require "lutaml/formatter"
+require "lutaml/formatter/graphviz"
+
+Dir.glob(File.expand_path("./uml/**/*.rb", __dir__)).sort.each do |file|
+  require file
+end
 
 module Lutaml
   module Uml

data/lib/lutaml/version.rb

@@ -1,3 +1,3 @@
 module Lutaml
-  VERSION = "0.9.39".freeze
+  VERSION = "0.9.41".freeze
 end

data/lib/lutaml/xmi/liquid_drops/enum_drop.rb

@@ -46,7 +46,7 @@ module Lutaml
       end
 
       def subtype_of
-        find_subtype_of(@model.id)
+        find_subtype_of_from_owned_attribute_type(@model.id)
       end
     end
   end

data/lib/lutaml/xmi/liquid_drops/klass_drop.rb

@@ -186,7 +186,8 @@ module Lutaml
       end
 
       def subtype_of
-        find_subtype_of(@model.id)
+        find_subtype_of_from_generalization(@model.id) ||
+          find_subtype_of_from_owned_attribute_type(@model.id)
       end
 
       def has_guidance?

data/lib/lutaml/xmi/parsers/xmi_base.rb

@@ -297,7 +297,7 @@ module Lutaml
           @upper_level_cache[klass_id]
         end
 
-        def find_subtype_of(id) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
+        def find_subtype_of_from_owned_attribute_type(id) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
           @pkg_elements_owned_attributes ||= all_packaged_elements.map do |e|
             {
               name: e.name,
@@ -306,7 +306,6 @@ module Lutaml
                       end || [],
             }
           end
-
           result = @pkg_elements_owned_attributes.find do |e|
             e[:idrefs].include?(id)
           end
@@ -314,6 +313,25 @@ module Lutaml
           result[:name] if result
         end
 
+        def find_subtype_of_from_generalization(id) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
+          matched_element = @xmi_root_model.extension.elements.element
+            .find { |e| e.idref == id }
+
+          return if !matched_element || !matched_element.links
+
+          matched_generalization = nil
+          matched_element.links.each do |link|
+            matched_generalization = link&.generalization&.find do |g|
+              g.start == id
+            end
+            break if matched_generalization
+          end
+
+          return if matched_generalization&.end.nil?
+
+          lookup_entity_name(matched_generalization.end)
+        end
+
         # Build cache once for all packaged elements
         def build_upper_level_cache
           @upper_level_cache = {}

data/lib/lutaml/xmi/parsers/xml.rb

@@ -1,16 +1,18 @@
 require "nokogiri"
 require "htmlentities"
-require "lutaml/uml/has_attributes"
-require "lutaml/uml/document"
 require "lutaml/xmi"
 require "xmi"
 require "lutaml/xmi/parsers/xmi_base"
+require "lutaml/uml"
+require "lutaml/converter/xmi_hash_to_uml"
 
 module Lutaml
   module XMI
     module Parsers
       # Class for parsing .xmi schema files into ::Lutaml::Uml::Document
       class XML
+        include Lutaml::Converter::XmiHashToUml
+
         @id_name_mapping_static = {}
         @xmi_root_model_cache_static = {}
 
@@ -98,8 +100,7 @@ module Lutaml
         def parse(xmi_model)
           set_xmi_model(xmi_model)
           serialized_hash = serialize_xmi(xmi_model)
-
-          ::Lutaml::Uml::Document.new(serialized_hash)
+          create_uml_document(serialized_hash)
         end
 
         # @param xmi_model [Lutaml::Model::Serializable]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml
 version: !ruby/object:Gem::Version
-  version: 0.9.39
+  version: 0.9.41
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-08-19 00:00:00.000000000 Z
+date: 2025-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: expressir
@@ -197,7 +197,6 @@ files:
 - ".rubocop.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
-- LUTAML.adoc
 - Makefile
 - README.adoc
 - Rakefile
@@ -206,16 +205,21 @@ files:
 - bin/plantuml2lutaml
 - bin/setup
 - bin/yaml2lutaml
+- docs/lutaml-express.adoc
+- docs/lutaml-sysml.adoc
+- docs/lutaml-uml.adoc
+- docs/lutaml-xmi.adoc
+- docs/lutaml_syntax.adoc
 - exe/lutaml
 - exe/lutaml-sysml
 - exe/lutaml-wsd2uml
 - exe/lutaml-yaml2uml
 - lib/lutaml.rb
 - lib/lutaml/command_line.rb
+- lib/lutaml/converter/dsl_to_uml.rb
+- lib/lutaml/converter/xmi_hash_to_uml.rb
 - lib/lutaml/express.rb
-- lib/lutaml/express/README.adoc
 - lib/lutaml/express/parsers/exp.rb
-- lib/lutaml/express/version.rb
 - lib/lutaml/formatter.rb
 - lib/lutaml/formatter/base.rb
 - lib/lutaml/formatter/graphviz.rb
@@ -223,7 +227,6 @@ files:
 - lib/lutaml/layout/graph_viz_engine.rb
 - lib/lutaml/parser.rb
 - lib/lutaml/sysml.rb
-- lib/lutaml/sysml/README.md
 - lib/lutaml/sysml/allocate.rb
 - lib/lutaml/sysml/allocated.rb
 - lib/lutaml/sysml/binding_connector.rb
@@ -239,34 +242,34 @@ files:
 - lib/lutaml/sysml/test_case.rb
 - lib/lutaml/sysml/trace.rb
 - lib/lutaml/sysml/verify.rb
-- lib/lutaml/sysml/version.rb
 - lib/lutaml/sysml/xmi_file.rb
 - lib/lutaml/uml.rb
-- lib/lutaml/uml/README.adoc
 - lib/lutaml/uml/abstraction.rb
+- lib/lutaml/uml/action.rb
 - lib/lutaml/uml/activity.rb
 - lib/lutaml/uml/actor.rb
 - lib/lutaml/uml/association.rb
 - lib/lutaml/uml/behavior.rb
+- lib/lutaml/uml/cardinality.rb
 - lib/lutaml/uml/class.rb
 - lib/lutaml/uml/classifier.rb
 - lib/lutaml/uml/connector.rb
+- lib/lutaml/uml/connector_end.rb
 - lib/lutaml/uml/constraint.rb
-- lib/lutaml/uml/constructor_end.rb
 - lib/lutaml/uml/data_type.rb
 - lib/lutaml/uml/dependency.rb
 - lib/lutaml/uml/diagram.rb
 - lib/lutaml/uml/document.rb
 - lib/lutaml/uml/enum.rb
 - lib/lutaml/uml/event.rb
+- lib/lutaml/uml/fidelity.rb
 - lib/lutaml/uml/final_state.rb
-- lib/lutaml/uml/formatter.rb
-- lib/lutaml/uml/formatter/base.rb
-- lib/lutaml/uml/formatter/graphviz.rb
+- lib/lutaml/uml/group.rb
 - lib/lutaml/uml/has_attributes.rb
 - lib/lutaml/uml/has_members.rb
 - lib/lutaml/uml/instance.rb
 - lib/lutaml/uml/model.rb
+- lib/lutaml/uml/namespace.rb
 - lib/lutaml/uml/node/base.rb
 - lib/lutaml/uml/node/class_node.rb
 - lib/lutaml/uml/node/class_relationship.rb
@@ -291,11 +294,6 @@ files:
 - lib/lutaml/uml/pseudostate.rb
 - lib/lutaml/uml/realization.rb
 - lib/lutaml/uml/region.rb
-- lib/lutaml/uml/serializers/association.rb
-- lib/lutaml/uml/serializers/base.rb
-- lib/lutaml/uml/serializers/class.rb
-- lib/lutaml/uml/serializers/top_element_attribute.rb
-- lib/lutaml/uml/serializers/yaml_view.rb
 - lib/lutaml/uml/state.rb
 - lib/lutaml/uml/state_machine.rb
 - lib/lutaml/uml/top_element.rb
@@ -303,11 +301,9 @@ files:
 - lib/lutaml/uml/transition.rb
 - lib/lutaml/uml/trigger.rb
 - lib/lutaml/uml/value.rb
-- lib/lutaml/uml/version.rb
 - lib/lutaml/uml/vertex.rb
 - lib/lutaml/version.rb
 - lib/lutaml/xmi.rb
-- lib/lutaml/xmi/README.adoc
 - lib/lutaml/xmi/liquid_drops/association_drop.rb
 - lib/lutaml/xmi/liquid_drops/attribute_drop.rb
 - lib/lutaml/xmi/liquid_drops/cardinality_drop.rb

data/lib/lutaml/express/README.adoc

@@ -1,55 +0,0 @@
-image:https://img.shields.io/gem/v/lutaml-express.svg["Gem Version", link="https://rubygems.org/gems/lutaml-express"]
-// image:https://codeclimate.com/github/lutaml/lutaml-express/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/lutaml/lutaml-express"]
-image:https://github.com/lutaml/lutaml-express/workflows/rake/badge.svg["Build Status", link="https://github.com/lutaml/lutaml-express/actions?workflow=rake"]
-
-= lutaml-express
-
-== Functionality
-
-Gem-extention for lutaml, works with EXPRESS files
-
-=== Installation
-
-With bundler:
-
-[source,ruby]
-----
-# Gemfile
-gem "lutaml-express"
-----
-
-Then in console:
-
-[source,console]
-----
-$ bundle
-----
-
-With RubyGems:
-
-[source,console]
-----
-$ gem install lutaml-express
-----
-
-=== Usage
-
-[source,ruby]
-----
-Lutaml::Express::Parsers::Exp.parse(File.new('/path/to/file.exp')) # => Expressir::Model::Repository
-----
-
-== Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/lutaml-express. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/lutaml-express/blob/master/CODE_OF_CONDUCT.md).
-
-
-== Code of Conduct
-
-Everyone interacting in the Lutaml::Uml project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/lutaml-express/blob/master/CODE_OF_CONDUCT.md).