lutaml-uml 0.2.9 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e25b300c9a636999a7861a78ea5c677d1c0c6767180a81f8b63cc6f9af2f8aa
-  data.tar.gz: b78902b23e27ec296913e2943c5fb966d17268f6c28e2b1c50409450e0310ed8
+  metadata.gz: b394ba93cd4b9fd8a7136abd42d8302a1f66825ecccafdf5395466b6e3bd4c81
+  data.tar.gz: b48168115e95037e6edc9de0e12dd4521d715c75ed3264f17ec7b5c42c96297a
 SHA512:
-  metadata.gz: 287de7e6b28b6ff2c1dffab0db3a4503257c3b75c00409cd56184629875f3196e9a91dee7acb21a8cf1d1e484a59a9d5188836d33002599d8a4407da4a51f68c
-  data.tar.gz: 14f5782e4d85885c3fca50f486cf8107648fac50e50acdeb2d931dc6a68c4e0e8fe1c9b9927dfd4449a02186ea36a969d1591fd55712334dca72cb49d7fba103
+  metadata.gz: 190d8fb433ea68c26b35d49ec6de1e0d89fcc475bc2fa34f75cc43d587eedf451bdf4ca2c6b0a0661b809d56298c650b19cba1dddb31577e72a71d1b98a7bcc9
+  data.tar.gz: f5767e05d2d2726ae524053392a5d61fbcec3d0dd163064b3ea7f2607359f61d4730d1697649f0e02aa7e9e8420e84cf2ae4eafdbbc06d6782d621d1b0f40d5f

data/LUTAML.adoc

@@ -7,13 +7,18 @@
 [source,java]
 ----
 diagram MyView {
-  import Relationship, Element
-  render_option typed_as_associations
-  file "my_view.png"
+  title "My diagram"
+  caption "My custom caption"
   fontname "Helvetica"
 }
 ----
 
+where:
+
+* `fontname` - optional, configuration option to use supplied font name
+* `title` - optional, set custom title for diagram
+* `caption` - optional, set custom caption for diagram
+
 == DataTypes
 
 Lutaml supports 3 types of data_types: `data_type`, `primitive` and `enum`. Example of data types declaration:

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

@@ -3,6 +3,7 @@
 require "lutaml/uml/has_members"
 require "lutaml/uml/classifier"
 require "lutaml/uml/association"
+require "lutaml/uml/constraint"
 require "lutaml/uml/top_element_attribute"
 
 module Lutaml
@@ -17,7 +18,8 @@ module Lutaml
       attr_reader :associations,
                   :attributes,
                   :members,
-                  :modifier
+                  :modifier,
+                  :constraints
 
       def initialize(attributes = {})
         @nested_classifier = []
@@ -43,6 +45,12 @@ module Lutaml
         end
       end
 
+      def constraints=(value)
+        @constraints = value.to_a.map do |attr|
+          Constraint.new(attr)
+        end
+      end
+
       def methods
         # @members&.select { |member| member.class == Method }
         []

data/lib/lutaml/uml/document.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
 require "lutaml/uml/class"
-require "lutaml/uml/enum"
 require "lutaml/uml/data_type"
+require "lutaml/uml/enum"
+require "lutaml/uml/package"
 require "lutaml/uml/primitive_type"
 
 module Lutaml
@@ -18,23 +19,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 +64,10 @@ module Lutaml
         @data_types || []
       end
 
+      def packages
+        @packages || []
+      end
+
       def primitives
         @primitives || []
       end

data/lib/lutaml/uml/package.rb

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

@@ -2,6 +2,6 @@
 
 module Lutaml
   module Uml
-    VERSION = "0.2.9"
+    VERSION = "0.3.2"
   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

@@ -15,5 +15,11 @@ diagram MyView {
     ~friendlyAttributeProfile: <<Type>> "CharacterString" [1..*]
     ~friendlyAttributeProfile1: <<Type>> "CharacterString"
     #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,22 @@ 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(7)
+                .attributes.length).to eq(13)
+        expect(by_name(classes, "AttributeProfile")
+                .attributes.map(&:name))
+              .to(eq(["imlicistAttributeProfile",
+                "attributeProfile",
+                "attributeProfile1",
+                "privateAttributeProfile",
+                "friendlyAttributeProfile",
+                "friendlyAttributeProfile1",
+                "protectedAttributeProfile",
+                "type/text",
+                "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.9
+  version: 0.3.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-10 00:00:00.000000000 Z
+date: 2021-05-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
@@ -319,7 +319,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.