lutaml 0.6.1 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2798d99ace6b24bd0796035c70b8a9399a9677ec062b9e88d0d45efc03b71560
-  data.tar.gz: 904f3edd91cbaf215d3b86ec756cdfe7bcd8c5568decbe0cf363dbf743ccf796
+  metadata.gz: 042ab4eb8ec87f5b350bc20a6342756892a3cd4929dfbbe537464590c8278dba
+  data.tar.gz: 4cbadc50bdae9f93b5c882f060ac5532e491271ee455660d0dab9df0b1eaf87c
 SHA512:
-  metadata.gz: d5ea070108ac8730d34b073fc9b44bd5696cfef511f3b61da1bd258aca4796e3647f11b1c8489ad1f5c6d89f64ebc55927ad392cd8ff33a0c095d5d404c6da23
-  data.tar.gz: 619bf829a3c1b3939b84c083d9bfcaa43acec693d070a9ddbdc2370ea01f7427de1df8df1da23672676eae9670699aba6c6b891032f3df012b4049e83c0341ff
+  metadata.gz: ad3d25038abb6ff22b79f1eb27eaa1439920b4d6bc582ed055049d8ad9de41eb9a8280f169e772b005ef5a4cc6978e5e3fa916a7b48ee6ef2a97509464c0747a
+  data.tar.gz: 444254ebb4926068d2651f4e76c75c38c955efa514234fbfab9943e7973e473b9d4cb411f15348cfd9eb632d8a3abade0e95bfebd8ff8cb45d23ab6a3f1e7f26

data/lib/lutaml/command_line.rb

@@ -70,6 +70,10 @@ module Lutaml
 
     def run(original_args)
       args = original_args.dup
+      if args.length.zero? || args.first.strip == "help"
+        print_help
+        exit
+      end
       @option_parser.parse!(args) rescue nil
       @paths = args
       @formatter.type = @type

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"] =

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.1".freeze
+  VERSION = "0.7.4".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.1
+  version: 0.7.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-30 00:00:00.000000000 Z
+date: 2021-07-06 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: