metanorma-plugin-datastruct 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 506a0c248f1bcd37ddc11b9927517a0e64244a56e19f482fd2b49e7cf753d1f9
-  data.tar.gz: 933f231c3e43cce3f0d7058a036c4f3d80c028c5a463bc7823d5ff8b938fa417
+  metadata.gz: fc634fc7a6b9a9f552e22cc95a4ca8175398003670fb00a8e6570f12adf735ac
+  data.tar.gz: 5a39bb7f4053fcfba93e50a0f78eca3d127c0a088f48c1f8db4c4606fc8fc3af
 SHA512:
-  metadata.gz: 49014c580c342ceab3e6a86b2ab9e056ba78f03b76e7e260c5ce44f7de3e139e668670ce99266db3aa2f6fd39a8d71749dcaa8863f60a566890153db81fffebe
-  data.tar.gz: 92c523b5a89060a8754073c5f5fd776a167f160bb2219254325c4ecb1d0f79e180da9cdbf1a75a35169068d55294f1675d2db409a2a9be2e1e0c5d2f607e5859
+  metadata.gz: e09440e5e49f8293720973e657b93dd46bf51c0a5952364aa45b8638dc7605ce27ec146bc0057fa677f4e6ae4b26f08576b3c729956473ffbf099e882bf2a4c9
+  data.tar.gz: a7da83aabbfaa3907355af04304551eb7eb829d304ddca8ef0e06072801f082e842565c79b2fce6ddd483503cac17fcacfc88dfb454699f376662b9db97ebd84

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

@@ -19,6 +19,14 @@ Liquid::Template
                 Liquid::CustomBlocks::WithJsonNestedContext)
 Liquid::Template.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
     module Datastruct
@@ -29,15 +37,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 +70,7 @@ module Metanorma
 
         def relative_file_path(document, file_path)
           docfile_directory = File.dirname(
-            document.attributes["docfile"] || "."
+            document.attributes["docfile"] || ".",
           )
           document
             .path_resolver
@@ -151,7 +159,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 +172,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 +182,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.0".freeze
     end
   end
 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.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-24 00:00:00.000000000 Z
+date: 2024-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor