lutaml 0.9.40 → 0.9.42

data/lib/lutaml/sysml/binding_connector.rb

@@ -1,5 +1,5 @@
 module Lutaml
-  module SysMl
+  module Sysml
     class BindingConnector < Lutaml::Uml::Connector
       attr_accessor :base_connector
     end

data/lib/lutaml/sysml/block.rb

@@ -1,5 +1,5 @@
 module Lutaml
-  module SysMl
+  module Sysml
     class Block < Lutaml::Uml::Class
       attr_accessor :base_class
 

data/lib/lutaml/sysml/constraint_block.rb

@@ -1,5 +1,5 @@
 module Lutaml
-  module SysMl
+  module Sysml
     class ConstraintBlock < Block
       def initialize # rubocop:disable Lint/MissingSuper
         @xmi_id = nil

data/lib/lutaml/sysml/copy.rb

@@ -1,5 +1,5 @@
 module Lutaml
-  module SysMl
+  module Sysml
     class Copy < Trace
     end
   end

data/lib/lutaml/sysml/derive_requirement.rb

@@ -1,5 +1,5 @@
 module Lutaml
-  module SysMl
+  module Sysml
     class DeriveRequirement < Lutaml::Uml::TopElement
       attr_accessor :base_abstraction
     end

data/lib/lutaml/sysml/nested_connector_end.rb

@@ -1,5 +1,5 @@
 module Lutaml
-  module SysMl
+  module Sysml
     class NestedConnectorEnd < Lutaml::Uml::ConnectorEnd
       attr_accessor :base_connectorend, :property_path
 

data/lib/lutaml/sysml/refine.rb

@@ -1,5 +1,5 @@
 module Lutaml
-  module SysMl
+  module Sysml
     class Refine < Lutaml::Uml::TopElement
       attr_accessor :base_abstraction
     end

data/lib/lutaml/sysml/requirement_related.rb

@@ -1,5 +1,5 @@
 module Lutaml
-  module SysMl
+  module Sysml
     class RequirementRelated < Lutaml::Uml::TopElement
       attr_accessor :base_named_element, :satisfies, :refines
     end

data/lib/lutaml/sysml/satisfy.rb

@@ -1,5 +1,5 @@
 module Lutaml
-  module SysMl
+  module Sysml
     class Satisfy < Trace
       attr_accessor :base_realization
     end

data/lib/lutaml/sysml/test_case.rb

@@ -1,5 +1,5 @@
 module Lutaml
-  module SysMl
+  module Sysml
     class TestCase < Lutaml::Uml::TopElement
       attr_accessor :base_behavior, :verifies
 

data/lib/lutaml/sysml/trace.rb

@@ -1,5 +1,5 @@
 module Lutaml
-  module SysMl
+  module Sysml
     class Trace < Lutaml::Uml::TopElement
       attr_accessor :base_abstraction
     end

data/lib/lutaml/sysml/verify.rb

@@ -1,5 +1,5 @@
 module Lutaml
-  module SysMl
+  module Sysml
     class Verify < Trace
     end
   end

data/lib/lutaml/sysml/xmi_file.rb

@@ -1,5 +1,5 @@
 module Lutaml
-  module SysMl
+  module Sysml
     class XmiFile
       attr_accessor :package_list, :model_list, :class_list, :activity_list,
                     :property_list, :port_list,

data/lib/lutaml/sysml.rb

@@ -1,4 +1,3 @@
-require "lutaml/sysml/version"
 require "lutaml/uml"
 require "nokogiri"
 

data/lib/lutaml/uml/association_generalization.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Lutaml
+  module Uml
+    class AssociationGeneralization < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :type, :string
+      attribute :general, :string
+
+      yaml do
+        map "id", to: :id
+        map "type", to: :type
+        map "general", to: :general
+      end
+    end
+  end
+end

data/lib/lutaml/uml/class.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require "lutaml/uml/package"
 require "lutaml/uml/association"
 require "lutaml/uml/constraint"
 require "lutaml/uml/operation"
 require "lutaml/uml/data_type"
+require "lutaml/uml/generalization"
 
 module Lutaml
   module Uml
@@ -13,7 +13,6 @@ module Lutaml
                                              default: -> { [] }
       attribute :is_abstract, :boolean, default: false
       attribute :type, :string
-      attribute :package, Package
       attribute :attributes, TopElementAttribute, collection: true
       attribute :modifier, :string
       attribute :constraints, Constraint, collection: true
@@ -22,12 +21,12 @@ module Lutaml
       attribute :methods, :string, collection: true, default: -> { [] }
 
       attribute :associations, Association, collection: true
+      attribute :generalization, Generalization
 
       yaml do
         map "nested_classifier", to: :nested_classifier
         map "is_abstract", to: :is_abstract
         map "type", to: :type
-        map "package", to: :package
         map "attributes", to: :attributes
         map "modifier", to: :modifier
         map "constraints", to: :constraints

data/lib/lutaml/uml/classifier.rb

@@ -3,10 +3,12 @@
 module Lutaml
   module Uml
     class Classifier < TopElement
-      attribute :generalization, :string, collection: true, default: -> { [] }
+      attribute :association_generalization,
+                ::Lutaml::Uml::AssociationGeneralization,
+                collection: true, default: -> { [] }
 
       yaml do
-        map "generalization", to: :generalization
+        map "generalization", to: :association_generalization
       end
     end
   end

data/lib/lutaml/uml/diagram.rb

@@ -3,6 +3,13 @@
 module Lutaml
   module Uml
     class Diagram < TopElement
+      attribute :package_id, :string
+      attribute :package_name, :string
+
+      yaml do
+        map "package_id", to: :package_id
+        map "package_name", to: :package_name
+      end
     end
   end
 end

data/lib/lutaml/uml/general_attribute.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Lutaml
+  module Uml
+    class GeneralAttribute < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :name, :string
+      attribute :type, :string
+      attribute :xmi_id, :string
+      attribute :is_derived, :boolean, default: false
+      attribute :cardinality, Cardinality
+      attribute :definition, :string
+      attribute :association, :string
+      attribute :has_association, :boolean, default: false
+      attribute :type_ns, :string
+      attribute :name_ns, :string
+      attribute :gen_name, :string
+      attribute :upper_klass, :string
+      attribute :level, :integer
+    end
+  end
+end

data/lib/lutaml/uml/generalization.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Lutaml
+  module Uml
+    class Generalization < Lutaml::Model::Serializable
+      attribute :general_id, :string
+      attribute :general_name, :string
+      attribute :general_attributes,
+                ::Lutaml::Uml::GeneralAttribute,
+                collection: true, default: -> { [] }
+      attribute :general_upper_klass, :string
+      attribute :has_general, :boolean, default: false
+      attribute :general, ::Lutaml::Uml::Generalization
+      attribute :name, :string
+      attribute :type, :string
+      attribute :definition, :string
+      attribute :stereotype, :string
+      attribute :attributes,
+                ::Lutaml::Uml::GeneralAttribute,
+                collection: true, default: -> { [] }
+      attribute :owned_props,
+                ::Lutaml::Uml::GeneralAttribute,
+                collection: true, default: -> { [] }
+      attribute :assoc_props,
+                ::Lutaml::Uml::GeneralAttribute,
+                collection: true, default: -> { [] }
+      attribute :inherited_props,
+                ::Lutaml::Uml::GeneralAttribute,
+                collection: true, default: -> { [] }
+      attribute :inherited_assoc_props,
+                ::Lutaml::Uml::GeneralAttribute,
+                collection: true, default: -> { [] }
+    end
+  end
+end

data/lib/lutaml/uml/top_element_attribute.rb

@@ -15,6 +15,8 @@ module Lutaml
       attribute :is_derived, :boolean, default: false
 
       attribute :definition, :string
+      attribute :association, :string
+      attribute :type_ns, :string
 
       yaml do
         map "name", to: :name
@@ -31,6 +33,8 @@ module Lutaml
         map "definition", to: :definition, with: {
           to: :definition_to_yaml, from: :definition_from_yaml
         }
+        map "association", to: :association
+        map "type_ns", to: :type_ns
       end
 
       def definition_to_yaml(model, doc)

data/lib/lutaml/uml.rb

@@ -10,6 +10,9 @@ require "lutaml/uml/fidelity"
 require "lutaml/uml/top_element"
 require "lutaml/uml/top_element_attribute"
 require "lutaml/uml/value"
+require "lutaml/uml/association_generalization"
+require "lutaml/uml/general_attribute"
+require "lutaml/uml/generalization"
 require "lutaml/uml/action"
 require "lutaml/uml/classifier"
 require "lutaml/uml/dependency"

data/lib/lutaml/version.rb

@@ -1,3 +1,3 @@
 module Lutaml
-  VERSION = "0.9.40".freeze
+  VERSION = "0.9.42".freeze
 end

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

@@ -151,7 +151,7 @@ module Lutaml
         # @param with_gen: [Boolean]
         # @param with_absolute_path: [Boolean]
         # @return [Hash]
-        def build_klass_hash(klass, model, # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+        def build_klass_hash(klass, model, # rubocop:disable Metrics/AbcSize,Metrics/MethodLength,Metrics/CyclomaticComplexity
           with_gen: false, with_absolute_path: false, absolute_path: "")
           klass_hash = {
             xmi_id: klass.id,
@@ -173,6 +173,18 @@ module Lutaml
             klass_hash[:generalization] = serialize_generalization(klass)
           end
 
+          if klass.generalization && !klass.generalization.empty?
+            klass_hash[:association_generalization] = []
+            klass.generalization.each do |gen|
+              association_generalization_hash = {}
+              association_generalization_hash[:id] = gen.id
+              association_generalization_hash[:type] = gen.type
+              association_generalization_hash[:general] = gen.general
+              klass_hash[:association_generalization] <<
+                association_generalization_hash
+            end
+          end
+
           klass_hash
         end
 

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

@@ -4,14 +4,14 @@ require "lutaml/xmi"
 require "xmi"
 require "lutaml/xmi/parsers/xmi_base"
 require "lutaml/uml"
-require "lutaml/converter/xmi_hash_to_uml"
+require "lutaml/converter/xmi_to_uml"
 
 module Lutaml
   module XMI
     module Parsers
       # Class for parsing .xmi schema files into ::Lutaml::Uml::Document
       class XML
-        include Lutaml::Converter::XmiHashToUml
+        include Lutaml::Converter::XmiToUml
 
         @id_name_mapping_static = {}
         @xmi_root_model_cache_static = {}
@@ -99,8 +99,7 @@ module Lutaml
         # @return [Lutaml::Uml::Document]
         def parse(xmi_model)
           set_xmi_model(xmi_model)
-          serialized_hash = serialize_xmi(xmi_model)
-          create_uml_document(serialized_hash)
+          create_uml_document(xmi_model)
         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.40
+  version: 0.9.42
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-08-21 00:00:00.000000000 Z
+date: 2025-10-03 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,7 +205,11 @@ files:
 - bin/plantuml2lutaml
 - bin/setup
 - bin/yaml2lutaml
-- docs/UML_README.adoc
+- 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
@@ -214,11 +217,9 @@ files:
 - 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/converter/xmi_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
@@ -226,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
@@ -242,7 +242,6 @@ 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/abstraction.rb
@@ -250,6 +249,7 @@ files:
 - lib/lutaml/uml/activity.rb
 - lib/lutaml/uml/actor.rb
 - lib/lutaml/uml/association.rb
+- lib/lutaml/uml/association_generalization.rb
 - lib/lutaml/uml/behavior.rb
 - lib/lutaml/uml/cardinality.rb
 - lib/lutaml/uml/class.rb
@@ -265,6 +265,8 @@ files:
 - lib/lutaml/uml/event.rb
 - lib/lutaml/uml/fidelity.rb
 - lib/lutaml/uml/final_state.rb
+- lib/lutaml/uml/general_attribute.rb
+- lib/lutaml/uml/generalization.rb
 - lib/lutaml/uml/group.rb
 - lib/lutaml/uml/has_attributes.rb
 - lib/lutaml/uml/has_members.rb
@@ -305,7 +307,6 @@ files:
 - 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/docs/UML_README.adoc

@@ -1,44 +0,0 @@
-# Lutaml::Uml
-
-image:https://badge.fury.io/rb/lutaml-uml.svg["Gem Version", link="https://badge.fury.io/rb/lutaml-uml"]
-
-image:https://github.com/lutaml/lutaml-uml/actions/workflows/macos.yml/badge.svg["macos", link="https://github.com/lutaml/lutaml-uml/actions/workflows/macos.yml"]
-image:https://github.com/lutaml/lutaml-uml/actions/workflows/ubuntu.yml/badge.svg["ubuntu", link="https://github.com/lutaml/lutaml-uml/actions/workflows/ubuntu.yml"]
-image:https://github.com/lutaml/lutaml-uml/actions/workflows/windows.yml/badge.svg["windows", link="https://github.com/lutaml/lutaml-uml/actions/workflows/windows.yml"]
-
-Lutaml is a language for specifying UML class diagrams and a tool for converting it into various different formats.
-
-## Install
-
-### Bundler: `gem "lutaml-uml"`
-
-### RubyGems: `gem install lutaml-uml`
-
-## Language
-
-See link:LUTAML.adoc[LUTAML.adoc]
-
-## Usage
-
-Converter executables are available:
-
-* PlantUML WSD to LutaML UML: `lutaml-wsd2uml`
-* LutaML YAML to LutaML UML: `lutaml-yaml2uml`
-
-EXAMPLE: `lutaml-wsd2uml mn/metanorma-model-standoc/models/StandardDoc_Blocks_New.wsd`
-
-
-## 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-uml. 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-uml/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-uml/blob/master/CODE_OF_CONDUCT.md).