metanorma-plugin-datastruct 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc634fc7a6b9a9f552e22cc95a4ca8175398003670fb00a8e6570f12adf735ac
-  data.tar.gz: 5a39bb7f4053fcfba93e50a0f78eca3d127c0a088f48c1f8db4c4606fc8fc3af
+  metadata.gz: 9afcd660bc9aa57c185e892b9654545e5665ca4fd1dfe6766936929e4103788f
+  data.tar.gz: 027c3feec5d5f497a814aa8a6326b15256055cc18c8e148bd823f9d7b5d8a2e5
 SHA512:
-  metadata.gz: e09440e5e49f8293720973e657b93dd46bf51c0a5952364aa45b8638dc7605ce27ec146bc0057fa677f4e6ae4b26f08576b3c729956473ffbf099e882bf2a4c9
-  data.tar.gz: a7da83aabbfaa3907355af04304551eb7eb829d304ddca8ef0e06072801f082e842565c79b2fce6ddd483503cac17fcacfc88dfb454699f376662b9db97ebd84
+  metadata.gz: f1d96b5d3628b6995799de038d408df8c6ae26867fac238166f386c3de63ada247154275e7dd42122a2a8493ca5ef7479ec40581d4bc76aa91e9bcd8c8a7d6fc
+  data.tar.gz: d131b05dcb593a958d1de557a66ea960a6bf412fbe922ab7c19b054efa2fb5e453d162468d0d6cd41817d8f95099c7947e772189688709ea3889e795335db719

data/.github/workflows/release.yml

@@ -7,11 +7,12 @@ on:
     inputs:
       next_version:
         description: |
-          Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
+          Next release version. Possible values: x.y.z, major, minor, patch (or pre|rc|etc).
+          Also, you can pass 'skip' to skip 'git tag' and do 'gem push' for the current version
         required: true
         default: 'skip'
-  push:
-    tags: [ v* ]
+  repository_dispatch:
+    types: [ do-release ]
 
 jobs:
   release:

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

@@ -10,14 +10,15 @@ require "liquid/custom_filters/values"
 require "liquid/custom_filters/replace_regex"
 require "metanorma/plugin/datastruct/source_extractor"
 
-Liquid::Template.register_tag("keyiterator", Liquid::CustomBlocks::KeyIterator)
-Liquid::Template
+Liquid::Environment.default
+  .register_tag("keyiterator", Liquid::CustomBlocks::KeyIterator)
+Liquid::Environment.default
   .register_tag("with_yaml_nested_context",
                 Liquid::CustomBlocks::WithYamlNestedContext)
-Liquid::Template
+Liquid::Environment.default
   .register_tag("with_json_nested_context",
                 Liquid::CustomBlocks::WithJsonNestedContext)
-Liquid::Template.register_filter(Liquid::CustomFilters)
+Liquid::Environment.default.register_filter(Liquid::CustomFilters)
 
 module Asciidoctor
   class PreprocessorNoIfdefsReader < PreprocessorReader
@@ -136,14 +137,15 @@ module Metanorma
                             content_from_file(document, block_match[1])
                           end
 
+          return if context_items.nil?
+
           parse_context_block(document: document,
                               context_lines: transformed_liquid_lines,
                               context_items: context_items,
                               context_name: block_match[2].strip)
         rescue StandardError => e
-          document.logger
-            .warn("Failed to parse #{config[:block_name]} \
-              block: #{e.message}")
+          ::Metanorma::Util.log("Failed to parse #{config[:block_name]} \
+              block: #{e.message}", :error)
           []
         end
 

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

@@ -1,7 +1,7 @@
 module Metanorma
   module Plugin
     module Datastruct
-      VERSION = "0.3.0".freeze
+      VERSION = "0.3.1".freeze
     end
   end
 end

data/lib/metanorma/plugin/datastruct/yaml2_text_preprocessor.rb

@@ -39,8 +39,15 @@ module Metanorma
 
         # https://ruby-doc.org/stdlib-2.5.1/libdoc/psych/rdoc/Psych.html#method-c-safe_load
         def content_from_file(document, file_path)
+          resolved_file_path = relative_file_path(document, file_path)
+
+          unless File.exist?(resolved_file_path)
+            ::Metanorma::Util.log("YAML file referenced in [yaml2text] block not found: #{resolved_file_path}", :error)
+            return
+          end
+
           YAML.safe_load(
-            File.read(relative_file_path(document, file_path), encoding: "UTF-8"),
+            File.read(resolved_file_path, encoding: "UTF-8"),
             permitted_classes: [Date, Time],
             permitted_symbols: [],
             aliases: true,

data/metanorma-plugin-datastruct.gemspec

@@ -40,5 +40,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "vcr", "~> 6.1.0"
   spec.add_development_dependency "webmock"
+  spec.add_development_dependency "xml-c14n"
   spec.metadata["rubygems_mfa_required"] = "false"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-plugin-datastruct
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-01 00:00:00.000000000 Z
+date: 2025-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -206,6 +206,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: xml-c14n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Metanorma plugin for yaml2text and json2text
 email:
 - open.source@ribose.com
@@ -243,7 +257,7 @@ licenses:
 - BSD-2-Clause
 metadata:
   rubygems_mfa_required: 'false'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -258,8 +272,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Metanorma plugin for yaml2text and json2text
 test_files: []