lutaml 0.9.39 → 0.9.41

data/lib/lutaml/formatter/base.rb

@@ -40,27 +40,27 @@ module Lutaml
 
       def format(node) # rubocop:disable Metrics/CyclomaticComplexity
         case node
-        when ::Lutaml::Uml::Node::Field then format_field(node)
+        when ::Lutaml::Uml::Node::Field  then format_field(node)
         when ::Lutaml::Uml::Node::Method then format_method(node)
         when ::Lutaml::Uml::Node::Relationship then format_relationship(node)
         when ::Lutaml::Uml::Node::ClassRelationship
           format_class_relationship(node)
         when ::Lutaml::Uml::Node::ClassNode then format_class(node)
-        when Lutaml::Uml::Document then format_document(node)
+        when ::Lutaml::Uml::Document then format_document(node)
         end
       end
 
-      def format_field(_node); raise NotImplementedError; end
+      def format_field(_node);              raise NotImplementedError; end
 
-      def format_method(_node); raise NotImplementedError; end
+      def format_method(_node);             raise NotImplementedError; end
 
-      def format_relationship(_node); raise NotImplementedError; end
+      def format_relationship(_node);       raise NotImplementedError; end
 
       def format_class_relationship(_node); raise NotImplementedError; end
 
-      def format_class(_node); raise NotImplementedError; end
+      def format_class(_node);              raise NotImplementedError; end
 
-      def format_document(_node); raise NotImplementedError; end
+      def format_document(_node);           raise NotImplementedError; end
     end
   end
 end

data/lib/lutaml/formatter/graphviz.rb

@@ -95,7 +95,8 @@ module Lutaml
           result += " : #{keyword}#{node.type}"
         end
         if node.cardinality
-          result += "[#{node.cardinality['min']}..#{node.cardinality['max']}]"
+          result += "[#{node.cardinality.min}.." \
+                    "#{node.cardinality.max}]"
         end
         result = escape_html_chars(result)
         result = "<U>#{result}</U>" if node.static
@@ -141,7 +142,17 @@ module Lutaml
                             else
                               "direct"
                             end
-        attributes["label"] = node.action if node.action
+
+        if node&.action&.verb
+          attributes["label"] = node.action.verb
+        end
+        case node&.action&.direction
+        when "target"
+          attributes["label"] = "#{attributes['label']} \u25b6"
+        when "source"
+          attributes["label"] = "\u25c0 #{attributes['label']}"
+        end
+
         if node.owner_end_attribute_name
           attributes["headlabel"] = format_label(
             node.owner_end_attribute_name,
@@ -189,11 +200,11 @@ 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
 
-        "#{res} #{cardinality['min']}..#{cardinality['max']}"
+        "#{res} #{cardinality.min}..#{cardinality.max}"
       end
 
       def format_member_rows(members, hide_members) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity
@@ -250,8 +261,8 @@ module Lutaml
         @node["fontname"] = "#{@fontname}-bold"
 
         if node.fidelity
-          hide_members = node.fidelity["hideMembers"]
-          hide_other_classes = node.fidelity["hideOtherClasses"]
+          hide_members = node.fidelity.hideMembers
+          hide_other_classes = node.fidelity.hideOtherClasses
         end
         classes = (node.classes +
                     node.enums +
@@ -303,8 +314,8 @@ module Lutaml
 
       def sort_by_document_grouping(groups, associations) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
         result = []
-        groups.each do |batch|
-          batch.each do |group_name|
+        groups.each do |group|
+          group.values.each do |group_name| # rubocop:disable Style/HashEachMethods
             associations
               .select { |assc| assc.owner_end == group_name }
               .each do |association|

data/lib/lutaml/formatter.rb

@@ -15,5 +15,3 @@ module Lutaml
     end
   end
 end
-
-require "lutaml/formatter/graphviz"

data/lib/lutaml/parser.rb

@@ -35,7 +35,7 @@ module Lutaml
         file_list.map { |file| Lutaml::Xml::Parsers::Xml.parse(file) }
       when "lutaml"
         file_list.map { |file| Lutaml::Uml::Parsers::Dsl.parse(file) }
-      when "yml"
+      when "yml", "yaml"
         file_list.map { |file| Lutaml::Uml::Parsers::Yaml.parse(file.path) }
       else
         raise ArgumentError, "Unsupported file format"

data/lib/lutaml/sysml/allocate.rb

@@ -1,5 +1,5 @@
 module Lutaml
-  module SysMl
+  module Sysml
     class Allocate < Lutaml::Uml::Abstraction
       attr_accessor :base_abstraction
     end

data/lib/lutaml/sysml/allocated.rb

@@ -1,5 +1,5 @@
 module Lutaml
-  module SysMl
+  module Sysml
     class Allocated < Lutaml::Uml::TopElement
       attr_accessor :base_named_element, :allocated_from, :allocated_to
     end

data/lib/lutaml/sysml/binding_connector.rb

@@ -1,5 +1,5 @@
 module Lutaml
-  module SysMl
+  module Sysml
     class BindingConnector < Lutaml::Uml::Connector
       attr_accessor :base_connector
     end

data/lib/lutaml/sysml/block.rb

@@ -1,5 +1,5 @@
 module Lutaml
-  module SysMl
+  module Sysml
     class Block < Lutaml::Uml::Class
       attr_accessor :base_class
 

data/lib/lutaml/sysml/constraint_block.rb

@@ -1,5 +1,5 @@
 module Lutaml
-  module SysMl
+  module Sysml
     class ConstraintBlock < Block
       def initialize # rubocop:disable Lint/MissingSuper
         @xmi_id = nil

data/lib/lutaml/sysml/copy.rb

@@ -1,5 +1,5 @@
 module Lutaml
-  module SysMl
+  module Sysml
     class Copy < Trace
     end
   end

data/lib/lutaml/sysml/derive_requirement.rb

@@ -1,5 +1,5 @@
 module Lutaml
-  module SysMl
+  module Sysml
     class DeriveRequirement < Lutaml::Uml::TopElement
       attr_accessor :base_abstraction
     end

data/lib/lutaml/sysml/nested_connector_end.rb

@@ -1,5 +1,5 @@
 module Lutaml
-  module SysMl
+  module Sysml
     class NestedConnectorEnd < Lutaml::Uml::ConnectorEnd
       attr_accessor :base_connectorend, :property_path
 

data/lib/lutaml/sysml/refine.rb

@@ -1,5 +1,5 @@
 module Lutaml
-  module SysMl
+  module Sysml
     class Refine < Lutaml::Uml::TopElement
       attr_accessor :base_abstraction
     end

data/lib/lutaml/sysml/requirement_related.rb

@@ -1,5 +1,5 @@
 module Lutaml
-  module SysMl
+  module Sysml
     class RequirementRelated < Lutaml::Uml::TopElement
       attr_accessor :base_named_element, :satisfies, :refines
     end

data/lib/lutaml/sysml/satisfy.rb

@@ -1,5 +1,5 @@
 module Lutaml
-  module SysMl
+  module Sysml
     class Satisfy < Trace
       attr_accessor :base_realization
     end

data/lib/lutaml/sysml/test_case.rb

@@ -1,5 +1,5 @@
 module Lutaml
-  module SysMl
+  module Sysml
     class TestCase < Lutaml::Uml::TopElement
       attr_accessor :base_behavior, :verifies
 

data/lib/lutaml/sysml/trace.rb

@@ -1,5 +1,5 @@
 module Lutaml
-  module SysMl
+  module Sysml
     class Trace < Lutaml::Uml::TopElement
       attr_accessor :base_abstraction
     end

data/lib/lutaml/sysml/verify.rb

@@ -1,5 +1,5 @@
 module Lutaml
-  module SysMl
+  module Sysml
     class Verify < Trace
     end
   end

data/lib/lutaml/sysml/xmi_file.rb

@@ -1,5 +1,5 @@
 module Lutaml
-  module SysMl
+  module Sysml
     class XmiFile
       attr_accessor :package_list, :model_list, :class_list, :activity_list,
                     :property_list, :port_list,

data/lib/lutaml/sysml.rb

@@ -1,4 +1,3 @@
-require "lutaml/sysml/version"
 require "lutaml/uml"
 require "nokogiri"
 

data/lib/lutaml/uml/action.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Lutaml
+  module Uml
+    class Action < Lutaml::Model::Serializable
+      attribute :verb, :string
+      attribute :direction, :string
+
+      yaml do
+        map "verb", to: :verb
+        map "direction", to: :direction
+      end
+    end
+  end
+end

data/lib/lutaml/uml/actor.rb

@@ -3,17 +3,9 @@
 ##
 ## Behaviour metamodel
 ##
-
 module Lutaml
   module Uml
     class Actor < Classifier
-      def initialize # rubocop:disable Lint/MissingSuper
-        @name = nil
-        @xmi_id = nil
-        @stereotype = []
-        @generalization = []
-        @namespace = nil
-      end
     end
   end
 end

data/lib/lutaml/uml/association.rb

@@ -3,41 +3,32 @@
 module Lutaml
   module Uml
     class Association < TopElement
-      include HasMembers
+      attribute :owner_end, :string
+      attribute :owner_end_attribute_name, :string
+      attribute :owner_end_cardinality, Cardinality
+      attribute :owner_end_type, :string
+      attribute :owner_end_xmi_id, :string
+      attribute :member_end, :string
+      attribute :member_end_attribute_name, :string
+      attribute :member_end_xmi_id, :string
+      attribute :member_end_cardinality, Cardinality
+      attribute :member_end_type, :string
+      attribute :static, :string
+      attribute :action, Action
 
-      attr_accessor :owner_end,
-                    :owner_end_attribute_name,
-                    :owner_end_cardinality,
-                    :owner_end_type,
-                    :owner_end_xmi_id,
-                    :member_end,
-                    :member_end_attribute_name,
-                    :member_end_xmi_id,
-                    :member_end_cardinality,
-                    :member_end_type,
-                    :static,
-                    :action
-
-      # TODO: move to Parslet::Transform
-      def members=(value) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
-        value.group_by { |member| member.keys.first }
-          .each do |(type, group)|
-            if %w[owner_end member_end].include?(type) # rubocop:disable Performance/CollectionLiteralInLoop
-              group.each do |member|
-                member.each_pair do |key, member_value|
-                  public_send(:"#{association_type(key)}=", member_value)
-                end
-              end
-              next
-            end
-            attribute_value = group.map(&:values).flatten
-            if attribute_value.length == 1 && !attribute_value.first.is_a?(Hash)
-              next public_send(:"#{association_type(type)}=",
-                               attribute_value.first)
-            end
-
-            public_send(:"#{association_type(type)}=", attribute_value)
-          end
+      yaml do
+        map "owner_end", to: :owner_end
+        map "owner_end_attribute_name", to: :owner_end_attribute_name
+        map "owner_end_cardinality", to: :owner_end_cardinality
+        map "owner_end_type", to: :owner_end_type
+        map "owner_end_xmi_id", to: :owner_end_xmi_id
+        map "member_end", to: :member_end
+        map "member_end_attribute_name", to: :member_end_attribute_name
+        map "member_end_xmi_id", to: :member_end_xmi_id
+        map "member_end_cardinality", to: :member_end_cardinality
+        map "member_end_type", to: :member_end_type
+        map "static", to: :static
+        map "action", to: :action
       end
     end
   end

data/lib/lutaml/uml/cardinality.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Lutaml
+  module Uml
+    class Cardinality < Lutaml::Model::Serializable
+      attribute :min, :string
+      attribute :max, :string
+    end
+  end
+end

data/lib/lutaml/uml/class.rb

@@ -1,82 +1,57 @@
 # frozen_string_literal: true
 
-require "lutaml/uml/classifier"
-
-require "lutaml/uml/has_members"
+require "lutaml/uml/package"
 require "lutaml/uml/association"
 require "lutaml/uml/constraint"
-require "lutaml/uml/data_type"
 require "lutaml/uml/operation"
-require "lutaml/uml/top_element_attribute"
+require "lutaml/uml/data_type"
 
 module Lutaml
   module Uml
     class Class < Classifier
-      include HasMembers
-
-      attr_accessor :nested_classifier,
-                    :is_abstract,
-                    :type,
-                    :package
-
-      attr_reader :associations,
-                  :attributes,
-                  :members,
-                  :modifier,
-                  :constraints,
-                  :operations,
-                  :data_types
-
-      def initialize(attributes = {})
-        @nested_classifier = []
-        @stereotype = []
-        @generalization = []
-        @is_abstract = false
-        super
-      end
-
-      def modifier=(value)
-        @modifier = value.to_s # TODO: Validate?
-      end
-
-      def attributes=(value)
-        @attributes = value.to_a.map do |attr|
-          TopElementAttribute.new(attr)
-        end
-      end
-
-      def associations=(value)
-        @associations = value.to_a.map do |attr|
-          Association.new(attr.to_h.merge(owner_end: name))
+      attribute :nested_classifier, :string, collection: true,
+                                             default: -> { [] }
+      attribute :is_abstract, :boolean, default: false
+      attribute :type, :string
+      attribute :package, Package
+      attribute :attributes, TopElementAttribute, collection: true
+      attribute :modifier, :string
+      attribute :constraints, Constraint, collection: true
+      attribute :operations, Operation, collection: true
+      attribute :data_types, DataType, collection: true
+      attribute :methods, :string, collection: true, default: -> { [] }
+
+      attribute :associations, Association, collection: true
+
+      yaml do
+        map "nested_classifier", to: :nested_classifier
+        map "is_abstract", to: :is_abstract
+        map "type", to: :type
+        map "package", to: :package
+        map "attributes", to: :attributes
+        map "modifier", to: :modifier
+        map "constraints", to: :constraints
+        map "operations", to: :operations
+        map "data_types", to: :data_types
+        map "methods", to: :methods
+
+        map "associations", to: :associations, with: {
+          to: :associations_to_yaml, from: :associations_from_yaml
+        }
+      end
+
+      def associations_to_yaml(model, doc)
+        associations = model.associations.map(&:to_hash)
+        doc["associations"] = associations unless associations.empty?
+      end
+
+      def associations_from_yaml(model, values)
+        associations = values.map do |value|
+          value["owner_end"] = model.name if value["owner_end"].nil?
+          Association.from_yaml(value.to_yaml)
         end
-      end
-
-      def constraints=(value)
-        @constraints = value.to_a.map do |attr|
-          Constraint.new(attr)
-        end
-      end
-
-      def operations=(value)
-        @operations = value.to_a.map do |attr|
-          Operation.new(attr)
-        end
-      end
-
-      def data_types=(value)
-        @data_types = value.to_a.map do |attr|
-          DataType.new(attr)
-        end
-      end
-
-      def methods
-        # @members&.select { |member| member.class == Method }
-        []
-      end
 
-      def relationships
-        # @members&.select { |member| member.class == ClassRelationship }
-        []
+        model.associations = associations
       end
     end
   end

data/lib/lutaml/uml/classifier.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
-require "lutaml/uml/top_element"
-
 module Lutaml
   module Uml
     class Classifier < TopElement
-      attr_accessor :generalization
+      attribute :generalization, :string, collection: true, default: -> { [] }
+
+      yaml do
+        map "generalization", to: :generalization
+      end
     end
   end
 end

data/lib/lutaml/uml/connector.rb

@@ -6,15 +6,12 @@
 module Lutaml
   module Uml
     class Connector < TopElement
-      attr_accessor :kind, :connector_end
+      attribute :kind, :string
+      attribute :connector_end, :string, collection: true, default: -> { [] }
 
-      def initialize # rubocop:disable Lint/MissingSuper
-        @name = nil
-        @xmi_id = nil
-        @xmi_uuid = nil
-        @connector_end = []
-        @namespace = nil
-        @kind = nil
+      yaml do
+        map "kind", to: :kind
+        map "connector_end", to: :connector_end
       end
     end
   end

data/lib/lutaml/uml/connector_end.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+##
+## Behaviour metamodel
+##
+module Lutaml
+  module Uml
+    class ConnectorEnd < TopElement
+      attribute :role, :string
+      attribute :part_with_port, :string
+      attribute :connector, :string
+
+      yaml do
+        map "role", to: :role
+        map "part_with_port", to: :part_with_port
+        map "connector", to: :connector
+      end
+    end
+  end
+end

data/lib/lutaml/uml/constraint.rb

@@ -6,7 +6,17 @@
 module Lutaml
   module Uml
     class Constraint < TopElement
-      attr_accessor :body
+      attribute :body, :string
+      attribute :type, :string
+      attribute :weight, :string
+      attribute :status, :string
+
+      yaml do
+        map "body", to: :body
+        map "type", to: :type
+        map "weight", to: :weight
+        map "status", to: :status
+      end
     end
   end
 end