RubyGems - metanorma-utils - Versions diffs - 1.4.4.1 → 1.4.5 - Mend

metanorma-utils 1.4.4.1 → 1.4.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

checksums.yaml +4 -4
data/.github/workflows/release.yml +3 -0
data/lib/utils/image.rb +5 -3
data/lib/utils/main.rb +1 -0
data/lib/utils/version.rb +1 -1
data/lib/utils/xml.rb +35 -12
data/metanorma-utils.gemspec +1 -1
data/spec/img_spec.rb +37 -3
data/spec/utils_spec.rb +3 -4
data/spec/xml_spec.rb +14 -1
metadata +16 -16

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57ecf7558228131c734f18189db5fe9579683f11c9f8269f5edf430412054cb2
-  data.tar.gz: 4762e8db65f0a9e03e6a0c958d3e40968b5194824f1018e5aea0f8aca1096a90
+  metadata.gz: cf98f7674d114f222187c3da69bd8c436990eaec0a9a988402afdd8e178fe2e8
+  data.tar.gz: fecee536903d05211404268e2408c983c32332aabdfaac56de813d7a7fdc8eef
 SHA512:
-  metadata.gz: 644939cf2ef17f876d42224505ee084f57d1551ae44573f2792003c52392cd53fb3ae56cc872cba7f32680ca954738fefb1dda4c21d53395e74414c2140326ed
-  data.tar.gz: 1f159cdbd7c383816693d5e1b4303829f498ba7e47b6af583388c246f736bd80533d26d53e2e1a381f027c7a5340cbf320dc7300eb0ecd766b52482aa7dbfc52
+  metadata.gz: e2f07346a598463eeb74fabb69e930ce7bb343a72e574303d3a22517532d421bb2df84733bcebd846bfce69b20d9cb1ee798d917dadcfe44f46920606a9b64c8
+  data.tar.gz: 8cb5b3a0b22c94d6945002d2735e4babc9809056bd14e26b396ec3d03391d5867829e21fad78955cca7c62cb876c56adb9d896feb53957c9c3da74dcd400bfa3

data/.github/workflows/release.yml CHANGED Viewed

@@ -18,6 +18,9 @@ jobs:
     uses: metanorma/ci/.github/workflows/rubygems-release.yml@main
     with:
       next_version: ${{ github.event.inputs.next_version }}
+      release_command: rake release
+      bundler_cache: false
+      post_install: gem install bundler rake rspec
     secrets:
       rubygems-api-key: ${{ secrets.METANORMA_CI_RUBYGEMS_API_KEY }}
       pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}

data/lib/utils/image.rb CHANGED Viewed

@@ -127,12 +127,14 @@ module Metanorma
       # Check whether just the local path or the other specified relative path
       # works.
       def datauri(uri, local_dir = ".")
-        return uri if datauri?(uri) || url?(uri) || absolute_path?(uri)
+        return uri if datauri?(uri) || url?(uri)
-        path = [uri, File.join(local_dir, uri)].detect do |p|
+options = absolute_path?(uri) ? [uri] : [uri, File.join(local_dir, uri)]
+        path = options.detect do |p|
           File.exist?(p) ? p : nil
         end
-        unless path && File.exist?(path)
+        unless path
           warn "Image specified at `#{uri}` does not exist."
           return uri # Return original provided location
         end

data/lib/utils/main.rb CHANGED Viewed

@@ -3,6 +3,7 @@ require "tempfile"
 require "sterile"
 require "htmlentities"
 require "nokogiri"
+require "csv"
 module Metanorma
   module Utils

data/lib/utils/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 module Metanorma
   module Utils
-    VERSION = "1.4.4.1".freeze
+    VERSION = "1.4.5".freeze
   end
 end

data/lib/utils/xml.rb CHANGED Viewed

@@ -6,12 +6,19 @@ require "nokogiri"
 module Metanorma
   module Utils
-    NAMECHAR = "\u0000-\u002c\u002f\u003a-\u0040\\u005b-\u005e"\
-               "\u0060\u007b-\u00b6\u00b8-\u00bf\u00d7\u00f7\u037e"\
-               "\u2000-\u200b"\
+    NAMECHAR = "\u0000-\u002c\u002f\u003a-\u0040\\u005b-\u005e" \
+               "\u0060\u007b-\u00b6\u00b8-\u00bf\u00d7\u00f7\u037e" \
+               "\u2000-\u200b" \
                "\u200e-\u203e\u2041-\u206f\u2190-\u2bff\u2ff0-\u3000".freeze
-    NAMESTARTCHAR = "\\u002d\u002e\u0030-\u0039\u00b7\u0300-\u036f"\
+    NAMESTARTCHAR = "\\u002d\u002e\u0030-\u0039\u00b7\u0300-\u036f" \
                     "\u203f-\u2040".freeze
+    NOKOHEAD = <<~HERE.freeze
+      <!DOCTYPE html SYSTEM
+      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+      <html xmlns="http://www.w3.org/1999/xhtml">
+      <head> <title></title> <meta charset="UTF-8" /> </head>
+      <body> </body> </html>
+    HERE
     class << self
       def to_ncname(tag, asciionly: true)
@@ -31,14 +38,6 @@ module Metanorma
         node.nil? || node.id.nil? || node.id.empty? ? "_#{uuid}" : node.id
       end
-      NOKOHEAD = <<~HERE.freeze
-        <!DOCTYPE html SYSTEM
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-        <html xmlns="http://www.w3.org/1999/xhtml">
-        <head> <title></title> <meta charset="UTF-8" /> </head>
-        <body> </body> </html>
-      HERE
       # block for processing XML document fragments as XHTML,
       # to allow for HTMLentities
       # Unescape special chars used in Asciidoctor substitution processing
@@ -55,12 +54,36 @@ module Metanorma
         end
       end
+      def noko_html(&block)
+        doc = ::Nokogiri::XML.parse(NOKOHEAD)
+        fragment = doc.fragment("")
+        ::Nokogiri::XML::Builder.with fragment, &block
+        fragment.to_xml(encoding: "US-ASCII").lines.map do |l|
+          l.gsub(/\s*\n/, "")
+        end
+      end
+      def to_xhtml_fragment(xml)
+        doc = ::Nokogiri::XML.parse(NOKOHEAD)
+        doc.fragment(xml)
+      end
       def ns(xpath)
         xpath.gsub(%r{/([a-zA-z])}, "/xmlns:\\1")
           .gsub(%r{::([a-zA-z])}, "::xmlns:\\1")
           .gsub(%r{\[([a-zA-z][a-z0-9A-Z@/-]* ?=)}, "[xmlns:\\1")
           .gsub(%r{\[([a-zA-z][a-z0-9A-Z@/-]*[/\[\]])}, "[xmlns:\\1")
       end
+      def numeric_escapes(xml)
+        c = HTMLEntities.new
+        xml.split(/(&[^ \r\n\t#;]+;)/).map do |t|
+          if /^(&[^ \t\r\n#;]+;)/.match?(t)
+            c.encode(c.decode(t), :hexadecimal)
+          else t
+          end
+        end.join
+      end
     end
   end
 end

data/metanorma-utils.gemspec CHANGED Viewed

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "asciidoctor", ">= 2"
   spec.add_dependency "concurrent-ruby"
+  spec.add_dependency "csv"
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "marcel", "~> 1.0.0"
   spec.add_dependency "mime-types"
@@ -37,7 +38,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"
-  spec.add_development_dependency "metanorma-standoc", "~> 2.0"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.6"
   spec.add_development_dependency "rubocop", "~> 1.5.2"

data/spec/img_spec.rb CHANGED Viewed

@@ -2,6 +2,38 @@ require "spec_helper"
 require "fileutils"
 RSpec.describe Metanorma::Utils do
+  context "recognises data uris" do
+    it "where the content is an existing file at a relative path" do
+      expect(Metanorma::Utils.datauri("spec/fixtures/rice_image1.png"))
+        .to eq Metanorma::Utils.encode_datauri("spec/fixtures/rice_image1.png")
+    end
+    it "where the content is an existing file at an absolute path" do
+      expect(Metanorma::Utils.datauri(File.expand_path("spec/fixtures/rice_image1.png")))
+        .to eq Metanorma::Utils.encode_datauri("spec/fixtures/rice_image1.png")
+    end
+    it "where the content is a relative file path pointing to a bogus file" do
+      expect(Metanorma::Utils.datauri("spec/fixtures/bogus.png"))
+        .to eq "spec/fixtures/bogus.png"
+    end
+    it "where the content is an absolute file path pointing to a bogus file" do
+      expect(Metanorma::Utils.datauri("D:/spec/fixtures/bogus.png"))
+        .to eq "D:/spec/fixtures/bogus.png"
+    end
+    it "where the content is a data/image URI" do
+      expect(Metanorma::Utils.datauri("data1:img/gif,base64,ABBC"))
+        .to eq "data1:img/gif,base64,ABBC"
+    end
+    it "where the content is an URL" do
+      expect(Metanorma::Utils.datauri("https://example.com/image.png"))
+        .to eq "https://example.com/image.png"
+    end
+  end
   it "recognises data uris" do
     expect(Metanorma::Utils.datauri?("data:img/gif,base64,ABBC"))
       .to eq true
@@ -306,10 +338,12 @@ RSpec.describe Metanorma::Utils do
   it "generates data uris" do
     expect(Metanorma::Utils.datauri("data:xyz")).to eq "data:xyz"
     expect(Metanorma::Utils.datauri("spec/fixtures/rice_image1.png")).to be_equivalent_to "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAZAAAAGQCAYAAACAvzbMAAAABmJLR0QA/wD/AP+gvaeTAAAEzUlEQVR4nO3dz4tVZRzH8fedacogMCjHoiBop1RaOzF/QAv7QUIYZdCq/oQo+hdC10FRbVtVBC0r09y0iZAmoVwWRRaMBZlKnhZ3UlEwnVFnhvt6wQPnnnOeh8/m8r0P9zznKQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC42HT1RPVOdbT6c6Edrd5euDa9bOkAWJF2V3PVUA2jGtbfPG6jhXMLba56ahlzArBCTFf7q2GqhhfXNxzY3HB6R8Owc9xO72j4fHPDC7Pjexq3fZmNMOFGyx0Altn+6pV1Mw0fPtDo0bWXv/nLE7Xn24bjZxot9H31BmSEFUkBYZLtrj6+c6bhq0ca3X/rlXU6drK2fN3w27iIPF19ch0zwoqlgDCpbqqOTNWGgw/X/808LnZovnZ+U0N9Vz1Ynb0OGWFFm1ruALBMdlUb9q6/+uJRtf32en62qo2Nn86CiaOAMKmerXr5rsUP8NLd5w6fWXIaWIUUECbV1qqti5h9/Gfb+b7blpwGViEFhEl177qZumUJ34A1U3XHTFX3XKNMsKooIAAsigLCpPrx+Jk6tYRnp/4+W7+fqeqna5QJVhUFhEl1uOrwicUPcGj+/OGS08AqpIAwqT6oevfnxQ/w3i/nDj9achpYhSwkZFJNV0dGtfGLzeN1HVfjwHw9Nl5IOFc9lIWETCAzECbVP9XrQ7VnruHYySvv+MPJem6uYRh/fC3FgwnlbaJMsu+r2/4629b3f23YsrbRfWsu3+HgfO06cu49WPuqN29ATgBWoOnGhWCYqmHvbMNnmxpObT//OvdT2xs+3TS+dsHeIG/kBxgA1ZNdsKFUF2wo1aUbSj2+bCkBWJGmGheHtxoXij8W2tzCuV353xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAS/wLBh+fQNux/v8AAAAASUVORK5CYII="
-expect(Metanorma::Utils.datauri("rice_image1.png",
+    expect(Metanorma::Utils.datauri("rice_image1.png",
                                     "spec/fixtures")).to be_equivalent_to "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAZAAAAGQCAYAAACAvzbMAAAABmJLR0QA/wD/AP+gvaeTAAAEzUlEQVR4nO3dz4tVZRzH8fedacogMCjHoiBop1RaOzF/QAv7QUIYZdCq/oQo+hdC10FRbVtVBC0r09y0iZAmoVwWRRaMBZlKnhZ3UlEwnVFnhvt6wQPnnnOeh8/m8r0P9zznKQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC42HT1RPVOdbT6c6Edrd5euDa9bOkAWJF2V3PVUA2jGtbfPG6jhXMLba56ahlzArBCTFf7q2GqhhfXNxzY3HB6R8Owc9xO72j4fHPDC7Pjexq3fZmNMOFGyx0Altn+6pV1Mw0fPtDo0bWXv/nLE7Xn24bjZxot9H31BmSEFUkBYZLtrj6+c6bhq0ca3X/rlXU6drK2fN3w27iIPF19ch0zwoqlgDCpbqqOTNWGgw/X/808LnZovnZ+U0N9Vz1Ynb0OGWFFm1ruALBMdlUb9q6/+uJRtf32en62qo2Nn86CiaOAMKmerXr5rsUP8NLd5w6fWXIaWIUUECbV1qqti5h9/Gfb+b7blpwGViEFhEl177qZumUJ34A1U3XHTFX3XKNMsKooIAAsigLCpPrx+Jk6tYRnp/4+W7+fqeqna5QJVhUFhEl1uOrwicUPcGj+/OGS08AqpIAwqT6oevfnxQ/w3i/nDj9achpYhSwkZFJNV0dGtfGLzeN1HVfjwHw9Nl5IOFc9lIWETCAzECbVP9XrQ7VnruHYySvv+MPJem6uYRh/fC3FgwnlbaJMsu+r2/4629b3f23YsrbRfWsu3+HgfO06cu49WPuqN29ATgBWoOnGhWCYqmHvbMNnmxpObT//OvdT2xs+3TS+dsHeIG/kBxgA1ZNdsKFUF2wo1aUbSj2+bCkBWJGmGheHtxoXij8W2tzCuV353xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAS/wLBh+fQNux/v8AAAAASUVORK5CYII="
     expect(Metanorma::Utils.datauri2mime("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAZAAAAGQCAYAAACAvzbMAAAABmJLR0QA/wD/AP+gvaeTAAAEzUlEQVR4nO3dz4tVZRzH8fedacogMCjHoiBop1RaOzF/QAv7QUIYZdCq/oQo+hdC10FRbVtVBC0r09y0iZAmoVwWRRaMBZlKnhZ3UlEwnVFnhvt6wQPnnnOeh8/m8r0P9zznKQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC42HT1RPVOdbT6c6Edrd5euDa9bOkAWJF2V3PVUA2jGtbfPG6jhXMLba56ahlzArBCTFf7q2GqhhfXNxzY3HB6R8Owc9xO72j4fHPDC7Pjexq3fZmNMOFGyx0Altn+6pV1Mw0fPtDo0bWXv/nLE7Xn24bjZxot9H31BmSEFUkBYZLtrj6+c6bhq0ca3X/rlXU6drK2fN3w27iIPF19ch0zwoqlgDCpbqqOTNWGgw/X/808LnZovnZ+U0N9Vz1Ynb0OGWFFm1ruALBMdlUb9q6/+uJRtf32en62qo2Nn86CiaOAMKmerXr5rsUP8NLd5w6fWXIaWIUUECbV1qqti5h9/Gfb+b7blpwGViEFhEl177qZumUJ34A1U3XHTFX3XKNMsKooIAAsigLCpPrx+Jk6tYRnp/4+W7+fqeqna5QJVhUFhEl1uOrwicUPcGj+/OGS08AqpIAwqT6oevfnxQ/w3i/nDj9achpYhSwkZFJNV0dGtfGLzeN1HVfjwHw9Nl5IOFc9lIWETCAzECbVP9XrQ7VnruHYySvv+MPJem6uYRh/fC3FgwnlbaJMsu+r2/4629b3f23YsrbRfWsu3+HgfO06cu49WPuqN29ATgBWoOnGhWCYqmHvbMNnmxpObT//OvdT2xs+3TS+dsHeIG/kBxgA1ZNdsKFUF2wo1aUbSj2+bCkBWJGmGheHtxoXij8W2tzCuV353xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAS/wLBh+fQNux/v8AAAAASUVORK5CYII=")&.first&.to_s).to eq "image/png"
-        expect(Metanorma::Utils.datauri("spec/fixtures/rice_image0.png")).to be_equivalent_to "spec/fixtures/rice_image0.png"
-        expect{Metanorma::Utils.datauri("spec/fixtures/rice_image0.png")}.to output(%r{Image specified at `spec/fixtures/rice_image0\.png` does not exist\.}).to_stderr
+    expect(Metanorma::Utils.datauri("spec/fixtures/rice_image0.png")).to be_equivalent_to "spec/fixtures/rice_image0.png"
+    expect do
+      Metanorma::Utils.datauri("spec/fixtures/rice_image0.png")
+    end.to output(%r{Image specified at `spec/fixtures/rice_image0\.png` does not exist\.}).to_stderr
   end
 end

data/spec/utils_spec.rb CHANGED Viewed

@@ -23,11 +23,10 @@ RSpec.describe Metanorma::Utils do
   end
   it "applies Asciidoctor substitutions" do
-    require "metanorma-standoc"
-    expect(Metanorma::Utils.asciidoc_sub("A -- B"))
+    expect(Metanorma::Utils.asciidoc_sub("A -- B", "html"))
       .to eq "A&#8201;&#8212;&#8201;B"
-    expect(Metanorma::Utils.asciidoc_sub("*A* stem:[x]"))
-      .to eq "<strong>A</strong> <stem type=\"AsciiMath\">x</stem>"
+    expect(Metanorma::Utils.asciidoc_sub("*A* stem:[x]", "html"))
+      .to eq "<strong>A</strong> \\$x\\$"
   end
   it "finds file path of docfile" do

data/spec/xml_spec.rb CHANGED Viewed

@@ -34,6 +34,12 @@ RSpec.describe Metanorma::Utils do
     expect(out).to be_equivalent_to <<~OUTPUT
       &lt;A&gt;
     OUTPUT
+    out = Metanorma::Utils.noko_html do |xml|
+      xml << doc.blocks.first.content
+    end.join
+    expect(out).to be_equivalent_to <<~OUTPUT
+      &lt;A&gt;
+    OUTPUT
   end
   it "wraps an Asciidoctor node in paragraph" do
@@ -69,7 +75,14 @@ RSpec.describe Metanorma::Utils do
   it "applies namespace to xpath" do
     expect(Metanorma::Utils.ns("//ab/Bb/c1-d[ancestor::c][d = 'x'][e/f]"))
-      .to be_equivalent_to("//xmlns:ab/xmlns:Bb/xmlns:c1-d[ancestor::xmlns:c]"\
+      .to be_equivalent_to("//xmlns:ab/xmlns:Bb/xmlns:c1-d[ancestor::xmlns:c]" \
                            "[xmlns:d = 'x'][xmlns:e/xmlns:f]")
   end
+  it "converts HTML escapes to hex" do
+    expect(Metanorma::Utils.numeric_escapes("A&eacute;B"))
+      .to be_equivalent_to "A&#xe9;B"
+    expect(Metanorma::Utils.numeric_escapes("A<X>&eacute;</X>B"))
+      .to be_equivalent_to "A<X>&#xe9;</X>B"
+  end
 end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-utils
 version: !ruby/object:Gem::Version
-  version: 1.4.4.1
+  version: 1.4.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-25 00:00:00.000000000 Z
+date: 2022-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -178,20 +192,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.7'
-- !ruby/object:Gem::Dependency
-  name: metanorma-standoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement