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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d9bb01b3f5a13668f541d4119e0830655c524be8bcfa9414b41004b2f6fbcc4
-  data.tar.gz: a2851e63eece312d2b529aa3fe68de9fffa794768ab1e15a0eec97b86ca9c9f3
+  metadata.gz: d72d3bfa8e8dd1e0a8321f97d9f32b46652e7961036d623d293ed07a0a19c6b1
+  data.tar.gz: 18a4eec7fba09c7f1466ae46fdf33d07e70855a9f00b1e4490252c22a7529ed7
 SHA512:
-  metadata.gz: 1dd880cc2ac6829e851ad8165150af8905f8a558fda49e610a03af6c720d592c25695c135b3acc4c6be415a76c402060a7813b1783f6e3f8a6d0c580a53d4a63
-  data.tar.gz: d78b7da3aad28bda7f8b2a1a891ca885068fe4b3261ad684a33e53afc83a5812a4bc13c30d7ef8ca34a0e3d6cc72a1482971ec63a5cec12b28283631cd455cc2
+  metadata.gz: 5440d8e90b6184ab41d1969e6520d3745013aa987314b9f50a524066d810497f0be86481bdcd6195bfe2982e1c8de4562226f373746e18bbd4f173796d043f5d
+  data.tar.gz: ee100c14d0bf8a945732da8ed86f8816ca67ce02dbe7fea80f14a04ac74fcd4efda65cedff89e5262725f044b3a69de85461d6fb5c724392cf01642b6afdf317

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

@@ -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

@@ -76,19 +76,21 @@ module Metanorma
             if express_indexes[path]
               res.push(*express_indexes[path])
             else
-              res.push(content_from_file(document, path).to_liquid)
+              res.push(content_from_file(document, path)
+                        .to_liquid
+                        .merge('relative_path_prefix' => Utils.relative_file_path(document, File.dirname(path))))
             end
           end
         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|
               parse_context_block(document: document,
                                   context_lines: current_block,
-                                  context_items: decorate_context_items(context_items, options),
+                                  context_items: decorate_context_items(context_items,
+                                                    options.merge('relative_path_prefix' => context_items['relative_path_prefix'])),
                                   context_name: block_match[2].strip)
             end.flatten
         rescue StandardError => e

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

@@ -40,6 +40,7 @@ module Metanorma
             begin
               idxs[name]
                 .push(::Lutaml::Parser.parse(File.new(path, encoding: "UTF-8")).to_liquid)
+                .merge("relative_path_prefix" => folder)
             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.1".freeze
+      VERSION = "0.2.4-alpha.2".freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-plugin-lutaml
 version: !ruby/object:Gem::Version
-  version: 0.2.4.pre.alpha.1
+  version: 0.2.4.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-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid