metanorma-plugin-lutaml 0.7.21 → 0.7.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7aeee60e0c387e0cd418623ff3c351097286d574235e6846e107f89d044b4342
-  data.tar.gz: 5010ee69d52a4ba1d06169224c876734111e9d035aa510565593a67bb997b0f5
+  metadata.gz: 86941bc530959fd2a6023671bfac6d46e18ac1095db5903b67b3be22f411372d
+  data.tar.gz: f4cbcf8affd7ffffb7773ad3a9e7c6d008d176dfe3a507a2ba146cd38ba57e88
 SHA512:
-  metadata.gz: f0e6eade28bb226a39bb2af4adcf45aeb4ed5dbd61385224cfa4c74946990a25da00ce97083fca98903fcaeae4259a0ed20861b6372d81d128e9befa9f36a129
-  data.tar.gz: 762f6d288c6dad65aa3e9f73ba1c0185cb93c4af0308d8816f4c672f9d297d7ab764c32f3c6f6ed2b437bae3a5e355407267ac52447a7e6573e3eaaeb6387b50
+  metadata.gz: 3a2dc0a28276e48230002049ba5946821c81d231be38494f978e5ad7298836b3ea1852be10314a8cfe7a86f775a097407c67a541f6f3c633e4a1dc32d6206702
+  data.tar.gz: 0eda7cedc08c10bb6b0da49cfabb0f72e6a3a22355b784d9f633217be0f7bdec1946fe269deeb7d460a468f91d7004cc08df747018217239580e2d8566337791

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

@@ -42,9 +42,7 @@ module Metanorma
           end
 
           doc ||= parent.document.attributes["lutaml_xmi_cache"].values.first
-          return doc if doc.instance_of?(::Lutaml::XMI::RootDrop)
-
-          doc.original_document
+          doc
         end
 
         def get_path_from_index(parent, index_name) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength

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

@@ -42,7 +42,7 @@ module Metanorma
 
         private
 
-        def lutaml_document_from_file_or_cache(document, file_path, yaml_config) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+        def lutaml_document_from_file_or_cache(document, file_path, yaml_config, yaml_config_path = nil) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength,Layout/LineLength
           full_path = Utils.relative_file_path(document, file_path)
           if document.attributes["lutaml_xmi_cache"] &&
               document.attributes["lutaml_xmi_cache"][full_path]
@@ -50,8 +50,10 @@ module Metanorma
           end
 
           yaml_config["ea_extension"]&.each do |ea_extension_path|
+            # resolve paths of ea extensions based on the location of
+            # config yaml file
             ea_extension_full_path = File.expand_path(
-              ea_extension_path, File.dirname(file_path)
+              ea_extension_path, File.dirname(yaml_config_path)
             )
             Xmi::EaRoot.load_extension(ea_extension_full_path)
           end
@@ -156,22 +158,17 @@ module Metanorma
           end
 
           yaml_config = parse_yaml_config_file(document, config_yaml_path)
-          lutaml_document = lutaml_document_from_file_or_cache(document,
-                                                               xmi_or_index,
-                                                               yaml_config)
+          lutaml_document = lutaml_document_from_file_or_cache(
+            document,
+            xmi_or_index,
+            yaml_config,
+            Utils.relative_file_path(document, config_yaml_path),
+          )
           [lutaml_document, yaml_config]
         end
 
-        def get_original_document(wrapper)
-          doc = wrapper
-          return doc if doc.instance_of?(::Lutaml::XMI::RootDrop)
-
-          doc.original_document
-        end
-
         def fill_in_entities_refs_attributes(document, # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength
           lutaml_document, _options)
-          lutaml_document = get_original_document(lutaml_document)
           # render_style = options.fetch(RENDER_STYLE_ATTRIBUTE, "default")
           all_children_packages = lutaml_document.packages
             .map(&:children_packages).flatten
@@ -201,7 +198,6 @@ module Metanorma
         end
 
         def fill_in_diagrams_attributes(document, lutaml_document) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
-          lutaml_document = get_original_document(lutaml_document)
           package_flat_diagrams = lambda do |pks|
             pks.each_with_object({}) do |package, res|
               package.diagrams.map do |diag|

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

@@ -49,7 +49,7 @@ module Metanorma
           line.match(/^\[(?:\blutaml\b|\blutaml_express\b|\blutaml_express_liquid\b),(?<index_names>[^,]+)?,?(?<context_name>[^,]+)?(?<options>,.*)?\]/) # rubocop:disable Layout/LineLength
         end
 
-        def load_lutaml_file(document, file_path)
+        def load_express_lutaml_file(document, file_path)
           ::Lutaml::Parser.parse(
             File.new(
               Utils.relative_file_path(document, file_path),
@@ -108,9 +108,7 @@ module Metanorma
           index_names.map do |path|
             if indexes[path]
               indexes[path][:liquid_drop] ||=
-                indexes[path][:wrapper].original_document.to_liquid(
-                  options: options,
-                )
+                indexes[path][:model].to_liquid(options: options)
             else
               full_path = Utils.relative_file_path(document, path)
               unless File.file?(full_path)
@@ -120,11 +118,9 @@ module Metanorma
                   "the full path.",
                 )
               end
-              wrapper = load_lutaml_file(document, path)
+              express_model = load_express_lutaml_file(document, path)
               indexes[path] = {
-                liquid_drop: wrapper.original_document.to_liquid(
-                  options: options,
-                ),
+                liquid_drop: express_model.to_liquid(options: options),
               }
             end
 
@@ -155,13 +151,6 @@ module Metanorma
           options
         end
 
-        def get_original_document(wrapper)
-          doc = wrapper
-          return doc if doc.instance_of?(::Lutaml::XMI::RootDrop)
-
-          doc.original_document
-        end
-
         def render_liquid_template(document:, lines:, context_name:, # rubocop:disable Metrics/AbcSize,Metrics/MethodLength,Metrics/ParameterLists
 index_names:, options:, indexes:)
           config_yaml_path = options.delete("config_yaml")

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

@@ -61,13 +61,6 @@ module Metanorma
           end
         end
 
-        def get_original_document(wrapper)
-          doc = wrapper
-          return doc if doc.instance_of?(::Lutaml::XMI::RootDrop)
-
-          doc.original_document
-        end
-
         def load_express_repositories(path:, cache_path:, document:,
 force_read: false)
           cache_full_path = cache_path &&
@@ -80,17 +73,17 @@ force_read: false)
 
           # If there is no cache or "force read" is set.
           full_path = Utils.relative_file_path(document, path)
-          lutaml_wrapper = load_express_repo_from_path(document, full_path)
+          lutaml_doc = load_express_repo_from_path(document, full_path)
 
           if cache_full_path && !File.file?(cache_full_path)
             save_express_repo_to_cache(
               cache_full_path,
-              get_original_document(lutaml_wrapper),
+              lutaml_doc,
               document,
             )
           end
 
-          lutaml_wrapper
+          lutaml_doc
         rescue Expressir::Error
           FileUtils.rm_rf(cache_full_path)
 
@@ -179,16 +172,15 @@ force_read: false)
               raise StandardError.new("No name and path set in `:lutaml-express-index:` attribute.")
             end
 
-            lutaml_expressir_wrapper = load_express_repositories(
+            lutaml_expressir_model = load_express_repositories(
               path: path,
               cache_path: cache,
               document: document,
             )
 
-            if lutaml_expressir_wrapper
+            if lutaml_expressir_model
               express_indexes[name] = {
-                wrapper: lutaml_expressir_wrapper,
-                serialized_hash: nil,
+                model: lutaml_expressir_model,
               }
             end
           end

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

@@ -1,7 +1,7 @@
 module Metanorma
   module Plugin
     module Lutaml
-      VERSION = "0.7.21".freeze
+      VERSION = "0.7.23".freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-plugin-lutaml
 version: !ruby/object:Gem::Version
-  version: 0.7.21
+  version: 0.7.23
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-20 00:00:00.000000000 Z
+date: 2025-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -366,7 +366,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Metanorma plugin for LutaML