metanorma-utils 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d32567e880304ea57ec26bd33014d3b727e30caa9fd057ef7f4d3fe8121b630
-  data.tar.gz: 5fd706a2faf7f9db1419fa537e596b96cd82800bab4382b5c2d0b5e8a8605057
+  metadata.gz: b8214b4ddc7290c78f5c5dd70fb9cb894e4fd33d6a69a40de41e86e34f9ae0ef
+  data.tar.gz: d40b771439ac6bfeca275970a6fb2c779bc492d60f2542b7b194abf6a95cae83
 SHA512:
-  metadata.gz: 75bfacc4803e89a34ca0ceb8907691bfd25462d1d947bc037fc63fd08217857d21567e81d112a10afe7adcf315363a77c1461eaef29710b9eb862b947b5d0724
-  data.tar.gz: '053841eeac54b72fccc6386f157b65b778c48b79d8be0d28ed49d8ba77e5d4e3036bddaf29aa736776d77a2b53f7114db670ba0e90f53554e9e93a23c24f26a8'
+  metadata.gz: 8ac9628f99e84e0600e479136aa54afdbfe2aab3a2f7ebf0ea4ab1419125002f74937c1a2a731ca2510f568b5fd4b2e2aa8cefc65b572476f18ea77c0922fc9e
+  data.tar.gz: 3722452d1fbce0836ad04f87999f63f9d191612441e3226d3788e16efa06ff59d203f6b45943d332c530d18bf198498696d19e592c7130c9084f93409866b1b9

data/.github/workflows/rake.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '3.0', '2.7', '2.6', '2.5', '2.4' ]
+        ruby: [ '3.0', '2.7', '2.6', '2.5' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
         experimental: [ false ]
     steps:

data/.rubocop.yml

@@ -7,4 +7,4 @@ inherit_from:
 # ...
 
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5

data/lib/utils/image.rb

@@ -54,8 +54,7 @@ module Metanorma
           /^data:/.match(src) and i["src"] = datauri(path)
         elsif i = svgmap.at(".//m:svg", "m" => SVG_NS)
           i.replace(svgmap_rewrite1(svgmap, i, namespace, idx))
-        else
-          return false
+        else return false
         end
         true
       end

data/lib/utils/main.rb

@@ -2,25 +2,28 @@ require "asciidoctor"
 require "tempfile"
 require "sterile"
 require "uuidtools"
+require "htmlentities"
 
 module Metanorma
   module Utils
-    NAMECHAR = "\u0000-\u0022\u0024\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
+    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"\
-      "\u203f-\u2040".freeze
+                    "\u203f-\u2040".freeze
 
     class << self
-      def to_ncname(tag)
+      def to_ncname(tag, asciionly: true)
+        asciionly and tag = HTMLEntities.new.encode(tag, :basic, :hexadecimal)
         start = tag[0]
-        ret1 = if %r([#{NAMECHAR}#]).match?(start)
+        ret1 = if %r([#{NAMECHAR}#])o.match?(start)
                  "_"
                else
-                 (%r([#{NAMESTARTCHAR}#]).match?(start) ? "_#{start}" : start)
+                 (%r([#{NAMESTARTCHAR}#])o.match?(start) ? "_#{start}" : start)
                end
         ret2 = tag[1..-1] || ""
-        (ret1 || "") + ret2.gsub(%r([#{NAMECHAR}#]), "_")
+        (ret1 || "") + ret2.gsub(%r([#{NAMECHAR}#])o, "_")
       end
 
       def anchor_or_uuid(node = nil)
@@ -34,7 +37,7 @@ module Metanorma
 
         d = Asciidoctor::Document.new(
           text.lines.entries,
-          { header_footer: false, backend: flavour }
+          { header_footer: false, backend: flavour },
         )
         b = d.parse.blocks.first
         b.apply_subs(b.source)

data/lib/utils/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Utils
-    VERSION = "1.2.3".freeze
+    VERSION = "1.2.4".freeze
   end
 end

data/metanorma-utils.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.files         = `git ls-files`.split("\n")
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.add_dependency "asciidoctor", "~> 2.0.0"
   spec.add_dependency "concurrent-ruby"
@@ -31,12 +31,13 @@ Gem::Specification.new do |spec|
   spec.add_dependency "nokogiri", "~> 1.11"
   spec.add_dependency "sterile", "~> 1.0.14"
   spec.add_dependency "uuidtools"
+  spec.add_dependency "htmlentities", "~> 4.3.4"
 
   spec.add_development_dependency "byebug"
   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", "~> 1.8"
+  spec.add_development_dependency "metanorma-standoc", "~> 1.10"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.6"
   spec.add_development_dependency "rubocop", "~> 1.5.2"

data/spec/utils_spec.rb

@@ -8,6 +8,9 @@ RSpec.describe Metanorma::Utils do
 
   it "normalises anchors" do
     expect(Metanorma::Utils.to_ncname("/:ab")).to eq "__ab"
+    expect(Metanorma::Utils.to_ncname("Löwe")).to eq "L__xf6_we"
+    expect(Metanorma::Utils.to_ncname("Löwe", asciionly: false)).to eq "Löwe"
+    expect(Metanorma::Utils.to_ncname("Löwe", asciionly: true)).to eq "L__xf6_we"
   end
 
   it "sets metanorma IDs if not provided" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-utils
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-07 00:00:00.000000000 Z
+date: 2021-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: htmlentities
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.3.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.3.4
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -318,7 +332,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="