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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d9bb01b3f5a13668f541d4119e0830655c524be8bcfa9414b41004b2f6fbcc4
-  data.tar.gz: a2851e63eece312d2b529aa3fe68de9fffa794768ab1e15a0eec97b86ca9c9f3
+  metadata.gz: 720c7f46803fd6650d13e51e6b1e5111a09c9cf3773c832e239020a8ea5cee75
+  data.tar.gz: d349fbb9970f16e8bbcf1396d71ec628b7cdbf0204dcdb50d14db8ba2727b0c2
 SHA512:
-  metadata.gz: 1dd880cc2ac6829e851ad8165150af8905f8a558fda49e610a03af6c720d592c25695c135b3acc4c6be415a76c402060a7813b1783f6e3f8a6d0c580a53d4a63
-  data.tar.gz: d78b7da3aad28bda7f8b2a1a891ca885068fe4b3261ad684a33e53afc83a5812a4bc13c30d7ef8ca34a0e3d6cc72a1482971ec63a5cec12b28283631cd455cc2
+  metadata.gz: 4a855cb5d2c1d7fa9878e0213c6e4ad53381afdaae8ac8cfaed1ed590c8b4a8d9784f12e148888a840c3829913d9a8ab4b0b1715339cade1320d8cfecb8f547c
+  data.tar.gz: 0dc60a360f2416481d42c369eb12fd4c73f7833b4904255117bfa1c787accbc58e5de74f29488d9c4456908497bd60ccc680788c1f78c324fcaaa955b6e0449d

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.1".freeze
+      VERSION = "0.2.5".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.0"
   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.1
+  version: 0.2.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-09 00:00:00.000000000 Z
+date: 2021-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -28,16 +28,16 @@ dependencies:
   name: lutaml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1.pre.alpha.1
+        version: 0.4.0
   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.0
 - !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: