lutaml 0.9.18 → 0.9.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a78a8cd7a54dcb75279728cff484e7a8bfcbc3258f8a8ee155a2368ce21ade87
-  data.tar.gz: 823a52c70df804f61e430d143471daf3580f271331e02306501f06925ed55346
+  metadata.gz: 73252a1880283e31b2954654b4e046f1eda11e43eb3bd4eaf75e5e066ddaf539
+  data.tar.gz: 0e189f762028fe432169d63a19755f1fea34ca22575beb454bbdcbe46219bf4e
 SHA512:
-  metadata.gz: 0466df4efa98e478bbfdb1e5739425bd02b59e20d8c780d3caea203ce87e99183a5c8f003c6418a76be7dc0abb0346a57403b7b7fde9b6d11f2810186f24ce4f
-  data.tar.gz: 2c342890469f5022c5d3040e9ca7f2c7dbe302f339356458fb62558c6da382c7281133acc344a1de9649815bca5ea0175265aae1eaf7373c44c87ed3f51acd57
+  metadata.gz: 99014430718d84a8e56361b06962ddeb75ba369e05d54d53a1b55d181ba681c4a3d04c5a31c40e1142ca4621e91a063e3ac7767d6feb859d276f6cd23406cb56
+  data.tar.gz: e484203747c7501e8ec17ae454e72ffeba6fdf72d29edf673ddb6274ae9925435fe8e6389014b463635f45debecba9ca4c5cb96e4865a211589bb3b3a4a37679

data/lib/lutaml/version.rb

@@ -1,3 +1,3 @@
 module Lutaml
-  VERSION = "0.9.18".freeze
+  VERSION = "0.9.20".freeze
 end

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

@@ -3,7 +3,7 @@
 module Lutaml
   module XMI
     class GeneralizationAttributeDrop < Liquid::Drop
-      def initialize(attr, upper_klass, gen_name, guidance = nil) # rubocop:disable Lint/MissingSuper
+      def initialize(attr, upper_klass, gen_name, guidance = nil) # rubocop:disable Lint/MissingSuper,Metrics/ParameterLists,Layout/LineLength
         @attr = attr
         @upper_klass = upper_klass
         @gen_name = gen_name
@@ -26,7 +26,7 @@ module Lutaml
         @attr[:xmi_id]
       end
 
-      def is_derived
+      def is_derived # rubocop:disable Naming/PredicateName
         @attr[:is_derived]
       end
 
@@ -59,15 +59,7 @@ module Lutaml
       end
 
       def name_ns
-        name_ns = case @attr[:type_ns]
-                  when "core", "gml"
-                    upper_klass
-                  else
-                    @attr[:type_ns]
-                  end
-
-        name_ns = upper_klass if name_ns.nil?
-        name_ns
+        @attr[:name_ns]
       end
 
       def used?

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

@@ -32,10 +32,19 @@ module Lutaml
       end
 
       def attributes
-        @gen[:general_attributes]
-        # @gen[:general_attributes].map do |attr|
-        #   GeneralizationAttributeDrop.new(attr, upper_klass, name)
-        # end
+        attrs = @gen[:general_attributes]
+        attrs.each do |i|
+          name_ns = case i[:type_ns]
+                    when "core", "gml"
+                      upper_klass
+                    else
+                      i[:type_ns]
+                    end
+          name_ns = upper_klass if name_ns.nil?
+
+          i[:name_ns] = name_ns
+          i[:name] = "" if i[:name].nil?
+        end
       end
 
       def type
@@ -51,53 +60,112 @@ module Lutaml
       end
 
       # get attributes without association
-      def owned_props
-        attributes.select do |attr|
-          attr[:association].nil?
-        end.map do |attr|
-          GeneralizationAttributeDrop.new(attr, upper_klass, name, @guidance)
-        end
+      def owned_props(sort: false)
+        return [] unless attributes
+
+        props = attributes.select { |attr| attr[:association].nil? }
+        props = sort_props(props) if sort
+        props_to_liquid(props)
       end
 
       # get attributes with association
-      def assoc_props
-        attributes.select do |attr|
-          attr[:association]
-        end.map do |attr|
+      def assoc_props(sort: false)
+        return [] unless attributes
+
+        props = attributes.select { |attr| attr[:association].nil? == false }
+        props = sort_props(props) if sort
+        props_to_liquid(props)
+      end
+
+      def props_to_liquid(props)
+        props.map do |attr|
           GeneralizationAttributeDrop.new(attr, upper_klass, name, @guidance)
         end
       end
 
       # get items without association by looping through the generation
-      def inherited_props
+      def inherited_props(sort: false)
         loop_general_item unless @looped_general_item
 
-        @inherited_props.reverse
+        props = @inherited_props.reverse
+        props = sort_props_with_level(props) if sort
+        props_hash_to_liquid(props)
       end
 
       # get items with association by looping through the generation
-      def inherited_assoc_props
+      def inherited_assoc_props(sort: false)
         loop_general_item unless @looped_general_item
 
-        @inherited_assoc_props.reverse
+        props = @inherited_assoc_props.reverse
+        props = sort_props_with_level(props) if sort
+        props_hash_to_liquid(props)
+      end
+
+      def sort_props_with_level(arr)
+        return [] if arr.nil? || arr.empty?
+
+        # level desc, name_ns asc, name asc
+        arr.sort_by { |i| [-i[:level], i[:attr][:name_ns], i[:attr][:name]] }
+      end
+
+      def props_hash_to_liquid(prop_hash_arr)
+        prop_hash_arr.map do |prop_hash|
+          GeneralizationAttributeDrop.new(
+            prop_hash[:attr],
+            prop_hash[:gen_upper_klass],
+            prop_hash[:gen_name],
+            prop_hash[:guidance],
+          )
+        end
+      end
+
+      def sorted_owned_props
+        owned_props(sort: true)
+      end
+
+      def sorted_assoc_props
+        assoc_props(sort: true)
       end
 
-      def loop_general_item # rubocop:disable Metrics/MethodLength
+      def sorted_inherited_props
+        inherited_props(sort: true)
+      end
+
+      def sorted_inherited_assoc_props
+        inherited_assoc_props(sort: true)
+      end
+
+      def sort_props(arr)
+        return [] if arr.nil? || arr.empty?
+
+        arr.sort_by { |i| [i[:name_ns], i[:name]] }
+      end
+
+      def loop_general_item # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
         general_item = general
+        level = 0
+
         while general_item.has_general?
           gen_upper_klass = general_item.upper_klass
           gen_name = general_item.name
           # reverse the order to show super class first
           general_item.attributes.reverse_each do |attr|
-            attr_drop = GeneralizationAttributeDrop.new(attr, gen_upper_klass,
-                                                        gen_name, @guidance)
+            attr_hash = {
+              attr: attr,
+              gen_upper_klass: gen_upper_klass,
+              gen_name: gen_name,
+              guidance: @guidance,
+            }
+            attr_hash[:level] = level
+
             if attr[:association]
-              @inherited_assoc_props << attr_drop
+              @inherited_assoc_props << attr_hash
             else
-              @inherited_props << attr_drop
+              @inherited_props << attr_hash
             end
           end
 
+          level += 1
           general_item = general_item.general
         end
 

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

@@ -262,8 +262,7 @@ module Lutaml
         # @param general_node [Shale::Mapper]
         # @return [Hash]
         def get_general_attributes(general_node)
-          attrs = serialize_class_attributes(general_node, with_assoc: true)
-          attrs.sort_by { |i| i[:name].to_s }
+          serialize_class_attributes(general_node, with_assoc: true)
         end
 
         # @param general_node [Shale::Mapper]

metadata

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