lutaml 0.9.24 → 0.9.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19fd561389d0337b037854de3e9e1e3d6ec212299c9a62af17f90195972b2403
-  data.tar.gz: 7722f61ff3b0d5b362bdcc5a7c63ade823edfd12c63b82d7c974915429392fa1
+  metadata.gz: 63135b601a74ae7525807e9b57974a2db686e49f6e6992918e7d209bdbf27460
+  data.tar.gz: 529878c2d79c6f35130ef8c34eb5223d16c46a10f96cf470e43c8563457491a8
 SHA512:
-  metadata.gz: 5993e7dce5923f0560479ecd92bdb5b7181c22c21dc41165f9448aeb6d83dac4da78aed76a77eaa65b6afae9f045c032958db9ea55638ce41b5188870231cdb0
-  data.tar.gz: c9b002cbd79894f25c4edf397d645190734e3352bf95477334ef973cb6d5420b8afb779f53cb929c29033aa31430db33b18259db4a069b56591a1d46ed3da08d
+  metadata.gz: e70e2318f24f4a6c6beccdd8c6db99f8674ab92b7763a398ffc3b2617b6a44b2ef2b431fa039d5cabe58719d7660c96f2bde96c3dc8ecfc9fd904de7ac025cc9
+  data.tar.gz: 61f20ab2448dfaf836a698b1596ec0685f3d90380bcf2829e08ebda2f7b39dffddb9b0913609ccb682df77a66d2ada3f69e90071556a422a973eda5784942732

data/lib/lutaml/version.rb

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

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

@@ -18,6 +18,14 @@ module Lutaml
       def definition
         @model[:definition]
       end
+
+      def package_id
+        @model[:package_id]
+      end
+
+      def package_name
+        @model[:package_name]
+      end
     end
   end
 end

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

@@ -154,7 +154,7 @@ module Lutaml
             absolute_path = "#{absolute_path}::#{model.name}"
           end
 
-          packages.map do |package|
+          packages.map do |package| # rubocop:disable Metrics/BlockLength
             h = {
               xmi_id: package.id,
               name: get_package_name(package),
@@ -166,7 +166,10 @@ module Lutaml
               ),
               enums: serialize_model_enums(package),
               data_types: serialize_model_data_types(package),
-              diagrams: serialize_model_diagrams(package.id),
+              diagrams: serialize_model_diagrams(
+                package.id,
+                with_package: with_gen,
+              ),
               packages: serialize_model_packages(
                 package,
                 with_gen: with_gen,
@@ -508,17 +511,25 @@ module Lutaml
         # @param node_id [String]
         # @return [Array<Hash>]
         # @note xpath %(//diagrams/diagram/model[@package="#{node['xmi:id']}"])
-        def serialize_model_diagrams(node_id)
+        def serialize_model_diagrams(node_id, with_package: false) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
           diagrams = @xmi_root_model.extension.diagrams.diagram.select do |d|
             d.model.package == node_id
           end
 
           diagrams.map do |diagram|
-            {
+            h = {
               xmi_id: diagram.id,
               name: diagram.properties.name,
               definition: diagram.properties.documentation,
             }
+
+            if with_package
+              package_id = diagram.model.package
+              h[:package_id] = package_id
+              h[:package_name] = find_packaged_element_by_id(package_id)&.name
+            end
+
+            h
           end
         end
 
@@ -806,7 +817,7 @@ module Lutaml
               if with_assoc && oa.association
                 attrs[:association] = oa.association
                 attrs[:definition] = loopup_assoc_def(oa.association)
-                attrs[:type_ns] = get_ns_by_type(attrs[:type])
+                attrs[:type_ns] = get_ns_by_xmi_id(attrs[:xmi_id])
               end
 
               attrs
@@ -868,6 +879,17 @@ module Lutaml
           find_upper_level_packaged_element(p.id)
         end
 
+        # @param xmi_id [String]
+        # @return [String]
+        def get_ns_by_xmi_id(xmi_id)
+          return unless xmi_id
+
+          p = find_packaged_element_by_id(xmi_id)
+          return unless p
+
+          find_upper_level_packaged_element(p.id)
+        end
+
         # @param klass_id [String]
         # @return [Array<Hash>]
         def build_class_attributes(owned_attr) # rubocop:disable Metrics/MethodLength

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml
 version: !ruby/object:Gem::Version
-  version: 0.9.24
+  version: 0.9.26
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-20 00:00:00.000000000 Z
+date: 2025-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: expressir
@@ -411,7 +411,7 @@ metadata:
   source_code_uri: https://github.com/lutaml/lutaml
   changelog_uri: https://github.com/lutaml/lutaml/releases
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -427,7 +427,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.27
-signing_key: 
+signing_key:
 specification_version: 4
 summary: 'LutaML: data models in textual form'
 test_files: []