lutaml 0.9.22 → 0.9.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8a04369340abee752a7fd1b241302fd0eff0f8c273e9723d818f03b7c38f42f
-  data.tar.gz: 0170f7a02d5f4a097217657825d7301ac277f601d7b5ca713a65ae6bc8b5d31f
+  metadata.gz: 19fd561389d0337b037854de3e9e1e3d6ec212299c9a62af17f90195972b2403
+  data.tar.gz: 7722f61ff3b0d5b362bdcc5a7c63ade823edfd12c63b82d7c974915429392fa1
 SHA512:
-  metadata.gz: 0d6394b187e9b3941f274259705ffd1e13ba98ffbc1c2a17079d1ef42bea8f119db028768471b2b4076a2222420cf4f93023a2c002578624b9a10f50531b794e
-  data.tar.gz: ca20d68f282ba839e82744a90cee46b169b3528e02dc3c7ba10be51018cfdfa3617fd6c0fefedc51089d1f382bfdeb372e6ecda2e0c469bb099fcd886b4f1faf
+  metadata.gz: 5993e7dce5923f0560479ecd92bdb5b7181c22c21dc41165f9448aeb6d83dac4da78aed76a77eaa65b6afae9f045c032958db9ea55638ce41b5188870231cdb0
+  data.tar.gz: c9b002cbd79894f25c4edf397d645190734e3352bf95477334ef973cb6d5420b8afb779f53cb929c29033aa31430db33b18259db4a069b56591a1d46ed3da08d

data/lib/lutaml/version.rb

@@ -1,3 +1,3 @@
 module Lutaml
-  VERSION = "0.9.22".freeze
+  VERSION = "0.9.24".freeze
 end

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

@@ -7,11 +7,9 @@ module Lutaml
         @model = model
         @guidance = guidance
 
-        if guidance && guidance["classes"].map do |c|
-          c["name"]
-        end.include?(@model[:name])
+        if guidance
           @klass_guidance = guidance["classes"].find do |klass|
-            klass["name"] == @model[:name]
+            klass["name"] == name || klass["name"] == absolute_path
           end
         end
       end
@@ -24,6 +22,10 @@ module Lutaml
         @model[:name]
       end
 
+      def absolute_path
+        "#{@model[:absolute_path]}::#{name}"
+      end
+
       def package
         ::Lutaml::XMI::PackageDrop.new(@model[:package], @guidance)
       end

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

@@ -6,6 +6,7 @@ module Lutaml
       def initialize(model, guidance = nil) # rubocop:disable Lint/MissingSuper
         @model = model
         @guidance = guidance
+
         @children_packages ||= packages.map do |pkg|
           [pkg, pkg.packages, pkg.packages.map(&:children_packages)]
         end.flatten.uniq
@@ -19,6 +20,10 @@ module Lutaml
         @model[:name]
       end
 
+      def absolute_path
+        @model[:absolute_path]
+      end
+
       def klasses
         @model[:classes].map do |klass|
           ::Lutaml::XMI::KlassDrop.new(klass, @guidance)

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

@@ -70,17 +70,28 @@ module Lutaml
         end
 
         # @param xmi_model [Shale::Mapper]
+        # @param with_gen: [Boolean]
+        # @param with_absolute_path: [Boolean]
         # return [Hash]
-        def serialize_xmi(xmi_model, with_gen: false)
+        def serialize_xmi(xmi_model, with_gen: false, with_absolute_path: false)
           set_xmi_model(xmi_model)
-          serialize_to_hash(xmi_model, with_gen: with_gen)
+          serialize_to_hash(
+            xmi_model,
+            with_gen: with_gen,
+            with_absolute_path: with_absolute_path,
+          )
         end
 
         # @param xmi_model [Shale::Mapper]
+        # @param guidance_yaml [String]
         # return [Liquid::Drop]
         def serialize_xmi_to_liquid(xmi_model, guidance_yaml = nil)
           set_xmi_model(xmi_model)
-          serialized_hash = serialize_xmi(xmi_model, with_gen: true)
+          serialized_hash = serialize_xmi(
+            xmi_model,
+            with_gen: true,
+            with_absolute_path: true,
+          )
           guidance = get_guidance(guidance_yaml)
           ::Lutaml::XMI::RootDrop.new(serialized_hash, guidance)
         end
@@ -110,38 +121,67 @@ module Lutaml
         private
 
         # @param xmi_model [Shale::Mapper]
+        # @param with_gen: [Boolean]
+        # @param with_absolute_path: [Boolean]
         # @return [Hash]
         # @note xpath: //uml:Model[@xmi:type="uml:Model"]
-        def serialize_to_hash(xmi_model, with_gen: false)
+        def serialize_to_hash(xmi_model,
+          with_gen: false, with_absolute_path: false)
           model = xmi_model.model
           {
             name: model.name,
-            packages: serialize_model_packages(model, with_gen: with_gen),
+            packages: serialize_model_packages(
+              model,
+              with_gen: with_gen,
+              with_absolute_path: with_absolute_path,
+            ),
           }
         end
 
         # @param model [Shale::Mapper]
         # @param with_gen: [Boolean]
+        # @param with_absolute_path: [Boolean]
+        # @param absolute_path: [String]
         # @return [Array<Hash>]
         # @note xpath ./packagedElement[@xmi:type="uml:Package"]
-        def serialize_model_packages(model, with_gen: false) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+        def serialize_model_packages(model, # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+          with_gen: false, with_absolute_path: false, absolute_path: "")
           packages = model.packaged_element.select do |e|
             e.type?("uml:Package")
           end
 
+          if with_absolute_path
+            absolute_path = "#{absolute_path}::#{model.name}"
+          end
+
           packages.map do |package|
-            {
+            h = {
               xmi_id: package.id,
               name: get_package_name(package),
-              classes: serialize_model_classes(package, model,
-                                               with_gen: with_gen),
+              classes: serialize_model_classes(
+                package, model,
+                with_gen: with_gen,
+                with_absolute_path: with_absolute_path,
+                absolute_path: "#{absolute_path}::#{package.name}"
+              ),
               enums: serialize_model_enums(package),
               data_types: serialize_model_data_types(package),
               diagrams: serialize_model_diagrams(package.id),
-              packages: serialize_model_packages(package, with_gen: with_gen),
+              packages: serialize_model_packages(
+                package,
+                with_gen: with_gen,
+                with_absolute_path: with_absolute_path,
+                absolute_path: absolute_path,
+              ),
               definition: doc_node_attribute_value(package.id, "documentation"),
               stereotype: doc_node_attribute_value(package.id, "stereotype"),
             }
+
+            if with_absolute_path
+              h[:absolute_path] = "#{absolute_path}::#{package.name}"
+            end
+
+            h
           end
         end
 
@@ -162,28 +202,36 @@ module Lutaml
         # @param package [Shale::Mapper]
         # @param model [Shale::Mapper]
         # @param with_gen: [Boolean]
+        # @param with_absolute_path: [Boolean]
         # @return [Array<Hash>]
         # @note xpath ./packagedElement[@xmi:type="uml:Class" or
         #                               @xmi:type="uml:AssociationClass"]
-        def serialize_model_classes(package, model, with_gen: false) # rubocop:disable Metrics/MethodLength
+        def serialize_model_classes(package, model, # rubocop:disable Metrics/MethodLength
+          with_gen: false, with_absolute_path: false, absolute_path: "")
           klasses = package.packaged_element.select do |e|
             e.type?("uml:Class") || e.type?("uml:AssociationClass") ||
               e.type?("uml:Interface")
           end
 
           klasses.map do |klass|
-            build_klass_hash(
+            h = build_klass_hash(
               klass, model,
               with_gen: with_gen
             )
+
+            h[:absolute_path] = absolute_path if with_absolute_path
+
+            h
           end
         end
 
         # @param klass [Shale::Mapper]
         # @param model [Shale::Mapper]
         # @param with_gen: [Boolean]
+        # @param with_absolute_path: [Boolean]
         # @return [Hash]
-        def build_klass_hash(klass, model, with_gen: false) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+        def build_klass_hash(klass, model, # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+          with_gen: false, with_absolute_path: false, absolute_path: "")
           klass_hash = {
             xmi_id: klass.id,
             name: klass.name,
@@ -198,6 +246,8 @@ module Lutaml
             stereotype: doc_node_attribute_value(klass.id, "stereotype"),
           }
 
+          klass_hash[:absolute_path] = absolute_path if with_absolute_path
+
           if with_gen && klass.type?("uml:Class")
             klass_hash[:generalization] = serialize_generalization(klass)
           end

data/lutaml.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.7.0"
 
-  spec.add_dependency "expressir", "~> 1.3"
+  spec.add_dependency "expressir", "~> 2.1.0"
   spec.add_dependency "hashie", "~> 4.1.0"
   spec.add_dependency "htmlentities"
   spec.add_dependency "liquid"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml
 version: !ruby/object:Gem::Version
-  version: 0.9.22
+  version: 0.9.24
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-11-13 00:00:00.000000000 Z
+date: 2024-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: expressir
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement