lutaml 0.9.34 → 0.9.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d209094b579492db86b7f110e3cca4a8c5e14b21107b55d901beb42ed5bf6cf8
-  data.tar.gz: 5e01c3afabf5acfd93274763419c42a4bf90055d48b4e9eb6a66c462a768bdad
+  metadata.gz: ca966781f52ce9978f570ef4a2eaaccaf50cc58afae2b0f58767700983becbe1
+  data.tar.gz: '08378b29643e433382e78eb49fdb836309fab0750f3f8491542c1bc4b084fc2e'
 SHA512:
-  metadata.gz: 81f816d09ac98a2c129b8864487ea0783ca4d794af29735c4ca71983f0235548d076d1e7bce046a7d30ae65257be195900ae299936e224704cb94d0f03950de8
-  data.tar.gz: bf7a607d36342a5f44c38722f049f7516eb40dc3374248623c2cf528ea24a4db36dddf6ee9c8e3fcc4c556ad3b942dae8e9fa7d02be0104a596ac24d8b11bbf9
+  metadata.gz: 6f631a08c0e17860697147994b5f588ec2ced711f9660c83d3c8a6026bbf9f0f551c35e0d460734383caa733f29db4963a64ffb6934e79fb95e03cf46e8b57d0
+  data.tar.gz: 0150c791377dbc0a1d045f8b52124c9a956b8357001c572a533a29b99eb322146706b50f4c0c4a87c1712f27e19a28fca6dcb35f3ca7d8048b7ebc280edcfcbd

data/lib/lutaml/version.rb

@@ -1,3 +1,3 @@
 module Lutaml
-  VERSION = "0.9.34".freeze
+  VERSION = "0.9.35".freeze
 end

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

@@ -28,6 +28,14 @@ module Lutaml
         @model&.documentation&.value
       end
 
+      def ea_type
+        @model&.properties&.ea_type
+      end
+
+      def direction
+        @model&.properties&.direction
+      end
+
       def source
         ::Lutaml::XMI::SourceTargetDrop.new(@model.source)
       end

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

@@ -72,9 +72,14 @@ module Lutaml
       def associations # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/MethodLength
         return if !@matched_element ||
           !@matched_element.links ||
-          @matched_element.links.association.empty?
+          (
+            @matched_element.links.association.empty? &&
+            @matched_element.links.generalization.empty?
+          )
 
-        @matched_element.links.association.map do |assoc|
+        links = @matched_element.links.association +
+          @matched_element.links.generalization
+        links.map do |assoc|
           link_member = assoc.start == xmi_id ? "end" : "start"
           link_owner_name = link_member == "start" ? "end" : "start"
 

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

@@ -585,7 +585,9 @@ module Lutaml
           when "NoteLink"
             return
           when "Generalization"
-            return generalization_association(owner_xmi_id, link)
+            owner_end, _owner_end_type, _owner_xmi_id =
+              generalization_association(owner_xmi_id, link)
+            return owner_end
           end
 
           xmi_id = link.send(linke_owner_name.to_sym)
@@ -623,7 +625,7 @@ module Lutaml
           end
 
           member_end = member_end_name(xmi_id, source_or_target, link.name)
-          [member_end, xmi_id]
+          [member_end, "aggregation", xmi_id]
         end
 
         # @param xmi_id [String]
@@ -648,8 +650,9 @@ module Lutaml
         # @param link [Lutaml::Model::Serializable]
         # @param link_member_name [String]
         # @return [Array<String, String, Hash, String, String>]
-        def serialize_member_type(owner_xmi_id, link, link_member_name) # rubocop:disable Metrics/MethodLength
-          member_end, xmi_id = serialize_member_end(owner_xmi_id, link)
+        def serialize_member_type(owner_xmi_id, link, link_member_name) # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
+          member_end, member_end_type, xmi_id =
+            serialize_member_end(owner_xmi_id, link)
 
           if link.name == "Association"
             connector_type = link_member_name == "start" ? "source" : "target"
@@ -664,7 +667,7 @@ module Lutaml
             member_end = fetch_connector_name(link.id)
           end
 
-          [member_end, "aggregation", member_end_cardinality,
+          [member_end, member_end_type, member_end_cardinality,
            member_end_attribute_name, xmi_id]
         end
 
@@ -714,10 +717,10 @@ module Lutaml
 
           member_end = member_end_name(xmi_id, source_or_target, link.name)
 
-          member_end_cardinality, _member_end_attribute_name =
-            fetch_owned_attribute_node(xmi_id)
-
-          [member_end, member_end_type, member_end_cardinality, nil, xmi_id]
+          # member_end_cardinality, _member_end_attribute_name =
+          #   fetch_owned_attribute_node(xmi_id)
+          # [member_end, member_end_type, member_end_cardinality, nil, xmi_id]
+          [member_end, member_end_type, xmi_id]
         end
 
         # Multiple items if search type is idref.  Should search association?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml
 version: !ruby/object:Gem::Version
-  version: 0.9.34
+  version: 0.9.35
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-06-26 00:00:00.000000000 Z
+date: 2025-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: expressir