metanorma-plugin-lutaml 0.2.4.pre.alpha.2 → 0.2.4.pre.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d72d3bfa8e8dd1e0a8321f97d9f32b46652e7961036d623d293ed07a0a19c6b1
-  data.tar.gz: 18a4eec7fba09c7f1466ae46fdf33d07e70855a9f00b1e4490252c22a7529ed7
+  metadata.gz: 15b69c1b6c78145b90da125ebc64ef043c4ebc88912708ef3183581548e12a1d
+  data.tar.gz: e8c607b6654b776d8363d439265db8c8efafce0453d0992e81699ba1273d7fd8
 SHA512:
-  metadata.gz: 5440d8e90b6184ab41d1969e6520d3745013aa987314b9f50a524066d810497f0be86481bdcd6195bfe2982e1c8de4562226f373746e18bbd4f173796d043f5d
-  data.tar.gz: ee100c14d0bf8a945732da8ed86f8816ca67ce02dbe7fea80f14a04ac74fcd4efda65cedff89e5262725f044b3a69de85461d6fb5c724392cf01642b6afdf317
+  metadata.gz: 2e2b41a80e0058e29ab19bc4cc5957fc821f50d49d3408d27593f4abb62638eb5799dbd4190bbb6f56cdd226ecd96bb95ca2e334907a575850e01f1889e7382b
+  data.tar.gz: e2da2ed10903ce9561135f006a0e5cab90c18c3683b5fd24c71e0bb0b85a6f2f07a5890c6b9ab790d1cdc7b23e27e57c5b35f83158592de32abb72789b4bf608

data/lib/metanorma/plugin/lutaml/lutaml_preprocessor.rb

@@ -27,10 +27,11 @@ module Metanorma
 
         protected
 
-        def content_from_file(document, file_path)
-          ::Lutaml::Parser
-            .parse(File.new(Utils.relative_file_path(document, file_path),
-                            encoding: "UTF-8"))
+        def content_from_files(document, file_paths)
+          file_list = file_paths.map do |file_path|
+            File.new(Utils.relative_file_path(document, file_path), encoding: "UTF-8")
+          end
+          ::Lutaml::Parser.parse(file_list)
         end
 
         private
@@ -72,30 +73,38 @@ module Metanorma
 
         def contexts_items(block_match, document, express_indexes)
           contexts_names = block_match[1].split(";").map(&:strip)
-          contexts_names.each_with_object([]) do |path, res|
+          file_paths = []
+          result = contexts_names.each_with_object([]) do |path, res|
             if express_indexes[path]
               res.push(*express_indexes[path])
             else
-              res.push(content_from_file(document, path)
-                        .to_liquid
-                        .merge('relative_path_prefix' => Utils.relative_file_path(document, File.dirname(path))))
+              file_paths.push(path)
             end
           end
+          if !file_paths.empty?
+            from_files = content_from_files(document, file_paths)
+                          .map do |n|
+                            n.to_liquid.map { |j| j.merge('relative_path_prefix' => Utils.relative_file_path(document, File.dirname(j['file']))) }
+                          end
+                          .flatten
+            result += from_files
+          end
+          result
         end
 
         def parse_template(document, current_block, block_match, express_indexes)
           options = parse_options(block_match[3])
           contexts_items(block_match, document, express_indexes)
-            .map do |context_items|
+            .map do |items|
+              opts = options.merge('relative_path_prefix' => items['relative_path_prefix'])
               parse_context_block(document: document,
                                   context_lines: current_block,
-                                  context_items: decorate_context_items(context_items,
-                                                    options.merge('relative_path_prefix' => context_items['relative_path_prefix'])),
+                                  context_items: decorate_context_items(items, opts),
                                   context_name: block_match[2].strip)
             end.flatten
-        rescue StandardError => e
-          document.logger.warn("Failed to parse lutaml block: #{e.message}")
-          []
+        # rescue StandardError => e
+        #   document.logger.warn("Failed to parse lutaml block: #{e.message}")
+        #   []
         end
 
         def parse_options(options_string)

data/lib/metanorma/plugin/lutaml/lutaml_uml_attributes_table_preprocessor.rb

@@ -29,6 +29,7 @@ module Metanorma
           ::Lutaml::Parser
             .parse(File.new(Utils.relative_file_path(document, file_path),
                             encoding: "UTF-8"))
+            .first
         end
 
         def processed_lines(document, input_lines)

data/lib/metanorma/plugin/lutaml/utils.rb

@@ -38,9 +38,10 @@ module Metanorma
             next if [".", ".."].include?(path)
 
             begin
+              parsed = ::Lutaml::Parser.parse(File.new(path, encoding: "UTF-8"))
+              parsed = parsed.map { |n| n.to_liquid.map { |j| j.merge('relative_path_prefix' => Utils.relative_file_path(document, File.dirname(j['file']))) } }.flatten
               idxs[name]
-                .push(::Lutaml::Parser.parse(File.new(path, encoding: "UTF-8")).to_liquid)
-                .merge("relative_path_prefix" => folder)
+                .push(*parsed)
             rescue StandardError => e
               document.logger.warn("Failed to load #{path}: #{e.message}")
             end

data/lib/metanorma/plugin/lutaml/version.rb

@@ -1,7 +1,7 @@
 module Metanorma
   module Plugin
     module Lutaml
-      VERSION = "0.2.4-alpha.2".freeze
+      VERSION = "0.2.4-alpha.3".freeze
     end
   end
 end

data/metanorma-plugin-lutaml.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "liquid"
-  spec.add_dependency "lutaml", "0.4.1.pre.alpha.1"
+  spec.add_dependency "lutaml", "0.4.1.pre.alpha.2"
   spec.add_dependency "lutaml-uml", "~> 0.2.0"
   spec.add_dependency "metanorma"
   spec.add_dependency "relaton-cli"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-plugin-lutaml
 version: !ruby/object:Gem::Version
-  version: 0.2.4.pre.alpha.2
+  version: 0.2.4.pre.alpha.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-12 00:00:00.000000000 Z
+date: 2021-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.1.pre.alpha.1
+        version: 0.4.1.pre.alpha.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.1.pre.alpha.1
+        version: 0.4.1.pre.alpha.2
 - !ruby/object:Gem::Dependency
   name: lutaml-uml
   requirement: !ruby/object:Gem::Requirement