lutaml 0.4.1.pre.alpha.1 → 0.4.1.pre.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f585ad7b175177afe9ac1e3c9a243a7d7f5b4f471eab0268db07c5416071ed7
-  data.tar.gz: 04ea818d961eb1b594f41417a73785d4be620acc81301a1da8f98faa9dae4b2d
+  metadata.gz: 0e2accd48e5932fbf111f54429604e7709a98418d6b9c97af40f29c8547a7238
+  data.tar.gz: 6561a16f4d783ddc50812af99e3da854dc2a8673be5e2cc9e7adcffa1678099f
 SHA512:
-  metadata.gz: 34dd93e727898bd84c2257dd8d0e10d7f731775d11efc9f9109a2113a382779c00fb1b0be9bcffd174e2610503e12993c0d2306bb629d2f700f970206deddb90
-  data.tar.gz: f754762c5197831a3cceba0a46cbe2868ae13e40b69f05e1e5d6c08c4ea4c8b69cb045c960833a5d1bbdcfb7fb0316d382795099330325725e16feae736fab33
+  metadata.gz: 3006890a278d837602f7c3149c46b7810a7f5e367100862eac17ac7e54ef2bf18623b9bb8a98483b12cec3fe52bfbef1e3f3c40b7231b7d669c31b0b5e3548f1
+  data.tar.gz: c509f969284fc89e5a4d3293426a71ff861aa8283f33193114887d55d2173427a988998db906d18ea94e1a821db07147a213f892052241dd383c6e36556fa2b0

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,20 +1,15 @@
 require "lutaml/lutaml_path/document_wrapper"
-require "expressir/express_exp/formatter"
+require "expressir/express_exp/hyperlink_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] = schema.to_hash(formatter: Expressir::ExpressExp::Formatter)
-            res["schemas"].push(res[schema.id])
-          end
+          repository
+            .to_hash(formatter: Expressir::ExpressExp::HyperlinkFormatter)['schemas']
         end
       end
     end

data/lib/lutaml/parser.rb

@@ -5,36 +5,40 @@ require "lutaml/express/lutaml_path/document_wrapper"
 
 module Lutaml
   class Parser
-    attr_reader :parse_type, :file
+    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 parse_type == "exp"
+
+      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 "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

data/lib/lutaml/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml
 version: !ruby/object:Gem::Version
-  version: 0.4.1.pre.alpha.1
+  version: 0.4.1.pre.alpha.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-09 00:00:00.000000000 Z
+date: 2021-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-express