metanorma 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fec4f760c22a19793bca3f3cb2c5abc0b355a8554d5ac0720fe8e679a26db842
-  data.tar.gz: ffa03687166474e66611a2fa0f5841281ae5b1127e078dd7cbf2993ec1a15f65
+  metadata.gz: c92210eec85835a4e8be4a85a1c1dbe84cc1b88163e0f3c9c9be136f0019cb6e
+  data.tar.gz: 066d89b3df0a8865f52e3e70b257a1a4ce3c71eb9f8b6840a87b9046743536d1
 SHA512:
-  metadata.gz: 9721c89fe96d4bfb1bf6458fc79d824fa16887a349b2bdcd9618d6528ec0b32abf86158bc7658de8288bcf130ce3008427fcc06fe036179c652b70a2a3edd9f6
-  data.tar.gz: 74993bec3d7dca356699d821dadb55f35f7f7c20d6a8270e2c3fc9e224225504fe4fe3dee77cdf9cbc0a55eeee033df0253a17307fac8fec76772dc02c5c2f2f
+  metadata.gz: d23d488ab60995b4745184cc5a22aaaf1c9b24694186b8cfb0d7359ecaea1a999fef99dcc71c15944d5e9fbdd377f0739b35f79528f46071a7a701b512fd3108
+  data.tar.gz: 70dd774b5b69a08661cacf0d2601b0a92cb45624848f23f6f3a397df02ef9c496ff44a64f1c1fc083d07bbfa8754921dafe6168d0472ab776cb1453b064313ce

data/.github/workflows/rake.yml

@@ -16,19 +16,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.7', '2.6', '2.5', '2.4' ]
+        ruby: [ '3.0', '2.7', '2.6', '2.5', '2.4' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
         experimental: [ false ]
-        include:
-          - ruby: '3.0'
-            os: 'ubuntu-latest'
-            experimental: true
-          - ruby: '3.0'
-            os: 'windows-latest'
-            experimental: true
-          - ruby: '3.0'
-            os: 'macos-latest'
-            experimental: true
     steps:
       - uses: actions/checkout@v2
         with:

data/lib/metanorma/input/asciidoc.rb

@@ -2,20 +2,14 @@ require "nokogiri"
 
 module Metanorma
   module Input
-
     class Asciidoc < Base
-
       def process(file, filename, type, options = {})
         require "asciidoctor"
         out_opts = {
-          to_file: false,
-          safe: :safe,
-          backend: type,
-          header_footer: true,
-          attributes: [
-            "nodoc", "stem", "xrefstyle=short", "docfile=#{filename}",
-            "output_dir=#{options[:output_dir]}"
-          ]
+          to_file: false, safe: :safe, backend: type, header_footer: true,
+          attributes: ["nodoc", "stem", "xrefstyle=short",
+                       "docfile=#{filename}",
+                       "output_dir=#{options[:output_dir]}"]
         }
         unless asciidoctor_validate(file, filename, out_opts)
           warn "Cannot continue compiling Asciidoctor document"
@@ -27,11 +21,12 @@ module Metanorma
       def asciidoctor_validate(file, filename, options)
         err = nil
         begin
-          previous_stderr, $stderr = $stderr, StringIO.new
+          previous_stderr = $stderr
+          $stderr = StringIO.new
           ::Asciidoctor.load(file, options)
-          %r{(\n|^)asciidoctor: ERROR: ['"]?#{Regexp.escape(filename || 
-            "<empty>")}['"]?: line \d+: include file not found: }.match($stderr.string) and
-              err = $stderr.string
+          %r{(\n|^)asciidoctor: ERROR: ['"]?#{Regexp.escape(filename ||
+            "<empty>")}['"]?: line \d+: include file not found: }
+            .match($stderr.string) and err = $stderr.string
         ensure
           $stderr = previous_stderr
         end
@@ -45,8 +40,9 @@ module Metanorma
         /\n:mn-output-extensions: (?<extensions>[^\n]+)\n/ =~ headerextract
         /\n:mn-relaton-output-file: (?<relaton>[^\n]+)\n/ =~ headerextract
         /\n(?<asciimath>:mn-keep-asciimath:[^\n]*)\n/ =~ headerextract
-        asciimath = defined?(asciimath) ?
-          (!asciimath.nil? && asciimath != ":mn-keep-asciimath: false") : nil
+        asciimath = if defined?(asciimath)
+                      (!asciimath.nil? && asciimath != ":mn-keep-asciimath: false")
+                    end
         asciimath = nil if asciimath == false
         {
           type: defined?(type) ? type : nil,
@@ -60,38 +56,39 @@ module Metanorma
         attr&.sub(/^#{name}:\s*$/, "#{name}: true")&.sub(/^#{name}:\s+/, "")
       end
 
+      ADOC_OPTIONS = %w(htmlstylesheet htmlcoverpage htmlintropage scripts
+                        scripts-override scripts-pdf wordstylesheet bare i18nyaml
+                        standardstylesheet header wordcoverpage wordintropage
+                        ulstyle olstyle htmlstylesheet-override
+                        htmltoclevels doctoclevels sectionsplit
+                        body-font header-font monospace-font title-font
+                        wordstylesheet-override).freeze
+
       def extract_options(file)
         header = file.sub(/\n\n.*$/m, "\n")
-        ret = %w(htmlstylesheet htmlcoverpage htmlintropage scripts
-                 scripts-pdf wordstylesheet
-                 standardstylesheet header wordcoverpage wordintropage i18nyaml
-                 ulstyle olstyle htmlstylesheet-override
-                 htmltoclevels doctoclevels sectionsplit
-                 body-font header-font monospace-font title-font
-                 wordstylesheet-override).each_with_object({}) do |w, acc|
+        ret = ADOC_OPTIONS.each_with_object({}) do |w, acc|
           m = /\n:#{w}: ([^\n]+)\n/.match(header) or next
           acc[w.gsub(/-/, "").sub(/override$/, "_override")
             .sub(/pdf$/, "_pdf").to_sym] = m[1]
         end
         /\n:data-uri-image: (?<datauriimage>[^\n]+)\n/ =~ header
-        /\n:(?<hierarchical_assets>hierarchical-assets:[^\n]*)\n/ =~ header
+        /\n:(?<hier_assets>hierarchical-assets:[^\n]*)\n/ =~ header
         /\n:(?<use_xinclude>use-xinclude:[^\n]*)\n/ =~ header
         /\n:(?<break_up>break-up-urls-in-tables:[^\n]*)\n/ =~ header
 
-        defined?(hierarchical_assets) and
-          hierarchical_assets = empty_attr(hierarchical_assets, "hierarchical-assets")
+        defined?(hier_assets) and
+          hier_assets = empty_attr(hier_assets, "hierarchical-assets")
         defined?(use_xinclude) and
           use_xinclude = empty_attr(use_xinclude, "use-xinclude")
         defined?(break_up) and
           break_up = empty_attr(break_up, "break-up-urls-in-tables")
-        ret.merge({
+        ret.merge(
           datauriimage: defined?(datauriimage) ? datauriimage != "false" : nil,
-          hierarchical_assets: defined?(hierarchical_assets) ? hierarchical_assets : nil,
+          hierarchical_assets: defined?(hier_assets) ? hier_assets : nil,
           use_xinclude: defined?(use_xinclude) ? use_xinclude : nil,
           break_up_urls_in_tables: defined?(break_up) ? break_up : nil,
-        }).reject { |_, val| val.nil? }
+        ).reject { |_, val| val.nil? }
       end
-
     end
   end
 end

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "1.3.3".freeze
+  VERSION = "1.3.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-24 00:00:00.000000000 Z
+date: 2021-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor