lutaml 0.6.0 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '02909e34c428277e9b0e79733bcb3162da4a149c4880d96d0890131f8f12115c'
-  data.tar.gz: d56d9a964b34c111493c7ffa0888dd2260d3d197e60bb92f4ee4aad1c236a87f
+  metadata.gz: cbe4e5553ef3d60b408138ed73e255782ff8489ef539ee2086e4c813b76ff20e
+  data.tar.gz: e6804f716ac877a1831739447d10da41f750385038a126ffe35bb60d94021a7c
 SHA512:
-  metadata.gz: 869303f2d2cac53f2abe735f8fe1511f7cdf0443c57d8235f1e14520425b3ac3cbc5dd96d09d423a5c81d85a6539970010d880e518e4f3e48d4795a4737154a1
-  data.tar.gz: 1f02d2681e529d6adef066a863b0656ceb9a4c1157d094a41f3d87db04aa4edc30c984093ed5ef4b81bbbdf9fd74f09ac95a4391c039b63c72397f53e3758415
+  metadata.gz: 06af7559b899bb92b0fe08874c90af384647b4b5a9c12214804a54df88222dbb8dda06ccf55ea6b003974eb37a27c2c87efb06fabb3be40407cbd6da0fe18c69
+  data.tar.gz: 9bdf7c6e82d5dc09ddc17f86af02479dafd14c71377f3c5d757110a69d390a7f05d87d5668032e16f1ae74099c0b291911bde69967614e33fa95a7deae520c7f

data/lib/lutaml/express/lutaml_path/document_wrapper.rb

@@ -9,7 +9,7 @@ module Lutaml
 
         def serialize_document(repository)
           repository
-            .to_hash(formatter: Formatter)
+            .to_hash(formatter: Formatter, include_empty: true)
         end
       end
     end

data/lib/lutaml/express/lutaml_path/formatter.rb

@@ -1,13 +1,13 @@
-require "expressir/express_exp/formatter"
-require "expressir/express_exp/schema_head_formatter"
-require "expressir/express_exp/hyperlink_formatter"
+require "expressir/express/formatter"
+require "expressir/express/schema_head_formatter"
+require "expressir/express/hyperlink_formatter"
 
 module Lutaml
   module Express
     module LutamlPath
-      class Formatter < Expressir::ExpressExp::Formatter
-        include Expressir::ExpressExp::SchemaHeadFormatter
-        include Expressir::ExpressExp::HyperlinkFormatter
+      class Formatter < Expressir::Express::Formatter
+        include Expressir::Express::SchemaHeadFormatter
+        include Expressir::Express::HyperlinkFormatter
       end
     end
   end

data/lib/lutaml/formatter/graphviz.rb

@@ -97,7 +97,7 @@ module Lutaml
           result += " : #{keyword}#{node.type}"
         end
         if node.cardinality
-          result += "[#{node.cardinality[:min]}..#{node.cardinality[:max]}]"
+          result += "[#{node.cardinality['min']}..#{node.cardinality['max']}]"
         end
         result = escape_html_chars(result)
         result = "<U>#{result}</U>" if node.static
@@ -179,7 +179,7 @@ module Lutaml
                                     "onormal"
                                   end
         # swap labels and arrows if `dir` eq to `back`
-        if attributes["dir"] == "back"
+        if attributes["dir"] == "back" && attributes["arrowtail"] != "vee"
           attributes["arrowhead"], attributes["arrowtail"] =
             [attributes["arrowtail"], attributes["arrowhead"]]
           attributes["headlabel"], attributes["taillabel"] =
@@ -288,6 +288,7 @@ module Lutaml
         associations = associations
           .lines.map { |line| "  #{line}" }.join.chomp
 
+          require 'byebug'; byebug
         <<~HEREDOC
           digraph G {
             graph [#{@graph}]

data/lib/lutaml/parser.rb

@@ -3,7 +3,7 @@ require "lutaml/uml"
 require "lutaml/xmi"
 require "lutaml/uml/lutaml_path/document_wrapper"
 require "lutaml/express/lutaml_path/document_wrapper"
-require "expressir/express_exp/cache"
+require "expressir/express/cache"
 
 module Lutaml
   class Parser
@@ -38,9 +38,9 @@ module Lutaml
     def parse_into_document
       case parse_type
       when "exp"
-        Expressir::ExpressExp::Parser.from_files(file_list.map(&:path))
+        Expressir::Express::Parser.from_files(file_list.map(&:path))
       when EXPRESS_CACHE_PARSE_TYPE
-        Expressir::ExpressExp::Cache.from_file(file_list.first.path)
+        Expressir::Express::Cache.from_file(file_list.first.path)
       when 'xmi'
         file_list.map { |file| Lutaml::XMI::Parsers::XML.parse(file) }
       when "lutaml"

data/lib/lutaml/version.rb

@@ -1,3 +1,3 @@
 module Lutaml
-  VERSION = "0.6.0".freeze
+  VERSION = "0.7.3".freeze
 end

data/lutaml.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "lutaml-uml"
   spec.add_runtime_dependency "lutaml-xmi"
   spec.add_runtime_dependency "thor", "~> 1.0"
-  spec.add_development_dependency "nokogiri", "~> 1.10"
+  spec.add_runtime_dependency "nokogiri", "~> 1.10"
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "byebug"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-28 00:00:00.000000000 Z
+date: 2021-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-express
@@ -73,7 +73,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -221,7 +221,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: 'LutaML: data models in textual form'