metanorma-plugin-datastruct 0.2.4 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 506a0c248f1bcd37ddc11b9927517a0e64244a56e19f482fd2b49e7cf753d1f9
-  data.tar.gz: 933f231c3e43cce3f0d7058a036c4f3d80c028c5a463bc7823d5ff8b938fa417
+  metadata.gz: 9afcd660bc9aa57c185e892b9654545e5665ca4fd1dfe6766936929e4103788f
+  data.tar.gz: 027c3feec5d5f497a814aa8a6326b15256055cc18c8e148bd823f9d7b5d8a2e5
 SHA512:
-  metadata.gz: 49014c580c342ceab3e6a86b2ab9e056ba78f03b76e7e260c5ce44f7de3e139e668670ce99266db3aa2f6fd39a8d71749dcaa8863f60a566890153db81fffebe
-  data.tar.gz: 92c523b5a89060a8754073c5f5fd776a167f160bb2219254325c4ecb1d0f79e180da9cdbf1a75a35169068d55294f1675d2db409a2a9be2e1e0c5d2f607e5859
+  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/Gemfile

@@ -1,5 +1,9 @@
+Encoding.default_external = Encoding::UTF_8
+Encoding.default_internal = Encoding::UTF_8
+
 source "https://rubygems.org"
+git_source(:github) { |repo| "https://github.com/#{repo}" }
 
-# Specify your gem's dependencies in metanorma-plugin-datastruct.gemspec
 gemspec
-gem "debug"
+
+eval_gemfile("Gemfile.devel") rescue nil

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

@@ -10,14 +10,23 @@ 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
+    def preprocess_conditional_directive(_keyword, _target, _delimiter, _text)
+      false # decline to resolve idefs
+    end
+  end
+end
 
 module Metanorma
   module Plugin
@@ -29,15 +38,15 @@ module Metanorma
         BLOCK_END_REGEXP = /\A\{[A-Z]+\}\z/.freeze
 
         def process(document, reader)
-          input_lines = reader.readlines
+          r = ::Asciidoctor::PreprocessorNoIfdefsReader
+            .new document, reader.lines
+          input_lines = r.readlines
           Metanorma::Plugin::Datastruct::SourceExtractor.extract(
             document,
             input_lines,
           )
-
-          Asciidoctor::Reader.new(
-            processed_lines(document, input_lines.to_enum),
-          )
+          Asciidoctor::PreprocessorNoIfdefsReader
+            .new(document, processed_lines(document, input_lines.to_enum))
         end
 
         protected
@@ -62,7 +71,7 @@ module Metanorma
 
         def relative_file_path(document, file_path)
           docfile_directory = File.dirname(
-            document.attributes["docfile"] || "."
+            document.attributes["docfile"] || ".",
           )
           document
             .path_resolver
@@ -128,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
 
@@ -151,7 +161,7 @@ module Metanorma
             .gsub(/(?<!{){(?!%)([^{}]+)(?<!%)}(?!})/, '{{\1}}')
             .gsub(/[a-z\.]+\#/, "index")
             .gsub(/{{(.+)\s+\+\s+(\d+)\s*?}}/, '{{ \1 | plus: \2 }}')
-            .gsub(/{{(.+)\s+\-\s+(\d+)\s*?}}/, '{{ \1 | minus: \2 }}')
+            .gsub(/{{(.+)\s+-\s+(\d+)\s*?}}/, '{{ \1 | minus: \2 }}')
             .gsub(/{{(.+)\.values(.*?)}}/,
                   '{% assign custom_value = \1 | values %}{{custom_value\2}}')
         end
@@ -164,7 +174,7 @@ module Metanorma
             template_string: context_lines.join("\n"),
             context_items: context_items,
             context_name: context_name,
-            document: document
+            document: document,
           )
           notify_render_errors(document, errors)
           render_result.split("\n")
@@ -174,7 +184,8 @@ module Metanorma
                                  context_name:, document:)
           liquid_template = Liquid::Template.parse(template_string)
           # Allow includes for the template
-          liquid_template.registers[:file_system] = ::Liquid::LocalFileSystem.new(relative_file_path(document, ""))
+          liquid_template.registers[:file_system] =
+            ::Liquid::LocalFileSystem.new(relative_file_path(document, ""))
           rendered_string = liquid_template
             .render(context_name => context_items,
                     strict_variables: true,

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

@@ -34,7 +34,7 @@ module Metanorma
             line = lines.next
 
             if /^embed::|^include::/.match?(line.strip)
-              file_lines = read(filename(@document, line))
+              file_lines = read(filename(@document, line)) or next
               SourceExtractor.extract(@document, file_lines)
             elsif m = match_anchor(line)
               @document.attributes["source_blocks"][m[:id]] = read_section lines
@@ -57,6 +57,7 @@ module Metanorma
         end
 
         def read(inc_path)
+          inc_path or return nil
           ::File.open inc_path, "r" do |fd|
             readlines_safe(fd).map(&:chomp)
           end

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

@@ -1,7 +1,7 @@
 module Metanorma
   module Plugin
     module Datastruct
-      VERSION = "0.2.4".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.2.4
+  version: 0.3.1
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-24 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: []