lutaml 0.4.1.pre.alpha → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9856bef749609c2186daef72d9cac2275abdf35dee480be0658700d20e0f9e31
-  data.tar.gz: f5a0c9decbf6188da822b39655ee14d048387783b28d92a5fa280781e6c02a16
+  metadata.gz: e0d36cefb8c5f6affcb0d56b44ab5d1f807608d8676c372ebea115a1dbda9bd8
+  data.tar.gz: b1f11f6cb22a115973ada3e6bc9a86de14a22288f32c6caaef92187673e9deb2
 SHA512:
-  metadata.gz: f4ccdf6b1a8ef299ce9a255b9615595f68ed6d07159808983451fe637cbda6747d71a03171c49d21f0b2797346e0daca0a9e94a8e55ca9614e734d54588a2b65
-  data.tar.gz: 37e385085efc088644b1d582144e5436ad5e4310899f25f4fbfafa090302410d8ce3343601a9c2250b4ac57f3a073b1c996bdbcd982602d6c58a7fc0197c3321
+  metadata.gz: 1d61ed2509c43cb9e31f3b643eae02a317c0b1ccdbbf0692b81d19afbe0196141157bd5e2951b4380fd94ad2a0a0a2a644a05d98e98eeec9b9809ec1f14e19ae
+  data.tar.gz: 7fec19ce2c1b94d81b12e0fa687d960af66d0c305d5f43afb5bbd56c6da49b3c4f77fbe5959262c33eec878082206c17e85a8266436cb73429934ca4880e0ecc

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/command_line.rb

@@ -88,6 +88,7 @@ module Lutaml
 
         document = Lutaml::Parser
           .parse_into_document(File.new(input_path), @input_format)
+          .first
         result = @formatter.format(document)
 
         if @output_path

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

@@ -1,50 +1,15 @@
 require "lutaml/lutaml_path/document_wrapper"
-require "expressir/express_exp/formatter"
+require "lutaml/express/lutaml_path/formatter"
 
 module Lutaml
   module Express
     module LutamlPath
       class DocumentWrapper < ::Lutaml::LutamlPath::DocumentWrapper
-        SOURCE_CODE_ATTRIBUTE_NAME = "sourcecode".freeze
-
         protected
 
         def serialize_document(repository)
-          repository.schemas.each_with_object({}) do |schema, res|
-            res["schemas"] ||= []
-            res[schema.id] = serialize_value(schema).merge(SOURCE_CODE_ATTRIBUTE_NAME => entity_source_code(schema))
-            res["schemas"].push(res[schema.id])
-          end
-        end
-
-        def serialize_value(object)
-          object.instance_variables.each_with_object({}) do |var, res|
-            variable = object.instance_variable_get(var)
-            if variable.respond_to?(:to_hash)
-              res[var.to_s.gsub("@", "")] = variable.to_hash.merge(SOURCE_CODE_ATTRIBUTE_NAME => entity_source_code(variable))
-            elsif variable.is_a?(Array)
-              res[var.to_s.gsub("@", "")] = variable.map do |entity|
-                if entity.respond_to?(:to_hash)
-                  entity.to_hash.merge(SOURCE_CODE_ATTRIBUTE_NAME => entity_source_code(entity))
-                else
-                  entity
-                end
-              end
-            else
-              res[var.to_s.gsub("@", "")] = variable
-            end
-          end
-        end
-
-        def merge_source_code_attr(serialized_entries, entities)
-          serialized_entries.map do |serialized|
-            entity = entities.detect { |n| n.id == serialized["id"] }
-            serialized.merge(SOURCE_CODE_ATTRIBUTE_NAME => entity_source_code(entity))
-          end
-        end
-
-        def entity_source_code(entity)
-          Expressir::ExpressExp::Formatter.format(entity)
+          repository
+            .to_hash(formatter: Formatter)['schemas']
         end
       end
     end

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

@@ -0,0 +1,14 @@
+require "expressir/express_exp/formatter"
+require "expressir/express_exp/schema_head_formatter"
+require "expressir/express_exp/hyperlink_formatter"
+
+module Lutaml
+  module Express
+    module LutamlPath
+      class Formatter < Expressir::ExpressExp::Formatter
+        include Expressir::ExpressExp::SchemaHeadFormatter
+        include Expressir::ExpressExp::HyperlinkFormatter
+      end
+    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

@@ -2,39 +2,48 @@ require "lutaml/express"
 require "lutaml/uml"
 require "lutaml/uml/lutaml_path/document_wrapper"
 require "lutaml/express/lutaml_path/document_wrapper"
+require "expressir/express_exp/cache"
 
 module Lutaml
   class Parser
-    attr_reader :parse_type, :file
+    EXPRESS_CACHE_PARSE_TYPE = "exp.cache".freeze
+
+    attr_reader :parse_type, :file_list
 
     class << self
-      def parse(file, input_type = nil)
-        new(file, input_type).parse
+      def parse(file_list, input_type = nil)
+        file_list = file_list.is_a?(Array) ? file_list : [file_list]
+        new(Array(file_list), input_type).parse
       end
 
-      def parse_into_document(file, input_type = nil)
-        new(file, input_type).parse_into_document
+      def parse_into_document(file_list, input_type = nil)
+        file_list = file_list.is_a?(Array) ? file_list : [file_list]
+        new(Array(file_list), input_type).parse_into_document
       end
     end
 
-    def initialize(file, input_type)
-      @parse_type = input_type ? input_type : File.extname(file.path)[1..-1]
-      @file = file
+    def initialize(file_list, input_type)
+      @parse_type = input_type ? input_type : File.extname(file_list.first.path)[1..-1]
+      @file_list = file_list
     end
 
     def parse
-      document = parse_into_document
-      document_wrapper(document)
+      documents = parse_into_document
+      return [document_wrapper(documents)] if ["exp", EXPRESS_CACHE_PARSE_TYPE].include?(parse_type)
+
+      documents.map { |doc| document_wrapper(doc) }
     end
 
     def parse_into_document
       case parse_type
       when "exp"
-        Lutaml::Express::Parsers::Exp.parse(file)
+        Expressir::ExpressExp::Parser.from_files(file_list.map(&:path))
+      when EXPRESS_CACHE_PARSE_TYPE
+        Expressir::ExpressExp::Cache.from_file(file_list.first.path)
       when "lutaml"
-        Lutaml::Uml::Parsers::Dsl.parse(file)
+        file_list.map { |file| Lutaml::Uml::Parsers::Dsl.parse(file) }
       when "yml"
-        Lutaml::Uml::Parsers::Yaml.parse(file.path)
+        file_list.map { |file| Lutaml::Uml::Parsers::Yaml.parse(file.path) }
       else
         raise ArgumentError, "Unsupported file format"
       end
@@ -43,7 +52,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-alpha".freeze
+  VERSION = "0.5.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml
 version: !ruby/object:Gem::Version
-  version: 0.4.1.pre.alpha
+  version: 0.5.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-09 00:00:00.000000000 Z
+date: 2021-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-express
@@ -174,6 +174,7 @@ files:
 - lib/lutaml.rb
 - lib/lutaml/command_line.rb
 - lib/lutaml/express/lutaml_path/document_wrapper.rb
+- lib/lutaml/express/lutaml_path/formatter.rb
 - lib/lutaml/formatter.rb
 - lib/lutaml/formatter/base.rb
 - lib/lutaml/formatter/graphviz.rb
@@ -202,9 +203,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: