lutaml 0.4.1 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 778331709b63955afae5ec2639758cd7d2ce68716f924552810eca11164bc2fc
-  data.tar.gz: bfcc945badadc762e377ece6d56fecb6138bcdb268837514c841fb93dc38c7d0
+  metadata.gz: 2798d99ace6b24bd0796035c70b8a9399a9677ec062b9e88d0d45efc03b71560
+  data.tar.gz: 904f3edd91cbaf215d3b86ec756cdfe7bcd8c5568decbe0cf363dbf743ccf796
 SHA512:
-  metadata.gz: 67658e85d724a926f0487cb5441b9581800406d857c43fd3cb51fbb747e6607e188e9556a79f44a720577ae2bd8f5b93d3b5a0eebeeb89fcbfd67a66063282e3
-  data.tar.gz: 3cc650c16223c5384eb84c743c6b1f2c739adac4819ec0a8afc87be3b012938447e5cd609fbfaa6327f1fec3c4b378b1af36f065501da8a33d993b7b6e633e68
+  metadata.gz: d5ea070108ac8730d34b073fc9b44bd5696cfef511f3b61da1bd258aca4796e3647f11b1c8489ad1f5c6d89f64ebc55927ad392cd8ff33a0c095d5d404c6da23
+  data.tar.gz: 619bf829a3c1b3939b84c083d9bfcaa43acec693d070a9ddbdc2370ea01f7427de1df8df1da23672676eae9670699aba6c6b891032f3df012b4049e83c0341ff

data/Gemfile

@@ -1,4 +1,6 @@
 source "https://rubygems.org"
 
+gem "expressir"
+
 # Specify your gem's dependencies in lutaml.gemspec
 gemspec

data/README.adoc

@@ -37,7 +37,9 @@ In order to parse files supported by lutaml extensions, use Lutaml::Parser.parse
 [source,ruby]
 ----
 # example.exp is an EXPRESS repository file
-Lutaml::Parser.parse(File.new("example.exp")) # will produce Lutaml::LutamlPath::DocumentWrapper object with serialized express repository
+Lutaml::Parser.parse([File.new("example.exp")]) # will produce Lutaml::LutamlPath::DocumentWrapper object with serialized express repository
+# example.yaml is an EXPRESS cache file
+Lutaml::Parser.parse([File.new("example.yaml")], ::Lutaml::Parser::EXPRESS_CACHE_PARSE_TYPE)
 ----
 
 == With cli tool

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/lutaml_path/document_wrapper.rb

@@ -1,9 +1,10 @@
 module Lutaml
   module LutamlPath
     class DocumentWrapper
-      attr_reader :serialized_document
+      attr_reader :serialized_document, :original_document
 
       def initialize(document)
+        @original_document = document
         @serialized_document = serialize_document(document)
       end
 
@@ -26,7 +27,7 @@ module Lutaml
       end
 
       def serialize_to_hash(object)
-        return object if [String, Integer, Float, FalseClass, TrueClass, Symbol, NilClass].include?(object.class)
+        return object if [String, Integer, Float, FalseClass, TrueClass, Symbol, NilClass, Hash].include?(object.class)
 
         object.instance_variables.each_with_object({}) do |var, res|
           variable = object.instance_variable_get(var)
@@ -35,7 +36,7 @@ module Lutaml
                                             serialize_to_hash(n)
                                           end
                                         else
-                                          if [String, Integer, Float, FalseClass, TrueClass, Symbol, NilClass].include?(variable.class) || var == :@parent
+                                          if [String, Integer, Float, FalseClass, TrueClass, Symbol, NilClass, Hash].include?(variable.class) || var == :@parent
                                             variable
                                           else
                                             serialize_to_hash(variable)

data/lib/lutaml/parser.rb

@@ -1,10 +1,14 @@
 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"
 
 module Lutaml
   class Parser
+    EXPRESS_CACHE_PARSE_TYPE = "exp.cache".freeze
+
     attr_reader :parse_type, :file_list
 
     class << self
@@ -26,7 +30,7 @@ module Lutaml
 
     def parse
       documents = parse_into_document
-      return [document_wrapper(documents)] if parse_type == "exp"
+      return document_wrapper(documents) if ["exp", EXPRESS_CACHE_PARSE_TYPE].include?(parse_type)
 
       documents.map { |doc| document_wrapper(doc) }
     end
@@ -35,6 +39,10 @@ module Lutaml
       case parse_type
       when "exp"
         Expressir::ExpressExp::Parser.from_files(file_list.map(&:path))
+      when EXPRESS_CACHE_PARSE_TYPE
+        Expressir::ExpressExp::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"
@@ -47,7 +55,7 @@ module Lutaml
     private
 
     def document_wrapper(document)
-      if parse_type == "exp"
+      if ["exp", EXPRESS_CACHE_PARSE_TYPE].include?(parse_type)
         return Lutaml::Express::LutamlPath::DocumentWrapper.new(document)
       end
 

data/lib/lutaml/version.rb

@@ -1,3 +1,3 @@
 module Lutaml
-  VERSION = "0.4.1".freeze
+  VERSION = "0.6.1".freeze
 end

data/lutaml.gemspec

@@ -27,8 +27,9 @@ 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"
 

metadata

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: lutaml
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.6.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-08 00:00:00.000000000 Z
+date: 2021-03-30 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