metanorma-plugin-lutaml 0.7.18 → 0.7.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ded8b84232dfbf3542afb4dc3da354df981b92ff64ed11e095f12545d1f9a0a
-  data.tar.gz: 86f209fd978241a799baac34ee851e1770e41dac4406d39c25666b524f9e1c41
+  metadata.gz: 8c70ed413914e29f4c181d02bfd50681434437361fe26f10dc1ca94f7e85058e
+  data.tar.gz: addb2f7403c0ffebe85e26cd918440e140d43349c57055be8366b4d35cf794a9
 SHA512:
-  metadata.gz: '09d55bf946a368225e301bf893d68dd27bd585ecd56c6c785c396f659c81cc38d663eb3fdfde2eec4814038c022c16cb01e61d05533a7af39b1ac87b649603fa'
-  data.tar.gz: 2b864cc9a7e32e7643f9aaf33a8e217eef709c2b2df7ecdff820f656f8860ad33569b457b18b9b765689556322b6a8330047c6dba4fd7d60f307638f8995b08c
+  metadata.gz: c5a5b0e871111297d907041d087a24acc58caf7f4c54db1f5213f6be08afdc5d26baceb50a34d9b0d806acd61d9316e72c0b051b7b5da5edfc0aad54ecc995f7
+  data.tar.gz: 61b0e6159c1444ea0faf3f3e693e3e2ef228aca57d2129a98450207dec0158e72459049462483a436ddc68e119624298c78d66ac161c2bc34a736b70ab765a96

data/README.adoc

@@ -145,11 +145,7 @@ And the `lutaml_express` block:
 
 [source,adoc]
 -----
-<<<<<<< HEAD
-[lutaml_express,example.exp,my_context]
-=======
 [lutaml_express_liquid,example.exp,my_context]
->>>>>>> accd8ee (Remove obsolete codes of macros "lutaml" and "lutaml_express")
 ----
 {% for schema in my_context.schemas %}
 == {{schema.id}}

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

@@ -102,13 +102,13 @@ module Metanorma
           block
         end
 
-        def gather_context_liquid_items(index_names:, document:, indexes:, # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
-selected_schemas:, options:)
+        def gather_context_liquid_items( # rubocop:disable Metrics/AbcSize,Metrics/MethodLength,Metrics/ParameterLists
+          index_names:, document:, indexes:, options: {}
+        )
           index_names.map do |path|
             if indexes[path]
               indexes[path][:liquid_drop] ||=
                 indexes[path][:wrapper].original_document.to_liquid(
-                  selected_schemas: selected_schemas,
                   options: options,
                 )
             else
@@ -123,7 +123,6 @@ selected_schemas:, options:)
               wrapper = load_lutaml_file(document, path)
               indexes[path] = {
                 liquid_drop: wrapper.original_document.to_liquid(
-                  selected_schemas: selected_schemas,
                   options: options,
                 ),
               }
@@ -167,21 +166,30 @@ selected_schemas:, options:)
 index_names:, options:, indexes:)
           config_yaml_path = options.delete("config_yaml")
           config = read_config_yaml_file(document, config_yaml_path)
-          selected_schemas = config["selected_schemas"]
+          if config["selected_schemas"]
+            options["selected_schemas"] = config["selected_schemas"]
+          end
 
           all_items = gather_context_liquid_items(
             index_names: index_names,
             document: document,
             indexes: indexes,
-            selected_schemas: selected_schemas,
             options: options.merge("document" => document),
           )
 
+          # Allow includes for the template
+          include_paths = [
+            Utils.relative_file_path(document, ""),
+            options["include_path"],
+          ].compact
+
           all_items.map do |item|
             repo_drop = item[:liquid_drop]
             template = ::Liquid::Template.parse(lines.join("\n"))
+            template.registers[:file_system] =
+              ::Metanorma::Plugin::Lutaml::Liquid::LocalFileSystem
+                .new(include_paths, ["%s.liquid", "_%s.liquid", "_%s.adoc"])
             template.assigns[context_name] = repo_drop
-            template.assigns["selected_schemas"] = selected_schemas
             template.render
           end.flatten
         rescue StandardError => e

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

@@ -41,7 +41,7 @@ module Metanorma
 
           liquid_template.registers[:file_system] =
             ::Metanorma::Plugin::Lutaml::Liquid::LocalFileSystem
-              .new(include_paths, ["_%s.liquid", "_%s.adoc"])
+              .new(include_paths, ["%s.liquid", "_%s.liquid", "_%s.adoc"])
 
           rendered_string = liquid_template
             .render(context_name => context_items,

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

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

data/metanorma-plugin-lutaml.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "asciidoctor"
   spec.add_dependency "coradoc", "~> 1.1.1"
-  spec.add_dependency "expressir", "~> 2.1.6"
+  spec.add_dependency "expressir", "~> 2.1.11"
   spec.add_dependency "liquid"
   spec.add_dependency "lutaml", "~> 0.9.25"
   spec.add_dependency "ogc-gml", "1.0.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-plugin-lutaml
 version: !ruby/object:Gem::Version
-  version: 0.7.18
+  version: 0.7.20
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-27 00:00:00.000000000 Z
+date: 2025-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.6
+        version: 2.1.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.6
+        version: 2.1.11
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement