metanorma-plugin-lutaml 0.2.4.alpha → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c060a247f01300f4fe46b58671a07a8f0e3a80f53e64974ccd07208e181e0eaa
-  data.tar.gz: dcf58ee6f298d24ad2493bd65c62a549a2673717ce8a9404695caad20d32e069
+  metadata.gz: fedcbe218c7a2e414eeac2dff54a798c0fcb2df287f8c516c81cb2cf8484848b
+  data.tar.gz: 343ba55ae29367376bae9c0175698fe241e8d2c533d420d0becab9cc2f1fdfe9
 SHA512:
-  metadata.gz: 5061cc833de5a8d4742095e5491f66ab608bdac3042ecc601cdc26e89f5ff258aa34650b3b19e3eb3b38b50be01b3f866e18f15adda02000278e6a5864cf1b34
-  data.tar.gz: 3be917c68c0fd6b0157f6578e40f61da433b262629950f76d09b2b2cf9e4cc5f7955d9066a0930f337ec7beb9426790d650bfb632cf9abf570f3431360855ca6
+  metadata.gz: 38554d8cef5c12bb9650bbbbf270be3f34f4f4672868a6625966fc2c356bd686bb8e0b585cd9cb466acdc765abc7facce5ef6752ba632014910f1c7f0bc333b1
+  data.tar.gz: 46a0bd0c726fdb101783b376a79b633db26ece0b10272d934f4a349a62e8d4f99d5fe881728ed1713599d9e33dcc706ddfcd51205708a4762a1f44f1e236fbeb

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

@@ -2,7 +2,7 @@ module Metanorma
   module Plugin
     module Lutaml
       class ExpressRemarksDecorator
-        RELATIVE_PREFIX_MACRO_REGEXP = /^(\* <<express.+?>>;|link|image|video|audio|include)(:+)?(?![^\/:]+:\/\/|[A-Z]:\/|\/)([^:\[]+)(\[.*\])?$/.freeze
+        RELATIVE_PREFIX_MACRO_REGEXP = /^(link|image|video|audio|include)(:+)?(?![^\/:]+:\/\/|[A-Z]:\/|\/)([^:\[]+)(\[.*\])?$/.freeze
 
         attr_reader :remark, :options
 
@@ -45,7 +45,11 @@ module Metanorma
         def prefix_relative_paths(line, path_prefix)
           line.gsub(RELATIVE_PREFIX_MACRO_REGEXP) do |_match|
             prefixed_path = File.join(path_prefix, $3.strip)
-            "#{$1}#{$2}#{prefixed_path}#{$4}"
+            # When we are dealing with arelative path of a template: ../path/to/file we need to transform it into
+            # the absolute one because `image::` macro wont understand it other way
+            prefixed_path = File.absolute_path(prefixed_path) if prefixed_path.start_with?('../')
+            full_path = File.expand_path(prefixed_path)
+            "#{$1}#{$2}#{full_path}#{$4}"
           end
         end
 

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,28 +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)
+              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])
-                      .merge("relative_path_prefix" => File.dirname(block_match[1]))
           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),
+                                  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,8 +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)
+                .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".freeze
+      VERSION = "0.2.4".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"
+  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.alpha
+  version: 0.2.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-09 00:00:00.000000000 Z
+date: 2021-03-05 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
+        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
+        version: 0.4.1.pre.alpha.2
 - !ruby/object:Gem::Dependency
   name: lutaml-uml
   requirement: !ruby/object:Gem::Requirement
@@ -274,9 +274,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: