lutaml-uml 0.2.10 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a4318a33ee0facc590ee478a533551314aa96290ff3f9beb2a8506518f107fb
-  data.tar.gz: 18164bb8e957223dc1f1fdeacd7603f61705482d3299de01edcd6c96bb1860a4
+  metadata.gz: 57797f5d5a65a5bb7e781509a44460e16877d85c9becb6b6147d43a6180a931c
+  data.tar.gz: caa53fbea010657d6dd53db86460ba5dd4a991076ab078bf08a72f553e5c40da
 SHA512:
-  metadata.gz: fcb70562cec32586375a93e1a80a575bd6dc3b7150d2867046447af6461dec4af6e0c59ed179607dc03408e285c8cb6f1c627004f36118372027c8e9b9890bc2
-  data.tar.gz: 304d5c7326dbe2378a431c07cb50f0f21596a18dca6e0d694b2c7de26d1726a30e3932b3b2fd52f7f404a0a0453d7d7ec098b731f9460bab8eb24dd61939cbff
+  metadata.gz: 0ec63f9b0992f1ebab8b2c3116e49514cd5753fe4d1e327a40465c001711e0c0bf86410eba964c6aea1514e8bba91297f19d8a615e9e352d296386ab348bd6fa
+  data.tar.gz: 3971b17f96585427e99b3e4000824e99560ed096bea8489dbb62dd7dcba44eca3acd5a5a6ebc55b224aafffae9a963c866f3ca12a365bdc8dd0c54985c93f52e

data/README.adoc

@@ -1,5 +1,11 @@
 # Lutaml::Uml
 
+image:https://badge.fury.io/rb/lutaml-uml.svg["Gem Version", link="https://badge.fury.io/rb/lutaml-uml"]
+
+image:https://github.com/lutaml/lutaml-uml/actions/workflows/macos.yml/badge.svg["macos", link="https://github.com/lutaml/lutaml-uml/actions/workflows/macos.yml"]
+image:https://github.com/lutaml/lutaml-uml/actions/workflows/ubuntu.yml/badge.svg["ubuntu", link="https://github.com/lutaml/lutaml-uml/actions/workflows/ubuntu.yml"]
+image:https://github.com/lutaml/lutaml-uml/actions/workflows/windows.yml/badge.svg["windows", link="https://github.com/lutaml/lutaml-uml/actions/workflows/windows.yml"]
+
 Lutaml is a language for specifying UML class diagrams and a tool for converting it into various different formats.
 
 ## Install
@@ -35,4 +41,4 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/[USERN
 
 ## Code of Conduct
 
-Everyone interacting in the Lutaml::Uml project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/lutaml-uml/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the Lutaml::Uml project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/lutaml-uml/blob/master/CODE_OF_CONDUCT.md).

data/lib/lutaml/uml/class.rb

@@ -1,8 +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
@@ -12,12 +16,16 @@ module Lutaml
 
       attr_accessor :nested_classifier,
                     :is_abstract,
-                    :type
+                    :type,
+                    :package
 
       attr_reader :associations,
                   :attributes,
                   :members,
-                  :modifier
+                  :modifier,
+                  :constraints,
+                  :operations,
+                  :data_types
 
       def initialize(attributes = {})
         @nested_classifier = []
@@ -43,6 +51,24 @@ module Lutaml
         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 }
         []

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

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
 require "lutaml/uml/class"
-require "lutaml/uml/enum"
 require "lutaml/uml/data_type"
+require "lutaml/uml/enum"
+require "lutaml/uml/diagram"
+require "lutaml/uml/package"
 require "lutaml/uml/primitive_type"
 
 module Lutaml
@@ -18,23 +20,27 @@ module Lutaml
                     :fidelity,
                     :fontname,
                     :comments
+      attr_reader :packages
 
       # rubocop:disable Rails/ActiveRecordAliases
       def initialize(attributes = {})
         update_attributes(attributes)
       end
       # rubocop:enable Rails/ActiveRecordAliases
-
       def classes=(value)
         @classes = value.to_a.map { |attributes| Class.new(attributes) }
       end
 
+      def data_types=(value)
+        @data_types = value.to_a.map { |attributes| DataType.new(attributes) }
+      end
+
       def enums=(value)
         @enums = value.to_a.map { |attributes| Enum.new(attributes) }
       end
 
-      def data_types=(value)
-        @data_types = value.to_a.map { |attributes| DataType.new(attributes) }
+      def packages=(value)
+        @packages = value.to_a.map { |attributes| Package.new(attributes) }
       end
 
       def primitives=(value)
@@ -59,6 +65,10 @@ module Lutaml
         @data_types || []
       end
 
+      def packages
+        @packages || []
+      end
+
       def primitives
         @primitives || []
       end

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

@@ -3,16 +3,50 @@
 module Lutaml
   module Uml
     class Package < TopElement
+      include HasAttributes
+
       attr_accessor :imports, :contents
+      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)
+        @classes = value.to_a.map { |attributes| Class.new(attributes) }
+      end
+
+      def enums=(value)
+        @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
+
+      def enums
+        @enums || []
+      end
+
+      def packages
+        @packages || []
+      end
 
-      def initialize
-        @imports = []
-        @contents = []
-        @name = nil
-        @xmi_id = nil
-        @xmi_uuid = nil
-        @namespace = nil
-        @href = nil
+      def diagrams
+        @diagrams || []
       end
     end
   end

data/lib/lutaml/uml/parsers/dsl.rb

@@ -117,7 +117,7 @@ module Lutaml
             attribute_keyword? >>
             spaces? >>
             match['"\''].maybe >>
-            match['a-zA-Z0-9_\- \/'].repeat(1).as(:type) >>
+            match['a-zA-Z0-9_\- \/\+'].repeat(1).as(:type) >>
             match['"\''].maybe >>
             spaces?
           )
@@ -126,7 +126,7 @@ module Lutaml
           attribute_type.maybe
         end
 
-        rule(:attribute_name) { match['a-zA-Z0-9_\- \/'].repeat(1).as(:name) }
+        rule(:attribute_name) { match['a-zA-Z0-9_\- \/\+'].repeat(1).as(:name) }
         rule(:attribute_definition) do
           (visibility?.as(:visibility) >>
             match['"\''].maybe >>
@@ -329,7 +329,10 @@ module Lutaml
         # -- data_type
         rule(:data_type_keyword) { kw_data_type >> spaces }
         rule(:data_type_inner_definitions) do
-          attribute_definition
+          definition_body |
+            attribute_definition |
+            comment_definition |
+            comment_multiline_definition
         end
         rule(:data_type_inner_definition) do
           data_type_inner_definitions >> whitespace?
@@ -347,6 +350,7 @@ module Lutaml
             match['"\''].maybe >>
             class_name.as(:name) >>
             match['"\''].maybe >>
+            attribute_keyword? >>
             data_type_body?
         end
 

data/lib/lutaml/uml/top_element_attribute.rb

@@ -13,7 +13,8 @@ module Lutaml
                     :contain,
                     :static,
                     :cardinality,
-                    :keyword
+                    :keyword,
+                    :is_derived
 
       # rubocop:disable Rails/ActiveRecordAliases
       def initialize(attributes = {})

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.2.10"
+    VERSION = "0.4.0"
   end
 end

data/lutaml-uml.gemspec

@@ -28,10 +28,10 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "parslet", "~> 1.7.1"
   spec.add_runtime_dependency "ruby-graphviz", "~> 1.2"
   spec.add_runtime_dependency "thor", "~> 1.0"
+  spec.add_runtime_dependency "nokogiri", "~> 1.10"
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "byebug"
-  spec.add_development_dependency "nokogiri", "~> 1.10"
   spec.add_development_dependency "pry", "~> 0.12.2"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

data/spec/fixtures/dsl/diagram_class_fields.lutaml

@@ -17,5 +17,9 @@ diagram MyView {
     #protectedAttributeProfile: CharacterString
     type/text: String
     slashType: slash/type
+    application/docbook+xml
+    application/tei+xml
+    text/x-asciidoc
+    application/x-isodoc+xml
   }
 }

data/spec/fixtures/dsl/diagram_data_types.lutaml

@@ -8,10 +8,30 @@ diagram MyView {
   }
 
   data_type "Banking Information" {
-    "art code"
+    definition {
+      Common code types used in banking.
+    }
+    "art code" {
+      definition {
+        The bank ART code.
+      }
+    }
     "CCT Number"
   }
 
+  data_type DateTimeType {
+    definition {
+      Type of date time value.
+    }
+    year {
+      definition {
+        The value only provides year.
+      }
+    }
+    monthYear
+    dayMonthYear
+  }
+
   primitive Integer
 
   enum Profile {

data/spec/lutaml/uml/parsers/dsl_spec.rb

@@ -68,7 +68,7 @@ RSpec.describe Lutaml::Uml::Parsers::Dsl do
         expect(by_name(classes, "AddressClassProfile")
                 .attributes.length).to eq(1)
         expect(by_name(classes, "AttributeProfile")
-                .attributes.length).to eq(9)
+                .attributes.length).to eq(13)
         expect(by_name(classes, "AttributeProfile")
                 .attributes.map(&:name))
               .to(eq(["imlicistAttributeProfile",
@@ -79,7 +79,11 @@ RSpec.describe Lutaml::Uml::Parsers::Dsl do
                 "friendlyAttributeProfile1",
                 "protectedAttributeProfile",
                 "type/text",
-                "slashType"]))
+                "slashType",
+                "application/docbook+xml",
+                "application/tei+xml",
+                "text/x-asciidoc",
+                "application/x-isodoc+xml"]))
       end
 
       it "creates the correct attributes with the correct visibility" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-uml
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.4.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-17 00:00:00.000000000 Z
+date: 2021-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -67,47 +67,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
+        version: '1.10'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -319,7 +322,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: UML model module for LutaML.