lutaml-uml 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9390b74fbba2e8c8ee424d8aecd2efd9d507d157e6a63cc64c115b821878ef01
-  data.tar.gz: e8d2466349d6b622ae0a3d46b1eeca87f0f3996d155fbf5bed75e90bc14a3b48
+  metadata.gz: 988b726887b8bd5f85e4cff7f56bfac405c6ea287f80d0a2222adf994ced4f70
+  data.tar.gz: 2d2aa85fcc8c25fc64ecd2a4cecbe028e54eeebe79f78e6615298ef095de667e
 SHA512:
-  metadata.gz: 2d4a974174f13d690205e9d5f887745ec1268e16c8d031a137ca492fca24617a004d4ede0e72ed074b02694895d81b4128f7695811436e4d4a746676bacbb834
-  data.tar.gz: 8dbe1883d2ea7c910e48b4c0f9191559aaa7a6ee02c598b5a0b05a7fb3cd33407edc37101a9fec4297f9110be3fb9243625370b140c5a0fc36adc9d909a6b4ae
+  metadata.gz: 6d068ec140b4a284c0a1f0f7762c86b03bdaa1ad667c96a614f1009007e9fb064a8b5df787bf0d06185169ca0b0b8afebda70d82ae62bfd52fcb01c4f79f012f
+  data.tar.gz: bdebc9b1068f9f98eb2fc2da7b03d3d389231440064964e518169e1acd4c73d1f5e509ed53aad92d734afa58bddd0882cbc63802d6280068d400784e773105f3

data/.gitignore

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

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,'
+}
+
+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.find { |(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.length > 0
+  sync_puts("member_type #{member_type}", 4) if member_type.to_s.length > 0
+  sync_puts("}", 2)
+end
+
+sync_puts("diagram #{FILE_NAME} {")
+wsd_file.readlines.each do |line|
+  if line =~ COMMENT_START
+    in_comment_block = true
+  end
+
+  if line =~ 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
@@ -83,9 +83,9 @@ 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)
   import["values"]&.each_pair do |key, values|
     sync_puts("#{key}", 4)
   end

data/lib/lutaml/layout/graph_viz_engine.rb

@@ -7,10 +7,22 @@ module Lutaml
   module Layout
     class GraphVizEngine < Engine
       def render(type)
-        GraphViz
-          .parse_string(input)
+        parse_graphviz_string
           .output(type => String)
       end
+
+      private
+
+      # GraphViz#parse_string and GraphViz#parse crush with no reason
+      # with seg fault, this lead to nil return value.
+      # Try to recall method several time
+      def parse_graphviz_string(attempts = 10)
+        raise('Cannot parse input string, `gvpr` segmentation fault?') if attempts == 0
+        res = GraphViz.parse_string(input)
+        return res if res
+
+        parse_graphviz_string(attempts - 1)
+      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|

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

@@ -61,7 +61,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 +106,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 }

data/lib/lutaml/uml/version.rb

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

data/lutaml-uml.gemspec

@@ -29,10 +29,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_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 "pry", "~> 0.12.2"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-uml
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-12 00:00:00.000000000 Z
+date: 2020-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -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

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