lutaml 0.5.1 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0d36cefb8c5f6affcb0d56b44ab5d1f807608d8676c372ebea115a1dbda9bd8
-  data.tar.gz: b1f11f6cb22a115973ada3e6bc9a86de14a22288f32c6caaef92187673e9deb2
+  metadata.gz: 2372cde172cebedf126a9b7a5fe7c5804f01665edf1c0df8e6ec37ed331123b6
+  data.tar.gz: bdadc4307551438db682b0ada9df027649f49c2eb3e12ba1d739acb18908defa
 SHA512:
-  metadata.gz: 1d61ed2509c43cb9e31f3b643eae02a317c0b1ccdbbf0692b81d19afbe0196141157bd5e2951b4380fd94ad2a0a0a2a644a05d98e98eeec9b9809ec1f14e19ae
-  data.tar.gz: 7fec19ce2c1b94d81b12e0fa687d960af66d0c305d5f43afb5bbd56c6da49b3c4f77fbe5959262c33eec878082206c17e85a8266436cb73429934ca4880e0ecc
+  metadata.gz: f270391b3bfcff20e9fae105ee225e3328d8ad01ea8bfcb2d84f4e3dc708b8530430dfb181fbce69c608951a9e704f00660c661aa7e8374ab336116d6f342f30
+  data.tar.gz: a354e11497713401b4f9e0571aaf6fd2ff415b50926d5f52e90831fde1a0f0f022d2126faedd0d1aed70a5670177c605a9aece5cbd8c0f067e86540dfcae73c0

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

@@ -9,7 +9,7 @@ module Lutaml
 
         def serialize_document(repository)
           repository
-            .to_hash(formatter: Formatter)['schemas']
+            .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/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
@@ -29,7 +30,7 @@ module Lutaml
 
     def parse
       documents = parse_into_document
-      return [document_wrapper(documents)] if ["exp", EXPRESS_CACHE_PARSE_TYPE].include?(parse_type)
+      return document_wrapper(documents) if ["exp", EXPRESS_CACHE_PARSE_TYPE].include?(parse_type)
 
       documents.map { |doc| document_wrapper(doc) }
     end
@@ -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.1".freeze
+  VERSION = "0.7.1".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.1
+  version: 0.7.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-14 00:00:00.000000000 Z
+date: 2021-05-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'