metanorma-plugin-lutaml 0.7.27 → 0.7.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a13084276fa3469960665b5591f55c725bd5c0764694dc5c23874175539fcec7
-  data.tar.gz: 36bc60f0e6c845c629c42658d7ec05f660378d5083dfd3199c066a50030ae865
+  metadata.gz: 3dd121eb5e209d2e11649e523ca637ec20c13776fc487a06b0f6f5c1bd0a6cfd
+  data.tar.gz: f6116b75a333054a2e5a9a39dbdafc558d8a4da566810dd75f9fe573beba56fc
 SHA512:
-  metadata.gz: 26804996b13e88130f617c11ed5689117adcfe944acc3f2910e87ad7b8f25048268c63d0986787fe6470ffa80fb7a2eeaed8a73f449d98b91de07623ec93af34
-  data.tar.gz: 34cb8cd2cad5803b28e998a1d9496b634ac14a091a75199c004147b94f45477cd47362d5bd6f12d7c8d12a1730fac515f82f653a9cbd55e7bc3af2293be81c69
+  metadata.gz: e4ee32d5341f80f1c8792cc35e43c6f0d77a5eda123edf4ee4e7f5ba42ca68151213c7d5142549cf0bc681750f136f3a1b2821881653a99c69b1cf3da430ee2b
+  data.tar.gz: c361d3764d7895dde4d9bb545d7d3adc4ea3651892690424fff8a38945ccaaec41961cb207282ae76eef1d3d007e2ac624253b2659e242cbe3f204200f176069

data/README.adoc

@@ -252,8 +252,8 @@ per-block via a separate YAML file.
 
 [lutaml_express_liquid,all_schemas,context,config_yaml=schemas.yaml]
 ---
-{% assign selected = context.schemas | where: "selected" %}
-{% render "templates/resources/schema" for selected as schema %}
+{% assign all_schemas = repo.schemas  %}
+{% render "templates/resources/schema" for ordered_schemas as schema %}
 ----
 -----
 
@@ -284,16 +284,16 @@ schemas:
     anything: ...
 ----
 
-The resulting block adds the `select` attribute to every schema of the the
-"context" object, which allows you to filter those out for complex operations
-via Liquid:
+The resulting block adds the `ordered_schemas` context to allows you to filter
+out the schemas you want to render according to the order in the config_yaml.
 
 [source,liquid]
 ----
 [lutaml_express_liquid,schemas_1,repo,config_yaml=select.yaml]
 ---
-{% assign selected = repo.schemas | where: "selected" %}
-... do things with `selected` ...
+{% assign all_schemas = repo.schemas  %}
+{% render "templates/resources/schema" for ordered_schemas as schema %}
+...
 ---
 ----
 
@@ -311,8 +311,9 @@ from the paths other than the location of the document.
 
 [lutaml_express_liquid,all_schemas,context,config_yaml=schemas.yaml,include_path=../templates]
 ---
-{% assign selected = context.schemas | where: "selected" %}
-{% render "templates/resources/schema" for selected as schema %}
+{% assign all_schemas = repo.schemas  %}
+{% render "templates/resources/schema" for ordered_schemas as schema %}
+...
 ----
 -----
 

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

@@ -48,23 +48,6 @@ module Metanorma
           doc
         end
 
-        def get_path_from_index(parent, index_name) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
-          lutaml_xmi_index = parent.document
-            .attributes["lutaml_xmi_index"][index_name]
-
-          if lutaml_xmi_index.nil? || lutaml_xmi_index[:path].nil?
-            ::Metanorma::Util.log(
-              "[metanorma-plugin-lutaml] lutaml_xmi_index error: " \
-              "XMI index #{index_name} path not found!",
-              :error,
-            )
-
-            return nil
-          end
-
-          lutaml_xmi_index[:path]
-        end
-
         def img_src_path(document, attrs, diagram)
           base_path = attrs["base_path"]
           format = attrs["format"] || "png"

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

@@ -85,6 +85,29 @@ module Metanorma
           )
         end
 
+        def get_xmi_path(parent, target, attrs)
+          return get_path_from_index(parent, attrs["index"]) if attrs["index"]
+
+          Utils.relative_file_path(parent.document, target)
+        end
+
+        def get_path_from_index(parent, index_name) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+          lutaml_xmi_index = parent.document
+            .attributes["lutaml_xmi_index"][index_name]
+
+          if lutaml_xmi_index.nil? || lutaml_xmi_index[:path].nil?
+            ::Metanorma::Util.log(
+              "[metanorma-plugin-lutaml] lutaml_xmi_index error: " \
+              "XMI index #{index_name} path not found!",
+              :error,
+            )
+
+            return nil
+          end
+
+          lutaml_xmi_index[:path]
+        end
+
         def processed_lines(document, input_lines)
           result = []
           loop do
@@ -97,7 +120,7 @@ module Metanorma
           self.class.const_get(:MACRO_REGEXP)
         end
 
-        def process_xmi_index_lines(document, line)
+        def process_xmi_index_lines(document, line) # rubocop:disable Metrics/AbcSize
           block_match = line.match(XMI_INDEX_REGEXP)
 
           return if block_match.nil?

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

@@ -15,8 +15,8 @@ module Metanorma
         use_dsl
         named :lutaml_klass_table
 
-        def process(parent, target, attrs)
-          xmi_path = Utils.relative_file_path(parent.document, target)
+        def process(parent, target, attrs) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+          xmi_path = get_xmi_path(parent, target, attrs)
 
           if attrs["template"]
             attrs["template"] = Utils.relative_file_path(

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

@@ -137,7 +137,6 @@ module Metanorma
 
           # Process each schema
           repo.schemas.each do |schema|
-            update_schema_selection(schema, options)
             options["relative_path_prefix"] =
               relative_path_prefix(options, schema)
             update_remarks(schema, options)
@@ -146,13 +145,6 @@ module Metanorma
           repo
         end
 
-        def update_schema_selection(schema, options)
-          return unless options["selected_schemas"]
-
-          schema.selected = options["selected_schemas"].include?(schema.file_basename) ||
-            options["selected_schemas"].include?(schema.id)
-        end
-
         def update_remarks(model, options)
           model.remarks = decorate_remarks(options, model.remarks)
           model.remark_items&.each do |ri|
@@ -215,10 +207,8 @@ module Metanorma
 
           # Get all context items in one go
           all_items = gather_context_liquid_items(
-            index_names: index_names,
-            document: document,
-            indexes: indexes,
-            options: options.merge("document" => document),
+            index_names: index_names, document: document, indexes: indexes,
+            options: options.merge("document" => document)
           )
 
           # Setup include paths for liquid templates
@@ -238,17 +228,33 @@ module Metanorma
           # Render for each item
           all_items.map do |item|
             template.assigns[context_name] = item[:liquid_drop]
+            template.assigns["ordered_schemas"] = reorder_schemas(
+              item[:liquid_drop], options
+            )
             template.assigns["schemas_order"] = options["selected_schemas"]
             template.render
           end.flatten
         rescue StandardError => e
-          ::Metanorma::Util.log(
-            "[LutamlPreprocessor] Failed to parse LutaML block: #{e.message}",
-            :error,
-          )
+          ::Metanorma::Util
+            .log("[LutamlPreprocessor] Failed to parse LutaML block: " \
+                 "#{e.message}", :error)
           raise e
         end
 
+        def reorder_schemas(repo_liquid, options)
+          return repo_liquid.schemas unless options["selected_schemas"]
+
+          ordered_schemas = []
+          options["selected_schemas"].each do |schema_name|
+            ordered_schema = repo_liquid.schemas.find do |schema|
+              schema.id == schema_name || schema.file_basename == schema_name
+            end
+            ordered_schemas.push(ordered_schema)
+          end
+
+          ordered_schemas
+        end
+
         def process_options(document, options)
           # Process config file if specified
           if (config_yaml_path = options.delete("config_yaml"))

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

@@ -1,7 +1,7 @@
 module Metanorma
   module Plugin
     module Lutaml
-      VERSION = "0.7.27".freeze
+      VERSION = "0.7.29".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.27
+  version: 0.7.29
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-04-24 00:00:00.000000000 Z
+date: 2025-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor