lutaml-uml 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b394ba93cd4b9fd8a7136abd42d8302a1f66825ecccafdf5395466b6e3bd4c81
-  data.tar.gz: b48168115e95037e6edc9de0e12dd4521d715c75ed3264f17ec7b5c42c96297a
+  metadata.gz: 57797f5d5a65a5bb7e781509a44460e16877d85c9becb6b6147d43a6180a931c
+  data.tar.gz: caa53fbea010657d6dd53db86460ba5dd4a991076ab078bf08a72f553e5c40da
 SHA512:
-  metadata.gz: 190d8fb433ea68c26b35d49ec6de1e0d89fcc475bc2fa34f75cc43d587eedf451bdf4ca2c6b0a0661b809d56298c650b19cba1dddb31577e72a71d1b98a7bcc9
-  data.tar.gz: f5767e05d2d2726ae524053392a5d61fbcec3d0dd163064b3ea7f2607359f61d4730d1697649f0e02aa7e9e8420e84cf2ae4eafdbbc06d6782d621d1b0f40d5f
+  metadata.gz: 0ec63f9b0992f1ebab8b2c3116e49514cd5753fe4d1e327a40465c001711e0c0bf86410eba964c6aea1514e8bba91297f19d8a615e9e352d296386ab348bd6fa
+  data.tar.gz: 3971b17f96585427e99b3e4000824e99560ed096bea8489dbb62dd7dcba44eca3acd5a5a6ebc55b224aafffae9a963c866f3ca12a365bdc8dd0c54985c93f52e

data/lib/lutaml/uml/class.rb

@@ -1,9 +1,12 @@
 # frozen_string_literal: true
 
-require "lutaml/uml/has_members"
 require "lutaml/uml/classifier"
+
+require "lutaml/uml/has_members"
 require "lutaml/uml/association"
 require "lutaml/uml/constraint"
+require "lutaml/uml/data_type"
+require "lutaml/uml/operation"
 require "lutaml/uml/top_element_attribute"
 
 module Lutaml
@@ -13,13 +16,16 @@ module Lutaml
 
       attr_accessor :nested_classifier,
                     :is_abstract,
-                    :type
+                    :type,
+                    :package
 
       attr_reader :associations,
                   :attributes,
                   :members,
                   :modifier,
-                  :constraints
+                  :constraints,
+                  :operations,
+                  :data_types
 
       def initialize(attributes = {})
         @nested_classifier = []
@@ -51,6 +57,18 @@ module Lutaml
         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 }
         []

data/lib/lutaml/uml/data_type.rb

@@ -1,14 +1,75 @@
 # frozen_string_literal: true
+require "lutaml/uml/classifier"
 
 module Lutaml
   module Uml
-    class DataType < Class
-      attr_reader :keyword
+    class DataType < Classifier
+      include HasMembers
+
+      attr_accessor :nested_classifier,
+                    :is_abstract,
+                    :type
+
+      attr_reader :associations,
+                  :attributes,
+                  :members,
+                  :modifier,
+                  :constraints,
+                  :operations,
+                  :data_types
 
       def initialize(attributes = {})
+        @nested_classifier = []
+        @stereotype = []
+        @generalization = []
+        @is_abstract = false
         super
         @keyword = "dataType"
       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))
+        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 }
+        []
+      end
     end
   end
 end

data/lib/lutaml/uml/diagram.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Lutaml
+  module Uml
+    class Diagram < TopElement
+    end
+  end
+end

data/lib/lutaml/uml/document.rb

@@ -3,6 +3,7 @@
 require "lutaml/uml/class"
 require "lutaml/uml/data_type"
 require "lutaml/uml/enum"
+require "lutaml/uml/diagram"
 require "lutaml/uml/package"
 require "lutaml/uml/primitive_type"
 

data/lib/lutaml/uml/enum.rb

@@ -4,6 +4,7 @@ require "lutaml/uml/has_members"
 require "lutaml/uml/classifier"
 require "lutaml/uml/association"
 require "lutaml/uml/top_element_attribute"
+require "lutaml/uml/value"
 
 module Lutaml
   module Uml
@@ -14,19 +15,27 @@ module Lutaml
                   :members,
                   :modifier,
                   :definition,
-                  :keyword
+                  :keyword,
+                  :values
 
       def initialize(attributes = {})
         super
         @keyword = "enumeration"
       end
 
+      # TODO: delete?
       def attributes=(value)
         @attributes = value.to_a.map do |attr|
           TopElementAttribute.new(attr)
         end
       end
 
+      def values=(value)
+        @values = value.to_a.map do |attr|
+          Value.new(attr)
+        end
+      end
+
       # TODO: reserved name, change
       def methods
         []

data/lib/lutaml/uml/operation.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Lutaml
+  module Uml
+    class Operation
+      include HasAttributes
+      include HasMembers
+
+      attr_accessor :definition,
+                    :name,
+                    :return_type,
+                    :parameter_type
+
+      # rubocop:disable Rails/ActiveRecordAliases
+      def initialize(attributes = {})
+        update_attributes(attributes)
+      end
+      # rubocop:enable Rails/ActiveRecordAliases
+
+      def definition=(value)
+        @definition = value
+                        .to_s
+                        .gsub(/\\}/, '}')
+                        .gsub(/\\{/, '{')
+                        .split("\n")
+                        .map(&:strip)
+                        .join("\n")
+      end
+    end
+  end
+end

data/lib/lutaml/uml/package.rb

@@ -6,10 +6,11 @@ module Lutaml
       include HasAttributes
 
       attr_accessor :imports, :contents
-      attr_reader :classes, :enums
+      attr_reader :classes, :enums, :data_types, :children_packages
 
       def initialize(attributes)
         update_attributes(attributes)
+        @children_packages ||= packages.map { |pkg| [pkg, pkg.packages.map(&:children_packages)] }.flatten
       end
 
       def classes=(value)
@@ -20,10 +21,18 @@ module Lutaml
         @enums = value.to_a.map { |attributes| Enum.new(attributes) }
       end
 
+      def data_types=(value)
+        @data_types = value.to_a.map { |attributes| DataType.new(attributes) }
+      end
+
       def packages=(value)
         @packages = value.to_a.map { |attributes| Package.new(attributes) }
       end
 
+      def diagrams=(value)
+        @diagrams = value.to_a.map { |attributes| Diagram.new(attributes) }
+      end
+
       def classes
         @classes || []
       end
@@ -35,6 +44,10 @@ module Lutaml
       def packages
         @packages || []
       end
+
+      def diagrams
+        @diagrams || []
+      end
     end
   end
 end

data/lib/lutaml/uml/value.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Lutaml
+  module Uml
+    class Value
+      include HasAttributes
+      include HasMembers
+
+      attr_accessor :definition,
+                    :name,
+                    :type
+
+      # rubocop:disable Rails/ActiveRecordAliases
+      def initialize(attributes = {})
+        update_attributes(attributes)
+      end
+      # rubocop:enable Rails/ActiveRecordAliases
+
+      def definition=(value)
+        @definition = value
+                        .to_s
+                        .gsub(/\\}/, '}')
+                        .gsub(/\\{/, '{')
+                        .split("\n")
+                        .map(&:strip)
+                        .join("\n")
+      end
+    end
+  end
+end

data/lib/lutaml/uml/version.rb

@@ -2,6 +2,6 @@
 
 module Lutaml
   module Uml
-    VERSION = "0.3.2"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-uml
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-02 00:00:00.000000000 Z
+date: 2021-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -206,6 +206,7 @@ files:
 - lib/lutaml/uml/constructor_end.rb
 - lib/lutaml/uml/data_type.rb
 - lib/lutaml/uml/dependency.rb
+- lib/lutaml/uml/diagram.rb
 - lib/lutaml/uml/document.rb
 - lib/lutaml/uml/enum.rb
 - lib/lutaml/uml/event.rb
@@ -228,6 +229,7 @@ files:
 - lib/lutaml/uml/node/method_argument.rb
 - lib/lutaml/uml/node/relationship.rb
 - lib/lutaml/uml/opaque_behavior.rb
+- lib/lutaml/uml/operation.rb
 - lib/lutaml/uml/package.rb
 - lib/lutaml/uml/parsers/attribute.rb
 - lib/lutaml/uml/parsers/dsl.rb
@@ -251,6 +253,7 @@ files:
 - lib/lutaml/uml/top_element_attribute.rb
 - lib/lutaml/uml/transition.rb
 - lib/lutaml/uml/trigger.rb
+- lib/lutaml/uml/value.rb
 - lib/lutaml/uml/version.rb
 - lib/lutaml/uml/vertex.rb
 - lutaml-uml.gemspec