metanorma-plugin-lutaml 0.7.37 → 0.7.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2322a39b5dc29e981cf64a1c383c7d53aee9e1b132412ea79fc91dfac88485aa
-  data.tar.gz: b1199f54f2e895a3938b1711c1b36184fbb0bc68fd79e56a6bc9acac12979c2e
+  metadata.gz: cb242e5ff7bfcfa7b4baec472a6fc0ecf0be94558913c8bb39bcf19655640e12
+  data.tar.gz: 81455de9a154af7534d43830562613fbee00bd8ce2c252ce13be79fc790efaec
 SHA512:
-  metadata.gz: a11578fe6890dbf07994ba86d55ae9eee7d7eac605907b0dde761570c48d1871de497418ca1adff80091fdd931b520dcedf68ff1fc20f0cedac1f26bc78062a0
-  data.tar.gz: a7f983789b4b1afd9d4b1b01b1b2546218d1530e9c6ff4cdb8f0ffab0d7f6af83d1f2611fdda609d038c0616dfe1ea50e91b0a61b053000602d3f1685f61a5e1
+  metadata.gz: c84b7143c72c6bbb6334bc9c27faea196a516edd34c67607579f61b0a371be648c9087e5b297159f98d60654f43ffc9a2c736a5e5c546196f7251917cc042d28
+  data.tar.gz: b68b53795e9576abc2e1beb3746219ae2ca0ab8e888ab15f0c79430f94eedb870a568fe425e9a3ae503ba34e03d603436cc2dcb0cd64068500d30db421e079e5

data/docs/usages/enterprise_architect.adoc

@@ -184,6 +184,15 @@ The command accepts the options listed below:
   `lib/metanorma/plugin/lutaml/templates`.  This template can be customized by
   changing the template path in the `template` option.
 
+* `external_data="context_name:/path/to/my_data.yml"` specifies the path of
+  the YAML/JSON file of the external data to be used in the liquid template.
+  (Optional)
+  You can specify multiple external data by separating them with `;`.
+  (e.g. `external_data="my_data:/path/to/my_data.yml;second_data:/path/to/my_second_data.yml"`)
+  In the liquid template, you can access the data by using `context_name`.
+  (e.g. `my_data` or `second_data` in the above example)
+  The external data file should be in YAML/JSON format.
+
 * `guidance="/path/to/my_guidance.yml"` specifies the path of
   the yaml file of the guidance. (Optional)
 
@@ -240,6 +249,14 @@ The command accepts the options listed below:
   `lib/metanorma/plugin/lutaml/templates`.  This template can be customized by
   changing the template path in the `template` option.
 
+* `external_data="context_name:/path/to/my_data.yml"` specifies the path of
+  the YAML/JSON file of the external data to be used in the liquid template.
+  (Optional)
+  You can specify multiple external data by separating them with `;`.
+  (e.g. `external_data="my_data:/path/to/my_data.yml;second_data:/path/to/my_second_data.yml"`)
+  In the liquid template, you can access the data by using `context_name`.
+  (e.g. `my_data` or `second_data` in the above example)
+  The external data file should be in YAML/JSON format.
 
 === Usage of `lutaml_ea_xmi` command
 

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

@@ -153,7 +153,7 @@ module Metanorma
           end
           line
             .gsub(/(?<!{){(?!%)([^{}]{1,900})(?<!%)}(?!})/, '{{\1}}')
-            .gsub(/[a-z\.]{1,900}\#/, "index")
+            .gsub(/[a-z.]{1,900}\#/, "index")
             .gsub(/{{([^}]{1,900})\s+\+\s+(\d+)\s*?}}/, '{{ \1 | plus: \2 }}')
             .gsub(/{{([^}]{1,900})\s+-\s+(\d+)\s*?}}/, '{{ \1 | minus: \2 }}')
             .gsub(/{{([^}]{1,500})\.values([^}]{0,500})}}/,

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

@@ -9,7 +9,7 @@ module Metanorma
           (link|image|video|audio|include) # Capture group 1: content type
           (:+)?                            # Capture group 2: optional colons
           (?!                              # Negative lookahead
-            [^\/:]+://|                    # Don't match URLs (http://, etc.)
+            [^/:]+://|                     # Don't match URLs (http://, etc.)
             [A-Z]:/|                       # Don't match Windows paths
             /                              # Don't match absolute paths
           )                                # End negative lookahead

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

@@ -434,6 +434,45 @@ module Metanorma
             {% include "#{include_name}", depth: #{section_depth}, package_skip_sections: context.package_skip_sections, package_entities: context.package_entities, context: context, additional_context: context.additional_context, render_nested_packages: context.render_nested_packages %}
           LIQUID
         end
+
+        def render_table(context, context_name, parent, attrs) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+          table_tmpl = get_template(parent.document, attrs)
+          table_tmpl.assigns[context_name] = context
+
+          if attrs["external_data"]
+            data_array = attrs["external_data"].split(";")
+            data_array.each do |data_item|
+              context_name, external_data_path = data_item.split(":")
+              external_data = content_from_file(
+                parent.document, external_data_path.strip
+              )
+              table_tmpl.assigns[context_name.strip] = external_data
+            end
+          end
+
+          rendered_table = table_tmpl.render
+          block = create_open_block(parent, "", attrs)
+          parse_content(block, rendered_table, attrs)
+        end
+
+        def get_template(document, attrs)
+          template = get_default_template
+          template = attrs["template"] if attrs["template"]
+
+          rel_tmpl_path = Utils.relative_file_path(
+            document, template
+          )
+
+          ::Liquid::Template.parse(File.read(rel_tmpl_path))
+        end
+
+        def get_name_path(attrs)
+          return attrs["path"] if attrs["path"]
+
+          return "#{attrs['package']}::#{attrs['name']}" if attrs["package"]
+
+          attrs["name"]
+        end
       end
     end
   end

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

@@ -6,6 +6,7 @@ module Metanorma
       class LutamlEnumTableBlockMacro <
         ::Asciidoctor::Extensions::BlockMacroProcessor
         include LutamlEaXmiBase
+        include Content
 
         DEFAULT_TEMPLATE = File.join(
           Gem::Specification.find_by_name("metanorma-plugin-lutaml").gem_dir,
@@ -13,59 +14,26 @@ module Metanorma
           "_enum_table.liquid"
         )
 
+        CONTEXT_NAME = "enum"
+
         use_dsl
         named :lutaml_enum_table
 
         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(
-              parent.document, attrs["template"]
-            )
-          end
-
-          path = if !attrs["path"].nil?
-                   attrs["path"]
-                 elsif !attrs["package"].nil? && !attrs["name"].nil?
-                   "#{attrs['package']}::#{attrs['name']}"
-                 else
-                   attrs["name"]
-                 end
+          path = get_name_path(attrs)
 
           enum = ::Lutaml::XMI::Parsers::XML.serialize_enumeration_by_name(
             xmi_path, path
           )
 
-          render(enum, parent, attrs)
+          render_table(enum, CONTEXT_NAME, parent, attrs)
         end
 
         private
 
-        def render(enum, parent, attrs)
-          rendered_table = render_table(enum, parent, attrs)
-
-          block = create_open_block(parent, "", attrs)
-          parse_content(block, rendered_table, attrs)
-        end
-
-        def render_table(enum, parent, attrs)
-          table_tmpl = get_template(parent.document, attrs)
-          table_tmpl.assigns["enum"] = enum
-          table_tmpl.render
-        end
-
-        def get_template(document, attrs)
-          template = DEFAULT_TEMPLATE
-          if attrs["template"]
-            template = attrs["template"]
-          end
-
-          rel_tmpl_path = Utils.relative_file_path(
-            document, template
-          )
-
-          ::Liquid::Template.parse(File.read(rel_tmpl_path))
+        def get_default_template
+          DEFAULT_TEMPLATE
         end
       end
     end

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

@@ -6,6 +6,7 @@ module Metanorma
       class LutamlKlassTableBlockMacro <
         ::Asciidoctor::Extensions::BlockMacroProcessor
         include LutamlEaXmiBase
+        include Content
 
         DEFAULT_TEMPLATE = File.join(
           Gem::Specification.find_by_name("metanorma-plugin-lutaml").gem_dir,
@@ -13,64 +14,31 @@ module Metanorma
           "_klass_table.liquid"
         )
 
+        CONTEXT_NAME = "klass"
+
         use_dsl
         named :lutaml_klass_table
 
         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(
-              parent.document, attrs["template"]
-            )
-          end
+          path = get_name_path(attrs)
 
           guidance = nil
           if attrs["guidance"]
             guidance = get_guidance(parent.document, attrs["guidance"])
           end
 
-          path = if !attrs["path"].nil?
-                   attrs["path"]
-                 elsif !attrs["package"].nil? && !attrs["name"].nil?
-                   "#{attrs['package']}::#{attrs['name']}"
-                 else
-                   attrs["name"]
-                 end
-
           klass = ::Lutaml::XMI::Parsers::XML.serialize_generalization_by_name(
             xmi_path, path, guidance
           )
 
-          render(klass, parent, attrs)
+          render_table(klass, CONTEXT_NAME, parent, attrs)
         end
 
         private
 
-        def render(klass, parent, attrs)
-          rendered_table = render_table(klass, parent, attrs)
-
-          block = create_open_block(parent, "", attrs)
-          parse_content(block, rendered_table, attrs)
-        end
-
-        def render_table(klass, parent, attrs)
-          table_tmpl = get_template(parent.document, attrs)
-          table_tmpl.assigns["klass"] = klass
-          table_tmpl.render
-        end
-
-        def get_template(document, attrs)
-          template = DEFAULT_TEMPLATE
-          if attrs["template"]
-            template = attrs["template"]
-          end
-
-          rel_tmpl_path = Utils.relative_file_path(
-            document, template
-          )
-
-          ::Liquid::Template.parse(File.read(rel_tmpl_path))
+        def get_default_template
+          DEFAULT_TEMPLATE
         end
       end
     end

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

@@ -13,6 +13,8 @@ module Metanorma
     module Lutaml
       # Class for processing Lutaml files
       class LutamlPreprocessor < ::Asciidoctor::Extensions::Preprocessor
+        include Utils
+
         REMARKS_ATTRIBUTE = "remarks"
         EXPRESS_PREPROCESSOR_REGEX = %r{
           ^                            # Start of line
@@ -225,7 +227,8 @@ module Metanorma
             .new(include_paths, ["%s.liquid", "_%s.liquid", "_%s.adoc"])
 
           # Parse template once outside the loop
-          template = ::Liquid::Template.parse(lines.join("\n"))
+          template = ::Liquid::Template
+            .parse(lines.join("\n"), environment: create_liquid_environment)
           template.registers[:file_system] = file_system
 
           # Render for each item

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

@@ -1,7 +1,7 @@
 module Metanorma
   module Plugin
     module Lutaml
-      VERSION = "0.7.37".freeze
+      VERSION = "0.7.38".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.37
+  version: 0.7.38
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-10-03 00:00:00.000000000 Z
+date: 2025-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor