lutaml 0.5.2 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c570c69bf1b1fce5a01012f692e017bd140f3298e576f2a1ac5aa28f79389e3c
-  data.tar.gz: a63175e2fa1b7c2dd147116924f7767aa197ac9da40dc2389d646da5d4b6cf1c
+  metadata.gz: 3c8c9c9925c903683c1c064a0d4ac01881921191e1d866d4591ee5af25863a63
+  data.tar.gz: 3d092efcac46c0b68bd3f81630b5e4edac71d9eb1005f4e327f548a6c104e8ee
 SHA512:
-  metadata.gz: aa45c7df071a37185d9b3fc7ca78fc54c288591da1cbc9e823546d108d76ddf60d86a220165939ffba6c62300a07c8cb7f6e93dbe5b18e8b39ed83c040e0f4ec
-  data.tar.gz: 1939181b7331780c4b894ffb096af7ca332b3f0253d38b7a6f74c6d8b1760dfcc4f6f3d3268db4fd1fdfe6f01fa2046796b2c8febf0ef1cb694dc3a98c243567
+  metadata.gz: 562c97e4dd4df808ad288cb71a4b259da11ba3e3d2b011c6933f33e9a2cd84d352067b3083aa273cffd145ae4efd180a62d49554673bf1ae430d69d2d44d7567
+  data.tar.gz: 179cda873386b6d3723941d1de71086f96c3d62ba0e2f210c0934ba4e6499658945492a389f6c52a8a154725ba5ff2a579480eb554bf14f95935342901c01526

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

@@ -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

@@ -1,8 +1,9 @@
 require "lutaml/express"
 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
@@ -37,9 +38,11 @@ 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"
         file_list.map { |file| Lutaml::Uml::Parsers::Dsl.parse(file) }
       when "yml"

data/lib/lutaml/version.rb

@@ -1,3 +1,3 @@
 module Lutaml
-  VERSION = "0.5.2".freeze
+  VERSION = "0.7.2".freeze
 end

data/lutaml.gemspec

@@ -27,10 +27,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "lutaml-express", "~> 0.1.3"
-  spec.add_runtime_dependency "lutaml-uml", "~> 0.2.5"
+  spec.add_runtime_dependency "lutaml-express"
+  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,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: lutaml
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.7.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-15 00:00:00.000000000 Z
+date: 2021-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-express
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: lutaml-uml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: lutaml-xmi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -59,7 +73,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -207,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'