lutaml-uml 0.2.0 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9390b74fbba2e8c8ee424d8aecd2efd9d507d157e6a63cc64c115b821878ef01
-  data.tar.gz: e8d2466349d6b622ae0a3d46b1eeca87f0f3996d155fbf5bed75e90bc14a3b48
+  metadata.gz: 4dd197690f8da12b6b7ba5055db64eeb862717769f78ef7acf3477ce0a32f377
+  data.tar.gz: 400e3ead0e0d89f6a781a09a97967ed51d0d955015779334290829ed76d317da
 SHA512:
-  metadata.gz: 2d4a974174f13d690205e9d5f887745ec1268e16c8d031a137ca492fca24617a004d4ede0e72ed074b02694895d81b4128f7695811436e4d4a746676bacbb834
-  data.tar.gz: 8dbe1883d2ea7c910e48b4c0f9191559aaa7a6ee02c598b5a0b05a7fb3cd33407edc37101a9fec4297f9110be3fb9243625370b140c5a0fc36adc9d909a6b4ae
+  metadata.gz: bb4a6abf3136b6d1b4e207bd14d889e43ce2be9f9c4f036956702c0f9430c22baebaabd7d281f57feaa923b9ab9531a43be5d7d88276cce0fc8b856a222c807a
+  data.tar.gz: 228355fdf7c6fcb51f5ec0958470d3e0f9ff6fc675f0a6029ecba4c22a597fdef6bdd4d9a2df76bb2d5e2141c5a4227bdd97c2269ec3e2628f9ef3eac8508b78

data/.github/workflows/macos.yml

@@ -31,6 +31,8 @@ jobs:
         run: |
           sudo gem install bundler --force
           bundle install --jobs 4 --retry 3
+      - name: Install Grpahviz macOS
+        run: brew install graphviz
       - name: Run specs
         run: |
           bundle exec rake

data/.github/workflows/ubuntu.yml

@@ -33,6 +33,8 @@ jobs:
         run: |
           gem install bundler
           bundle install --jobs 4 --retry 3
+      - name: Install Grpahviz Ubuntu
+        run: sudo apt-get install graphviz
       - name: Run specs
         run: |
           bundle exec rake

data/.github/workflows/windows.yml

@@ -36,6 +36,16 @@ jobs:
           gem install bundler
           bundle config --local path vendor/bundle
           bundle install --jobs 4 --retry 3
+      - name: Install graphviz
+        uses: nick-invision/retry@v1
+        with:
+          polling_interval_seconds: 5
+          timeout_minutes: 5
+          max_attempts: 3
+          command: choco install --no-progress graphviz --version 2.38.0.20190211
+      - name: Check dot command
+        run: |
+          dot -?
       - name: Run specs
         run: |
           bundle exec rake

data/.gitignore

@@ -9,4 +9,4 @@
 
 # rspec failure tracking
 .rspec_status
-Gemfile.lock
+Gemfile.lock

data/LUTAML.adoc

@@ -110,6 +110,20 @@ class Relationship {
 class Element {}
 ----
 
+== Class' multiline "definition" property
+
+=== Definition
+
+Full syntax:
+
+[source,java]
+----
+definition
+  inner text
+end definition
+----
+
+
 == Attributes/entries
 
 === Definition
@@ -118,7 +132,7 @@ Full syntax:
 
 [source,java]
 ----
-[visibility][/][attribute] name [:type][multiplicity][=initial value][{property string}]
+[visibility][/][attribute] name [:type][multiplicity][=initial value][{attribute body}]
 ----
 
 where:
@@ -128,11 +142,7 @@ where:
 * `/` - symbolizes a derived attribute.
 * `multiplicity` -  Multiplicity is in square brackets (e.g. [1..*]).
 * `initial value` - Default value specifies the initial value of the attribute.
-* `property string` - Property string indicates a modifier that applies to the attribute:
-  ** {readonly}: the property can be read but not changed.
-  ** {union}: the property is a union of subsets.
-  ** {subsets <property>}: the property is a subset of <property>.
-  ** {redefines <property>}: the property is a new definition of <property> (overwritten by inheritance).
+* `{attribute body}` - Body of attribute, additional properties for attribute
 
 
 One can use explicit or implicit syntax for attribute definition
@@ -186,6 +196,21 @@ class Figure {
 }
 ----
 
+=== Additional attribute' properties
+
+example:
+
+[source,java]
+----
+class Figure {
+  + radius {
+    definition
+      Radius of the Figure
+    end definition
+  }
+}
+----
+
 == Methods
 
 Syntax for defining methods:

data/bin/folder_yaml2lutaml.sh

@@ -0,0 +1,6 @@
+script_full_path=$(dirname "$0")
+
+for i in $1/*.yml
+do
+$script_full_path/yaml2lutaml $i > "$1/$(basename -s .yml $i).lutaml"
+done

data/bin/plantuml2lutaml

@@ -0,0 +1,58 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# Script to convert plantuml files into LutaML syntax
+# Usage: bin/plantuml2lutaml /path/to/plantuml.wsd
+
+file_path = ARGV[0]
+FILE_NAME = File.basename(file_path, ".wsd")
+wsd_file = File.new(ARGV[0])
+
+def sync_puts(line, level = 0)
+  $stdout.puts("#{''.rjust(level)}#{line}")
+  $stdout.flush
+end
+
+SKIPPED_LINES_REGEXP = /^(@startuml|'\*{7}|note|@enduml|\!|'\/)/
+COMMENT_START = /\/'/
+COMMENT_END = /'\//
+ASSOCIATION_MAPPINGS = {
+  /-\|>/ => ",inheritance",
+  /<\|-/ => "inheritance,",
+  /->/ => ",direct",
+  /<-/ => "direct,",
+}.freeze
+
+in_comment_block = false
+
+def transform_line(line)
+  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(",")
+  blocks = line.split(" ")
+  owner = blocks.first
+  member = blocks.last
+  sync_puts("association {", 2)
+  sync_puts("owner #{owner}", 4)
+  sync_puts("member #{member}", 4)
+  sync_puts("owner_type #{owner_type}", 4) if !owner_type.to_s.empty?
+  sync_puts("member_type #{member_type}", 4) if !member_type.to_s.empty?
+  sync_puts("}", 2)
+end
+
+sync_puts("diagram #{FILE_NAME} {")
+wsd_file.readlines.each do |line|
+  if line.match?(COMMENT_START)
+    in_comment_block = true
+  end
+
+  if line.match?(COMMENT_END)
+    in_comment_block = false
+  end
+
+  next if in_comment_block || line =~ SKIPPED_LINES_REGEXP
+
+  transform_line(line)
+end
+sync_puts("}")

data/bin/yaml2lutaml

@@ -45,7 +45,7 @@ def process_association(owner, values, encountered_relations)
     if source["attribute"]
       source_attribute_name = source["attribute"].keys.first
       owner += "##{source_attribute_name}"
-      if source["attribute"][source_attribute_name]["cardinality"]
+      if source["attribute"][source_attribute_name] && source["attribute"][source_attribute_name]["cardinality"]
         cardinality = source["attribute"][source_attribute_name]["cardinality"]
         owner += " [#{cardinality['min']}..#{cardinality['max']}]"
       end
@@ -61,7 +61,7 @@ def process_association(owner, values, encountered_relations)
     if target["attribute"]
       target_attribute_name = target["attribute"].keys.first
       member += "##{target_attribute_name}"
-      if target["attribute"][target_attribute_name]["cardinality"]
+      if target["attribute"][target_attribute_name] && target["attribute"][target_attribute_name]["cardinality"]
         cardinality = target["attribute"][target_attribute_name]["cardinality"]
         member += " [#{cardinality['min']}..#{cardinality['max']}]"
       end
@@ -75,6 +75,7 @@ def process_association(owner, values, encountered_relations)
 end
 sync_puts("diagram #{File.basename(ARGV[0], 'yml')[0..-2]} {")
 sync_puts("title '#{view_yaml['title']}'", 2)
+sync_puts("caption '#{view_yaml['caption']}'", 2)
 
 # Class associations notations
 view_yaml["relations"]&.each do |values|
@@ -83,20 +84,55 @@ end
 
 view_yaml["imports"].keys.each do |entry|
   import = YAML.safe_load(File.read(File.join(models_path, "#{entry}.yml")))
-  import_name = import["name"]
+  import_name = import["name"] || File.basename(entry)
   # Class notation
-  sync_puts("#{import['modelType']} #{import['name']} {", 2)
+  sync_puts("#{import['modelType']} #{import_name} {", 2)
+  if import["definition"]
+    definition = <<~TEXT
+      definition
+        #{import['definition']}
+      end definition
+    TEXT
+    sync_puts(definition, 4)
+  end
   import["values"]&.each_pair do |key, values|
-    sync_puts("#{key}", 4)
+    result_string = key
+    if values["definition"]
+      result_string += <<~TEXT
+        {
+          definition
+          #{values['definition']}
+          end definition
+        }
+      TEXT
+    end
+    sync_puts(result_string, 4)
   end
   import["attributes"]&.each_pair do |key, values|
+    definition = values["definition"]
     cardinality = if values["cardinality"]
                     cardinality_val = values["cardinality"]
                     "[#{cardinality_val['min']}..#{cardinality_val['max']}]"
                   else
                     ""
                   end
-    sync_puts("+#{key}: #{values['type']} #{cardinality}", 4)
+    result_string = "+#{key}"
+    if values["type"]
+      result_string += ": #{values['type']}"
+    end
+    if cardinality
+      result_string += " #{cardinality}"
+    end
+    if definition
+      result_string += <<~TEXT
+        {
+          definition
+          #{definition}
+          end definition
+        }
+      TEXT
+    end
+    sync_puts(result_string, 4)
   end
   sync_puts("}", 2)
 

data/lib/lutaml/layout/graph_viz_engine.rb

@@ -7,9 +7,12 @@ module Lutaml
   module Layout
     class GraphVizEngine < Engine
       def render(type)
-        GraphViz
-          .parse_string(input)
-          .output(type => String)
+        Open3.popen3("dot -T#{type}") do |stdin, stdout, _stderr, _wait|
+          stdin.puts(input)
+          stdin.close
+          # unless (err = stderr.read).empty? then raise err end
+          stdout.read
+        end
       end
     end
   end

data/lib/lutaml/uml/class.rb

@@ -16,6 +16,7 @@ module Lutaml
 
       attr_reader :associations,
                   :attributes,
+                  :definition,
                   :members,
                   :modifier
 
@@ -31,6 +32,10 @@ module Lutaml
         @modifier = value.to_s # TODO: Validate?
       end
 
+      def definition=(value)
+        @definition = value.to_s
+      end
+
       def attributes=(value)
         @attributes = value.to_a.map do |attr|
           TopElementAttribute.new(attr)

data/lib/lutaml/uml/data_type.rb

@@ -3,8 +3,11 @@
 module Lutaml
   module Uml
     class DataType < Class
-      def keyword
-        "dataType"
+      attr_reader :keyword
+
+      def initialize(attributes = {})
+        super
+        @keyword = "dataType"
       end
     end
   end

data/lib/lutaml/uml/enum.rb

@@ -12,7 +12,14 @@ module Lutaml
 
       attr_reader :attributes,
                   :members,
-                  :modifier
+                  :modifier,
+                  :definition,
+                  :keyword
+
+      def initialize(attributes = {})
+        super
+        @keyword = "enumeration"
+      end
 
       def attributes=(value)
         @attributes = value.to_a.map do |attr|
@@ -20,14 +27,14 @@ module Lutaml
         end
       end
 
+      def definition=(value)
+        @definition = value.to_s
+      end
+
       # TODO: reserved name, change
       def methods
         []
       end
-
-      def keyword
-        "enumeration"
-      end
     end
   end
 end

data/lib/lutaml/uml/formatter/graphviz.rb

@@ -181,8 +181,10 @@ module Lutaml
                                     end
           # swap labels and arrows if `dir` eq to `back`
           if attributes["dir"] == "back"
-            attributes["arrowhead"], attributes["arrowtail"] = [attributes["arrowtail"], attributes["arrowhead"]]
-            attributes["headlabel"], attributes["taillabel"] = [attributes["taillabel"], attributes["headlabel"]]
+            attributes["arrowhead"], attributes["arrowtail"] =
+              [attributes["arrowtail"], attributes["arrowhead"]]
+            attributes["headlabel"], attributes["taillabel"] =
+              [attributes["taillabel"], attributes["headlabel"]]
           end
           attributes
         end
@@ -226,8 +228,6 @@ module Lutaml
               #{name.map { |n| %(<TR><TD ALIGN="CENTER">#{n}</TD></TR>) }.join('\n')}
             </TABLE>
           HEREDOC
-          # name = "«abstract»<BR/><I>#{name}</I>" if node.modifier == "abstract"
-          # name = "«interface»<BR/>#{name}" if node.modifier == "interface"
 
           field_table = format_member_rows(node.attributes, hide_members)
           method_table = format_member_rows(node.methods, hide_members)
@@ -256,7 +256,10 @@ module Lutaml
             hide_members = node.fidelity["hideMembers"]
             hide_other_classes = node.fidelity["hideOtherClasses"]
           end
-          classes = (node.classes + node.enums).map do |class_node|
+          classes = (node.classes +
+                      node.enums +
+                      node.data_types +
+                      node.primitives).map do |class_node|
             graph_node_name = generate_graph_name(class_node.name)
 
             <<~HEREDOC
@@ -269,7 +272,8 @@ module Lutaml
           associations = node.classes.map(&:associations).compact.flatten +
             node.associations
           if node.groups
-            associations = sort_by_document_groupping(node.groups, associations)
+            associations = sort_by_document_groupping(node.groups,
+                                                      associations)
           end
           classes_names = node.classes.map(&:name)
           associations = associations.map do |assoc_node|
@@ -318,12 +322,7 @@ module Lutaml
         end
 
         def generate_from_dot(input)
-          # https://github.com/glejeune/Ruby-Graphviz/issues/78
-          # Ruby-Graphviz has an old bug when html labels was not displayed
-          #  property because of `<` and `>` characters escape, add additional
-          #   `<` and `>` symbols to workaround it
-          escaped_dot = input.gsub("<<", "<<<").gsub(">>", ">>>")
-          Lutaml::Layout::GraphVizEngine.new(input: escaped_dot).render(@type)
+          Lutaml::Layout::GraphVizEngine.new(input: input).render(@type)
         end
 
         def generate_graph_name(name)

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

@@ -53,6 +53,7 @@ module Lutaml
           realizes
           static
           title
+          caption
         ].freeze
 
         KEYWORDS.each do |keyword|
@@ -61,7 +62,9 @@ module Lutaml
 
         rule(:spaces) { match("\s").repeat(1) }
         rule(:spaces?) { spaces.maybe }
-        rule(:whitespace) { (match("\s") | match("\n") | str(";")).repeat(1) }
+        rule(:whitespace) do
+          (match("\s") | match("\r?\n") | match("\r") | str(";")).repeat(1)
+        end
         rule(:whitespace?) { whitespace.maybe }
         rule(:name) { match["a-zA-Z0-9 _-"].repeat(1) }
         rule(:newline) { str("\n") >> str("\r").maybe }
@@ -104,7 +107,7 @@ module Lutaml
         rule(:method_abstract) { (kw_abstract.as(:abstract) >> spaces).maybe }
         rule(:attribute_keyword) do
           str("<<") >>
-            match['a-zA-Z0-9_\-'].repeat(1).as(:keyword) >>
+            match['a-zA-Z0-9_\-\/'].repeat(1).as(:keyword) >>
             str(">>")
         end
         rule(:attribute_keyword?) { attribute_keyword.maybe }
@@ -130,7 +133,8 @@ module Lutaml
             attribute_name >>
             match['"\''].maybe >>
             attribute_type? >>
-            cardinality?)
+            cardinality? >>
+            class_body?)
             .as(:attributes)
         end
 
@@ -141,6 +145,13 @@ module Lutaml
             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['"\''].maybe
+        end
+        rule(:caption_definition) { caption_keyword >> caption_text }
 
         rule(:fontname_keyword) { kw_fontname >> spaces }
         rule(:fontname_text) do
@@ -250,7 +261,8 @@ module Lutaml
         end
         rule(:class_keyword) { kw_class >> spaces }
         rule(:class_inner_definitions) do
-          attribute_definition |
+          definition_body |
+            attribute_definition |
             comment_definition |
             comment_multiline_definition
         end
@@ -274,10 +286,21 @@ module Lutaml
             class_body?
         end
 
+        # -- Definition
+        rule(:definition_body) do
+          spaces? >>
+            str("definition") >>
+            whitespace? >>
+            (str("end definition").absent? >> any).repeat.as(:definition) >>
+            whitespace? >>
+            str("end definition")
+        end
+
         # -- Enum
         rule(:enum_keyword) { kw_enum >> spaces }
         rule(:enum_inner_definitions) do
-          attribute_definition |
+          definition_body |
+            attribute_definition |
             comment_definition |
             comment_multiline_definition
         end
@@ -337,6 +360,7 @@ module Lutaml
         rule(:diagram_keyword) { kw_diagram >> spaces? }
         rule(:diagram_inner_definitions) do
           title_definition |
+            caption_definition |
             fontname_definition |
             class_definition.as(:classes) |
             enum_definition.as(:enums) |

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

@@ -27,7 +27,7 @@ module Lutaml
         end
 
         def process_include_line(include_root, line)
-          include_path_match = line.match(/\s*include\s+(.+)/)
+          include_path_match = line.match(/^\s*include\s+(.+)/)
           return line if include_path_match.nil?
 
           path_to_file = include_path_match[1].strip

data/lib/lutaml/uml/primitive_type.rb

@@ -3,8 +3,11 @@
 module Lutaml
   module Uml
     class PrimitiveType < DataType
-      def keyword
-        "primitive"
+      attr_reader :keyword
+
+      def initialize(attributes = {})
+        super
+        @keyword = "primitive"
       end
     end
   end

data/lib/lutaml/uml/top_element_attribute.rb

@@ -4,6 +4,7 @@ module Lutaml
   module Uml
     class TopElementAttribute
       include HasAttributes
+      include HasMembers
 
       attr_accessor :name,
                     :visibility,

data/lib/lutaml/uml/version.rb

@@ -2,6 +2,6 @@
 
 module Lutaml
   module Uml
-    VERSION = "0.2.0"
+    VERSION = "0.2.5"
   end
 end

data/lutaml-uml.gemspec

@@ -29,12 +29,12 @@ 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_development_dependency "byebug"
-  spec.add_development_dependency "nokogiri", "~> 1.10"
-  spec.add_development_dependency "rubocop", "~> 0.54.0"
 
   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"
+  spec.add_development_dependency "rubocop", "~> 0.54.0"
 end

data/spec/fixtures/dsl/diagram_definitions.lutaml

@@ -0,0 +1,20 @@
+diagram MyView {
+  title "my diagram"
+
+  class AddressClassProfile {
+    definition
+      this is multiline with `ascidoc`
+      comments
+      and list
+    end definition
+    +addressClassProfile: CharacterString [0..1]
+  }
+
+  class AttributeProfile {
+    imlicistAttributeProfile: CharacterString [0..1] {
+      definition this is attribute definition
+      with multiply lines
+      end definition
+    }
+  }
+}

data/spec/lutaml/layout/graph_viz_engine_spec.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe Lutaml::Layout::GraphVizEngine do
+  describe "#render" do
+    subject(:render) do
+      described_class.new(input: input).render(type)
+    end
+    let(:input) do
+      File.read(fixtures_path("generated_dot/AddressClassProfile.dot"))
+    end
+
+    context "when png output type" do
+      let(:type) { "png" }
+      let(:png_header) { "\x89PNG" }
+
+      it "renders input as png binary string" do
+        expect(render[0..3]).to(eq(png_header))
+      end
+    end
+
+    context "when dot output type" do
+      let(:type) { "dot" }
+
+      it "renders input as dot string" do
+        expect(render).to(match("digraph G {"))
+      end
+    end
+  end
+end

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

@@ -248,5 +248,29 @@ RSpec.describe Lutaml::Uml::Parsers::Dsl do
 
       it_behaves_like "the correct graphviz formatting"
     end
+
+    context "when defninition directives included" do
+      let(:content) do
+        File.new(fixtures_path("dsl/diagram_definitions.lutaml"))
+      end
+      let(:class_definition) do
+        "this is multiline with `ascidoc`\n      comments\n      and list"
+      end
+      let(:attribute_definition) do
+        "this is attribute definition\n      with multiply lines"
+      end
+
+      it "create comments for document and classes" do
+        expect(by_name(parse.classes, "AddressClassProfile").definition)
+          .to(eq(class_definition))
+        expect(by_name(parse.classes, "AttributeProfile")
+                .attributes
+                .first
+                .definition)
+          .to(eq(attribute_definition))
+      end
+
+      it_behaves_like "the correct graphviz formatting"
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-uml
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-12 00:00:00.000000000 Z
+date: 2020-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -81,61 +81,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.54.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.54.0
 description: UML model module for LutaML.
 email:
 - open.source@ribose.com'
@@ -194,12 +194,12 @@ files:
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LUTAML.adoc
 - README.adoc
 - Rakefile
 - bin/console
-- bin/lutaml2dotpng
+- bin/folder_yaml2lutaml.sh
+- bin/plantuml2lutaml
 - bin/setup
 - bin/yaml2lutaml
 - exe/lutaml-uml
@@ -297,12 +297,14 @@ files:
 - 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/shared.lutaml
 - spec/fixtures/dsl/shared1.lutaml
 - spec/fixtures/generated_dot/AddressClassProfile.dot
 - spec/fixtures/generated_dot/AddressProfile.dot
+- spec/lutaml/layout/graph_viz_engine_spec.rb
 - spec/lutaml/uml/formatter/graphviz_spec.rb
 - spec/lutaml/uml/parsers/dsl_spec.rb
 - spec/lutaml/uml/parsers/yaml_spec.rb

data/bin/lutaml2dotpng

@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# Script to convert lutaml files into dot and png files
-# Usage: bin/lutaml2dotpng /path/to/lutaml/folder/
-require "bundler/setup"
-require "lutaml/uml"
-
-basedir = ARGV[0]
-Dir["#{basedir}/*.lutaml"].each do |filename|
-  puts(filename)
-  base_filename = File.basename(filename, '.lutaml')
-  File.open("#{basedir}/#{base_filename}.dot", 'w') do |file|
-    file
-      .puts(Lutaml::Uml::Formatter::Graphviz
-              .new
-              .format_document(
-                Lutaml::Uml::Parsers::Dsl
-                  .parse(File.read("#{basedir}/#{base_filename}.lutaml"))))
-  end
-  `dot -T png #{"#{basedir}/#{base_filename}.dot"} > "#{basedir}/#{base_filename}.png"`
-end