lutaml 0.9.15 → 0.9.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4906fb3fd07954b14085e4d257c3bb856e4ca6618c60ff96dc8b0ad6c5bdb8f5
-  data.tar.gz: c4ce20e928cf6a3b0ef7b39cae68f1f384490807638d14ba500f2d2fc6180631
+  metadata.gz: 93f9a0221445cede27f5be5af6f7f4d71071180dbb4feb400fc173b7c52f9b1a
+  data.tar.gz: 446307e5c65bd65f6b891b50ab1c0383008c5ccc8e8b9c49cb131ea18cf4ce5b
 SHA512:
-  metadata.gz: b586629aaf671856673871f267b9622814180d2df17aa068fa70656461a038fb33658f19d604233b5ea87c2f21f2d3f9cc70ff4cb4e1ee60829c050ae651ea9a
-  data.tar.gz: 8b32d8fb46594d2602d8c6b5a8cfbbcfab5c039d981197ee0ca087e1effb89734c389947f62dde568f5f22bf74153099d103bd1f7b211e805558ed521bb315da
+  metadata.gz: 364b04c40839d9da343e9c8d4fe9a7b950ad37f6ed1e893c5bcd44fafd80ef6d4cdcbe9eac387e4f8f50a230489dc3e9c6129f4bf151d95045e7b6c01a4de565
+  data.tar.gz: 425d8bdab371363eac85459c753aadd278a199a47a8f60e7390d419b6cb06afefa85d2dd13be54de3976f21857f8a244fe8e94faf8dfabaf4b10441146367281

data/lib/lutaml/formatter/graphviz.rb

@@ -189,7 +189,7 @@ module Lutaml
       def format_label(name, cardinality = {})
         res = "+#{name}"
         if cardinality.nil? ||
-            (cardinality["min"].nil? || cardinality["max"].nil?)
+            (cardinality[:min].nil? || cardinality[:max].nil?)
           return res
         end
 

data/lib/lutaml/uml/formatter/graphviz.rb

@@ -148,13 +148,13 @@ module Lutaml
           if node.owner_end_attribute_name
             attributes["headlabel"] = format_label(
               node.owner_end_attribute_name,
-              node.owner_end_cardinality
+              node.owner_end_cardinality,
             )
           end
           if node.member_end_attribute_name
             attributes["taillabel"] = format_label(
               node.member_end_attribute_name,
-              node.member_end_cardinality
+              node.member_end_cardinality,
             )
           end
 
@@ -192,7 +192,7 @@ module Lutaml
         def format_label(name, cardinality = {})
           res = "+#{name}"
           if cardinality.nil? ||
-              (cardinality["min"].nil? || cardinality["max"].nil?)
+              (cardinality[:min].nil? || cardinality[:max].nil?)
             return res
           end
 

data/lib/lutaml/version.rb

@@ -1,3 +1,3 @@
 module Lutaml
-  VERSION = "0.9.15".freeze
+  VERSION = "0.9.17".freeze
 end

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

@@ -8,11 +8,11 @@ module Lutaml
       end
 
       def min
-        @model["min"]
+        @model[:min]
       end
 
       def max
-        @model["max"]
+        @model[:max]
       end
     end
   end

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

@@ -3,11 +3,6 @@
 module Lutaml
   module XMI
     class GeneralizationAttributeDrop < Liquid::Drop
-      LOWER_VALUE_MAPPINGS = {
-        "C" => "0",
-        "M" => "1",
-      }.freeze
-
       def initialize(attr, upper_klass, gen_name) # rubocop:disable Lint/MissingSuper
         @attr = attr
         @upper_klass = upper_klass
@@ -35,18 +30,7 @@ module Lutaml
       end
 
       def cardinality
-        min = @attr[:cardinality]["min"]
-        min = min.nil? ? nil : LOWER_VALUE_MAPPINGS[min]
-
-        "#{min}..#{@attr[:cardinality]['max']}"
-      end
-
-      def min_cardinality
-        @attr[:cardinality]["min"]
-      end
-
-      def max_cardinality
-        @attr[:cardinality]["max"]
+        ::Lutaml::XMI::CardinalityDrop.new(@attr[:cardinality])
       end
 
       def definition

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

@@ -27,7 +27,7 @@ module Lutaml
       end
 
       def has_general?
-        !@gen[:general].empty?
+        !!@gen[:general]
       end
 
       def attributes

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

@@ -10,10 +10,6 @@ module Lutaml
     module Parsers
       # Class for parsing .xmi schema files into ::Lutaml::Uml::Document
       class XML
-        LOWER_VALUE_MAPPINGS = {
-          "0" => "C",
-          "1" => "M",
-        }.freeze
         attr_reader :xmi_cache, :xmi_root_model
 
         class << self
@@ -255,11 +251,10 @@ module Lutaml
         end
 
         # @param general_node [Shale::Mapper]
-        # # @return [Hash]
+        # @return [Hash]
         def get_general_attributes(general_node)
-          serialize_class_attributes(general_node, with_assoc: true)
-          # turn on sorting if necessary
-          # attrs.sort_by { |i| i[:name] }
+          attrs = serialize_class_attributes(general_node, with_assoc: true)
+          attrs.sort_by { |i| i[:name].to_s }
         end
 
         # @param general_node [Shale::Mapper]
@@ -767,20 +762,11 @@ module Lutaml
         # @return [Hash]
         def cardinality_min_max_value(min, max)
           {
-            "min" => cardinality_value(min, true),
-            "max" => cardinality_value(max, false),
+            min: min,
+            max: max,
           }
         end
 
-        # @param value [String]
-        # @param is_min [Boolean]
-        # @return [String]
-        def cardinality_value(value, is_min = false)
-          return unless value
-
-          is_min ? LOWER_VALUE_MAPPINGS[value.to_s] : value
-        end
-
         # @node [Shale::Mapper]
         # @attr_name [String]
         # @return [String]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml
 version: !ruby/object:Gem::Version
-  version: 0.9.15
+  version: 0.9.17
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-10-04 00:00:00.000000000 Z
+date: 2024-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid