lutaml-uml 0.3.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3327c8c125b9d4b538b648b7b20d112dc70a4bfbc78b9f542bb33b6c57c5eeea
-  data.tar.gz: efe632c537b96ee01417bededb2ccd45a5e4dca4660c88952f39ff71c0061fa7
+  metadata.gz: 5d7db5a90a481773906ffcd2985d36777ba62f2c79a1de83390c7890a4c9f7c4
+  data.tar.gz: 7d9229702c7b58d2a2d0c8f2261230eb941f7fd76a0f17c784d48da01a22c5c0
 SHA512:
-  metadata.gz: 5e51c58f53a8743b0ca43e96cf3e98eee5dd99dcd7ba66ae8d87728c8c4d8270851518c98058275ea867a1879444909d547e956a6062d424c28f4145f031732e
-  data.tar.gz: '085f6c41da759ed7fb4b3a8aae3a53b28241d564a21f3ebf992c0a98e877483ed0d9f885d51a1ec23c54ce9cf719e2e3902a98012d4031376e973ffe73b0453b'
+  metadata.gz: ec111d11c2354621c95c3708296356906977f9c949f96a07c8e1ee71928733ff68089b5339bb2017f824fa76274fe2e043693ca48b7cbd1305c85756791097a0
+  data.tar.gz: 81de391a9fc9a1d546d82dcfde50b802a67e4bc28ffee88f08699faa6f54b3e7052107e2824c77dfd2b5cd40f3c78518757e7e1955c2715584225508f543389d

data/LUTAML.adoc

@@ -21,7 +21,9 @@ where:
 
 == DataTypes
 
-Lutaml supports 3 types of data_types: `data_type`, `primitive` and `enum`. Example of data types declaration:
+Lutaml supports 3 types of data_types: `data_type`, `primitive` and `enum`.
+
+Example of data types declaration:
 
 [source,java]
 ----
@@ -67,8 +69,8 @@ association name {
 
 where:
 
-* `owned_type` - optional, use to define bidirectional association(association|composition|aggregation|generalization|uses)
-* `member_type` - association type(association|composition|aggregation|generalization|uses)
+* `owned_type` - optional, use to define a bidirectional association (`association`|`composition`|`aggregation`|`generalization`|`uses`)
+* `member_type` - association type (`association`|`composition`|`aggregation`|`generalization`|`uses`)
 * `owned|member` - end of association, use `\#attribute_name` to set a role name
 * `property_string` - property string for attibutes associations
 * `cardinality` - examples: '1..*', '*'
@@ -142,7 +144,12 @@ Full syntax:
 
 where:
 
-* `visibility` can be equal to `-` - private, `+` - public, `#` - protected, `~` - friendly
+* `visibility` can be equal to
+** `-`: private
+** `+`: public
+** `#`: protected
+** `~`: friendly
+
 * `attribute` - attrbute keyword
 * `/` - symbolizes a derived attribute.
 * `multiplicity` -  Multiplicity is in square brackets (e.g. [1..*]).
@@ -178,14 +185,17 @@ enum A {
 }
 ----
 
+[[attribute-visibility]]
 === Attribute visibility
 
-Syntax for defining visibility: [+|-|#|~] [attribute] attribute_name. LutaML uses these modificators to define attribute(entry) visbility:
+Syntax for defining visibility: `[+|-|#|~] [attribute] attribute_name`.
 
-+ => public
-- => private
-# => protected
-~ => package
+LutaML uses these modificators to define attribute (entry) visbility:
+
+`+`:: public
+`-`:: private
+`#`:: protected
+`~`:: package
 
 example:
 
@@ -226,9 +236,20 @@ Syntax for defining methods:
 ----
 
 where:
-- `visibility` can be equal to `-` - private, `+` - public, `#` - protected, `~` - friendly
-- `parameter-list` - parameter list
-- `property-modifier` - can be equal to `redefines`, `query`, `ordered`(`unordered`), `unique`(`nonunique`)
+
+* `visibility` can be equal to
+** `-`: private
+** `+`: public
+** `#`: protected
+** `~`: friendly
+
+* `parameter-list`: parameter list
+
+* `property-modifier`: can be equal to
+** `redefines`
+** `query`
+** `ordered` (defaults to `unordered`)
+** `unique`(defaults to `nonunique`)
 
 Syntax for a `parameter-list`:
 
@@ -238,7 +259,12 @@ Syntax for a `parameter-list`:
 ----
 
 where:
-- `direction` - can be equal to `in`, `out`, `inout` or `return`
+
+* `direction` can be equal to
+** `in`
+** `out`
+** `inout`
+** `return`
 
 == import files
 
@@ -252,7 +278,8 @@ include path/to/file
 == Package syntax
 
 Namespaces
-Def.-A named element is an element that can have a name and a defined visibility (public, private, protected, package):
+
+A named element is an element that can have a name and a defined visibility (public, private, protected, package):
 
 [source,java]
 ----
@@ -286,7 +313,8 @@ abstract class Pet {}
 == Comment objects diagram
 
 Use `\**`(one line comment) or `*| |*`(multiline comment) to create comment object for diagram entry.
-If this syntax used inside class/enum/association block it will be created for owner of this block.
+
+If this syntax is used inside a `class`/`enum`/`association` block, it will be created for owner of this block.
 
 [source,java]
 ----
@@ -313,7 +341,7 @@ enum B {
 
 == Syntax comments
 
-Use `//` to create syntax comment, chars after // will be ignored during processing
+Use `//` to create syntax comment, chars after `//` will be ignored during processing.
 
 [source,java]
 ----
@@ -328,7 +356,7 @@ enum B {
 
 == Value specification
 
-A value specification indicates one or several values in a model. Examples for value specifications include simple, mathematical expressions, such as 4+2, and expressions with values from the object model, Integer::MAX_INT-1
+A value specification indicates one or several values in a model. Examples for value specifications include simple, mathematical expressions, such as `4+2`, and expressions with values from the object model, `Integer::MAX_INT-1`
 
 [source,java]
 ----
@@ -341,4 +369,4 @@ instance :{Class name, if any} {as ref name, optional} {
   {attribute name} = {attribute value}
   {attribute name}:{attribute class} = {attribute value}
 }
-----
+----

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/exe/lutaml-wsd2uml

@@ -27,7 +27,7 @@ ASSOCIATION_MAPPINGS = {
 in_comment_block = false
 
 def transform_line(line)
-  line = line.gsub(/^\s*'/, '** ').gsub(/\|[\sa-zA-Z]+$/, '')
+  line = line.gsub(/^\s*'/, '** ').gsub(/\|[\sa-zA-Z]+$/, '').gsub(/\r/, '')
   return sync_puts(line, 2) if ASSOCIATION_MAPPINGS.keys.none? { |key| line =~ key }
 
   owner_type, member_type = ASSOCIATION_MAPPINGS.detect { |(key, _value)| line =~ key }.last.split(",")

data/lib/lutaml/uml/association.rb

@@ -9,8 +9,10 @@ module Lutaml
                     :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,

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, pkg.packages.map(&:children_packages)] }.flatten.uniq
       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/parsers/dsl.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "parslet"
+require "parslet/convenience"
 require "lutaml/uml/parsers/dsl_preprocessor"
 require "lutaml/uml/parsers/dsl_transform"
 require "lutaml/uml/node/document"
@@ -8,6 +9,7 @@ require "lutaml/uml/node/document"
 module Lutaml
   module Uml
     module Parsers
+      class ParsingError < StandardError; end
       # Class for parsing LutaML dsl into Lutaml::Uml::Document
       class Dsl < Parslet::Parser
         # @param [String] io - LutaML string representation
@@ -20,7 +22,15 @@ module Lutaml
 
         def parse(input_file, _options = {})
           data = Lutaml::Uml::Parsers::DslPreprocessor.call(input_file)
-          ::Lutaml::Uml::Document.new(DslTransform.new.apply(super(data)))
+          # https://kschiess.github.io/parslet/tricks.html#Reporter engines
+          # Parslet::ErrorReporter::Deepest allows more
+          # detailed display of error
+          reporter = Parslet::ErrorReporter::Deepest.new
+          ::Lutaml::Uml::Document
+            .new(DslTransform.new.apply(super(data, reporter: reporter)))
+        rescue Parslet::ParseFailed => e
+          raise(ParsingError,
+                "#{e.message}\ncause: #{e.parse_failure_cause.ascii_tree}")
         end
 
         KEYWORDS = %w[
@@ -141,14 +151,14 @@ module Lutaml
         rule(:title_keyword) { kw_title >> spaces }
         rule(:title_text) do
           match['"\''].maybe >>
-            match['a-zA-Z0-9_\- '].repeat(1).as(:title) >>
+            match['a-zA-Z0-9_\- ,.:;'].repeat(1).as(:title) >>
             match['"\''].maybe
         end
         rule(:title_definition) { title_keyword >> title_text }
         rule(:caption_keyword) { kw_caption >> spaces }
         rule(:caption_text) do
           match['"\''].maybe >>
-            match['a-zA-Z0-9_\- '].repeat(1).as(:caption) >>
+            match['a-zA-Z0-9_\- ,.:;'].repeat(1).as(:caption) >>
             match['"\''].maybe
         end
         rule(:caption_definition) { caption_keyword >> caption_text }
@@ -292,9 +302,7 @@ module Lutaml
             str("definition") >>
             whitespace? >>
             str("{") >>
-            whitespace? >>
-            (match("[\n\s]}").absent? >> any).repeat.as(:definition) >>
-            whitespace? >>
+            ((str("\\") >> any) | (str("}").absent? >> any)).repeat.maybe.as(:definition) >>
             str('}')
         end
 
@@ -387,12 +395,11 @@ module Lutaml
             diagram_inner_definition.repeat.as(:members) >>
             str("}")
         end
-        rule(:diagram_body?) { diagram_body.maybe }
         rule(:diagram_definition) do
           diagram_keyword >>
             spaces? >>
             class_name.as(:name) >>
-            diagram_body? >>
+            diagram_body >>
             whitespace?
         end
         rule(:diagram_definitions) { diagram_definition >> whitespace? }

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

@@ -5,16 +5,28 @@ module Lutaml
     module Parsers
       # Class for preprocessing dsl ascii file special directives:
       # - include
-      module DslPreprocessor
-        module_function
+      class DslPreprocessor
+        attr_reader :input_file
 
-        def call(input_file)
+        def initialize(input_file)
+          @input_file = input_file
+        end
+
+        class << self
+          def call(input_file)
+            new(input_file).call
+          end
+        end
+
+        def call
           include_root = File.dirname(input_file.path)
           input_file.read.split("\n").reduce([]) do |res, line|
             res.push(*process_dsl_line(include_root, line))
           end.join("\n")
         end
 
+        private
+
         def process_dsl_line(include_root, line)
           process_include_line(include_root, process_comment_line(line))
         end
@@ -28,7 +40,7 @@ module Lutaml
 
         def process_include_line(include_root, line)
           include_path_match = line.match(/^\s*include\s+(.+)/)
-          return line if include_path_match.nil?
+          return line if include_path_match.nil? || line =~ /^\s\*\*/
 
           path_to_file = include_path_match[1].strip
           path_to_file = if path_to_file.match?(/^\//)
@@ -37,6 +49,9 @@ module Lutaml
                            File.join(include_root, path_to_file)
                          end
           File.read(path_to_file).split("\n")
+        rescue Errno::ENOENT
+          puts("No such file or directory @ rb_sysopen - #{path_to_file}, \
+            include file paths need to be supplied relative to the main document")
         end
       end
     end

data/lib/lutaml/uml/top_element_attribute.rb

@@ -9,6 +9,7 @@ module Lutaml
       attr_accessor :name,
                     :visibility,
                     :type,
+                    :xmi_id,
                     :definition,
                     :contain,
                     :static,

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.1"
+    VERSION = "0.4.3"
   end
 end

data/lutaml-uml.gemspec

@@ -25,13 +25,13 @@ Gem::Specification.new do |spec|
   spec.executables   = %w[lutaml-wsd2uml lutaml-yaml2uml]
 
   spec.add_runtime_dependency "hashie", "~> 4.1.0"
-  spec.add_runtime_dependency "parslet", "~> 1.7.1"
+  spec.add_runtime_dependency "parslet", "~> 2.0.0"
   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/broken_diagram.lutaml

@@ -0,0 +1,34 @@
+diagram MyView {
+  title "my diagram"
+
+  class AddressClassProfile {
+    addressClassProfile
+  }
+  class AttributeProfile {
+    attributeProfile
+  }
+
+  association BidirectionalAsscoiation {
+    owner_type aggregation
+    member_type direct
+    owner AddressClassProfile#addressClassProfile
+    member AttributeProfile#attributeProfile [0..*]
+  }
+
+  association DirectAsscoiation {
+    member_type direct
+    owner AddressClassProfile
+    member AttributeProfile#attributeProfile
+  }
+
+  class Foo {
+    +structuredidentifier[0..*]: StructuredIdentifierType
+    +technicalcommittee[1..*]: TechnicalCommitteeType
+  }
+
+  association ReverseAsscoiation {
+    owner_type aggregation
+    owner AddressClassProfile#addressClassProfile
+    member AttributeProfile
+  }
+}

data/spec/fixtures/dsl/diagram_attributes.lutaml

@@ -1,5 +1,6 @@
 diagram MyView {
   fontname "Arial"
-  title "my diagram"
+  title "my diagram, another symbols: text."
   class Foo {}
+  caption "Block elements of StandardDocument, adapted from BasicDocument. Another - symbol"
 }

data/spec/fixtures/dsl/diagram_blank_definion.lutaml

@@ -0,0 +1,6 @@
+diagram MyView {
+  class ImageMapAreaType {
+    definition {
+    }
+  }
+}

data/spec/fixtures/dsl/diagram_blank_entities.lutaml

@@ -0,0 +1,8 @@
+diagram MyView {
+  class ImageMapAreaType {
+  }
+  enum SomeEnum { 
+  }
+  data_type SomeEnum {
+  }
+}

data/spec/fixtures/dsl/diagram_commented_includes.lutaml

@@ -0,0 +1,5 @@
+diagram MyView {
+  title "my diagram"
+
+  ** include ../models/bipm_document/BipmCommitteeAcronym.lutaml
+}

data/spec/fixtures/dsl/diagram_non_existing_include.lutaml

@@ -0,0 +1,6 @@
+diagram MyView {
+  fontname "Arial"
+  title "my diagram"
+  include none_existing.lutaml
+  include none_existing1.lutaml
+}

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

@@ -34,7 +34,9 @@ RSpec.describe Lutaml::Uml::Parsers::Dsl do
 
       it "creates Lutaml::Uml::Document object and sets its attributes" do
         expect(parse).to be_instance_of(Lutaml::Uml::Document)
-        expect(parse.title).to eq("my diagram")
+        expect(parse.title).to eq("my diagram, another symbols: text.")
+        expect(parse.caption)
+          .to(eq("Block elements of StandardDocument, adapted from BasicDocument. Another - symbol"))
         expect(parse.fontname).to eq("Arial")
       end
 
@@ -287,5 +289,57 @@ RSpec.describe Lutaml::Uml::Parsers::Dsl do
 
       it_behaves_like "the correct graphviz formatting"
     end
+
+    context "when defninition is blank" do
+      let(:content) do
+        File.new(fixtures_path("dsl/diagram_blank_definion.lutaml"))
+      end
+
+      it "successfully renders" do
+        expect { parse }.to_not(raise_error)
+      end
+    end
+
+    context "when there are blank definitions" do
+      let(:content) do
+        File.new(fixtures_path("dsl/diagram_blank_entities.lutaml"))
+      end
+
+      it "successfully renders" do
+        expect { parse }.to_not(raise_error)
+      end
+    end
+
+    context "when its a non existing include file" do
+      let(:content) do
+        File.new(fixtures_path("dsl/diagram_non_existing_include.lutaml"))
+      end
+
+      it "successfully renders" do
+        expect { parse }.to_not(raise_error)
+      end
+    end
+
+    context "when there are commented preprocessor lines" do
+      let(:content) do
+        File.new(fixtures_path("dsl/diagram_commented_includes.lutaml"))
+      end
+
+      it "successfully renders" do
+        expect { parse }.to_not(raise_error)
+      end
+    end
+
+    context "when broken lutaml file passed" do
+      let(:content) do
+        File.new(fixtures_path("dsl/broken_diagram.lutaml"))
+      end
+
+      it "returns error object and prints line number" do
+        expect { described_class.parse(content, {}) }
+          .to(raise_error(Lutaml::Uml::Parsers::ParsingError,
+              /but got ":" at line 25 char 32/))
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-uml
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-14 00:00:00.000000000 Z
+date: 2021-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: ruby-graphviz
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -276,16 +279,21 @@ files:
 - spec/fixtures/datamodel/views/AddressProfile.yml
 - spec/fixtures/datamodel/views/CommonModels.yml
 - spec/fixtures/datamodel/views/TopDown.yml
+- spec/fixtures/dsl/broken_diagram.lutaml
 - spec/fixtures/dsl/diagram.lutaml
 - spec/fixtures/dsl/diagram_attributes.lutaml
+- spec/fixtures/dsl/diagram_blank_definion.lutaml
+- spec/fixtures/dsl/diagram_blank_entities.lutaml
 - spec/fixtures/dsl/diagram_class_assocation.lutaml
 - spec/fixtures/dsl/diagram_class_fields.lutaml
+- spec/fixtures/dsl/diagram_commented_includes.lutaml
 - spec/fixtures/dsl/diagram_comments.lutaml
 - spec/fixtures/dsl/diagram_concept_model.lutaml
 - spec/fixtures/dsl/diagram_data_types.lutaml
 - spec/fixtures/dsl/diagram_definitions.lutaml
 - spec/fixtures/dsl/diagram_includes.lutaml
 - spec/fixtures/dsl/diagram_multiply_classes.lutaml
+- spec/fixtures/dsl/diagram_non_existing_include.lutaml
 - spec/fixtures/dsl/shared.lutaml
 - spec/fixtures/dsl/shared1.lutaml
 - spec/fixtures/generated_dot/AddressClassProfile.dot
@@ -319,7 +327,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.