metanorma-utils 1.2.6 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a30a7e21f3ab7141f041bb44033a0524f059783e58a59ed52d967d3fff7afbb4
-  data.tar.gz: e16183e549cb876c845c91b05c26862e6a02c3ab856bef6009aa1215830d997b
+  metadata.gz: 2d2ac1711efc0b167d21909878face2dd4787e79d9aa5141d58908c1a8904056
+  data.tar.gz: e632e154726172f7ce1d09b0450d9b0ad70274936070336e01d05baff77e21ad
 SHA512:
-  metadata.gz: '0339ae03479662e9614f7dc81d05dc5ed6190305e5874bcdde14fad2022248808488960217ecd16c49ad7a538fde46aaf87297dde6d81b3775be37891c738246'
-  data.tar.gz: 88c72c000dbef43b82d021b3c58157a13877cefcde662abed8a3a7967683654eae621dbf3c9eee3867ea8aed061252f2562f074168d721f7bd6f7b2b638458dc
+  metadata.gz: cc3c1a6c0482904f4bc9a5b94a1c8ac42e4da45961c7fc6bb4ccbe527ef51cda959707f4f4906ed6042cf30e9c1407eec071c04aa57b551a0c38a86a791a3c46
+  data.tar.gz: dc015326b8d670cddc54488b452f48c7cf922a3677520d579798c8b56497957e3d934222f3f065a4600ea7bc0dc860ae6a8fd3fd5b443f38f482a5e84a8ce6ed

data/.github/workflows/rake.yml

@@ -10,23 +10,6 @@ on:
 
 jobs:
   rake:
-    name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '3.0', '2.7', '2.6', '2.5' ]
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
-        experimental: [ false ]
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: true
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-
-      - run: bundle exec rake
+    uses: metanorma/metanorma-build-scripts/.github/workflows/generic-rake.yml@main
+    secrets:
+      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}

data/lib/utils/image.rb

@@ -115,8 +115,10 @@ module Metanorma
         svg.xpath("//m:style", "m" => SVG_NS).each do |s|
           c = s.children.to_xml
           ids.each do |i|
-            c = c.gsub(%r[##{i}\b], sprintf("#%s_%09d", i, idx))
-              .gsub(%r(\[id\s*=\s*['"]?#{i}['"]?\]), sprintf("[id='%s_%09d']", i, idx))
+            c = c.gsub(%r[##{i}\b],
+                       sprintf("#%<id>s_%<idx>09d", id: i, idx: idx))
+              .gsub(%r(\[id\s*=\s*['"]?#{i}['"]?\]),
+                    sprintf("[id='%<id>s_%<idx>09d']", id: i, idx: idx))
           end
           s.children = c
         end

data/lib/utils/log.rb

@@ -29,7 +29,7 @@ module Metanorma
               (!node.respond_to?(:level) || node.level.positive?) &&
               (!node.respond_to?(:context) || node.context != :section)
             node = node.parent
-            return "Section: #{node.title}" if node&.respond_to?(:context) &&
+            return "Section: #{node.title}" if node.respond_to?(:context) &&
               node&.context == :section
           end
           "??"
@@ -50,13 +50,19 @@ module Metanorma
           @log.each_key do |key|
             f.puts "\n\n== #{key}\n\n"
             @log[key].sort_by { |a| a[:location] }.each do |n|
-              loc = n[:location] ? "(#{n[:location]}): " : ""
-              f.puts "#{loc}#{n[:message]}"
-              n[:context]&.split(/\n/)&.first(5)&.each { |l| f.puts "\t#{l}" }
+              write1(f, n)
             end
           end
         end
       end
+
+      def write1(file, entry)
+        loc = entry[:location] ? "(#{entry[:location]}): " : ""
+        file.puts "#{loc}#{entry[:message]}"
+        entry[:context]&.split(/\n/)&.first(5)&.each do |l|
+          file.puts "\t#{l}"
+        end
+      end
     end
   end
 end

data/lib/utils/main.rb

@@ -50,9 +50,13 @@ module Metanorma
 
       # TODO needs internationalisation
       def smartformat(text)
-        text.gsub(/ --? /, " — ")
-          .gsub(/--/, "&#8212;").smart_format.gsub(/</, "&lt;")
-          .gsub(/>/, "&gt;")
+        HTMLEntities.new.encode(
+          HTMLEntities.new.decode(
+            text.gsub(/ --? /, "&#8201;&#8212;&#8201;")
+            .gsub(/--/, "&#8212;"),
+          )
+            .smart_format, :basic
+        )
       end
 
       def endash_date(elem)
@@ -68,10 +72,8 @@ module Metanorma
       def set_nested_value(hash, keys, new_val)
         key = keys[0]
         if keys.length == 1
-          hash[key] = if hash[key].is_a?(Array)
-                        (hash[key] << new_val)
-                      else
-                        hash[key].nil? ? new_val : [hash[key], new_val]
+          hash[key] = if hash[key].is_a?(Array) then (hash[key] << new_val)
+                      else hash[key].nil? ? new_val : [hash[key], new_val]
                       end
         elsif hash[key].is_a?(Array)
           hash[key][-1] = {} if !hash[key].empty? && hash[key][-1].nil?
@@ -118,6 +120,26 @@ module Metanorma
         end
       end
 
+      def default_script(lang)
+        case lang
+        when "ar", "fa" then "Arab"
+        when "ur" then "Aran"
+        when "ru", "bg" then "Cyrl"
+        when "hi" then "Deva"
+        when "el" then "Grek"
+        when "zh" then "Hans"
+        when "ko" then "Kore"
+        when "he" then "Hebr"
+        when "ja" then "Jpan"
+        else
+          "Latn"
+        end
+      end
+
+      def rtl_script?(script)
+        %w(Arab Aran Hebr).include? script
+      end
+
       # not currently used
       def flatten_rawtext_lines(node, result)
         node.lines.each do |x|

data/lib/utils/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Utils
-    VERSION = "1.2.6".freeze
+    VERSION = "1.2.9".freeze
   end
 end

data/metanorma-utils.gemspec

@@ -24,25 +24,25 @@ Gem::Specification.new do |spec|
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  spec.add_dependency "asciidoctor", "~> 2.0.0"
+  spec.add_dependency "asciidoctor", ">= 2"
   spec.add_dependency "concurrent-ruby"
+  spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "marcel", "~> 1.0.0"
   spec.add_dependency "mime-types"
-  spec.add_dependency "nokogiri", "~> 1.11"
+  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 "debug"
   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.10"
+  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"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
-  spec.add_development_dependency "vcr", "~> 5.0.0"
+  spec.add_development_dependency "vcr", "~> 6.1.0"
   spec.add_development_dependency "webmock"
 end

data/spec/utils_spec.rb

@@ -7,8 +7,10 @@ RSpec.describe Metanorma::Utils do
   end
 
   it "capitalises" do
-    expect(Metanorma::Utils.strict_capitalize_phrase("ABC def gHI")).to eq "ABC Def GHI"
-    expect(Metanorma::Utils.strict_capitalize_first("aBC def gHI")).to eq "ABC def gHI"
+    expect(Metanorma::Utils.strict_capitalize_phrase("ABC def gHI"))
+      .to eq "ABC Def GHI"
+    expect(Metanorma::Utils.strict_capitalize_first("aBC def gHI"))
+      .to eq "ABC def gHI"
   end
 
   it "converts OS-specific external path" do
@@ -29,12 +31,13 @@ RSpec.describe Metanorma::Utils do
   end
 
   it "sets metanorma IDs if not provided" do
+    uuid = /^_[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/
     expect(Metanorma::Utils.anchor_or_uuid)
-      .to match (/^_[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/)
+      .to match (uuid)
     expect(Metanorma::Utils.anchor_or_uuid(Dummy.new(nil)))
-      .to match (/^_[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/)
+      .to match (uuid)
     expect(Metanorma::Utils.anchor_or_uuid(Dummy.new("")))
-      .to match (/^_[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/)
+      .to match (uuid)
     expect(Metanorma::Utils.anchor_or_uuid(Dummy.new("A"))).to eq "A"
   end
 
@@ -55,7 +58,7 @@ RSpec.describe Metanorma::Utils do
 
   it "applies smart formatting" do
     expect(Metanorma::Utils.smartformat("A - B A -- B A--B '80s '80' <A>"))
-      .to eq "A&#8201;&#8212;&#8201;B A&#8201;&#8212;&#8201;B A&#8212;B ’80s ‘80’ &lt;A&gt;"
+      .to eq "A — B A — B A—B ’80s ‘80’ &lt;A&gt;"
   end
 
   it "applies en-dash normalisation" do
@@ -98,6 +101,14 @@ RSpec.describe Metanorma::Utils do
     OUTPUT
   end
 
+  it "maps languages to scripts" do
+    expect(Metanorma::Utils.default_script("hi")).to eq "Deva"
+    expect(Metanorma::Utils.rtl_script?(Metanorma::Utils.default_script("el")))
+      .to eq false
+    expect(Metanorma::Utils.rtl_script?(Metanorma::Utils.default_script("fa")))
+      .to eq true
+  end
+
   it "rewrites SVGs" do
     FileUtils.cp("spec/fixtures/action_schemaexpg1.svg",
                  "action_schemaexpg1.svg")

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-utils
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-27 00:00:00.000000000 Z
+date: 2022-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,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: marcel
   requirement: !ruby/object:Gem::Requirement
@@ -70,14 +84,14 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.11'
 - !ruby/object:Gem::Dependency
@@ -109,21 +123,7 @@ 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
+  name: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -268,14 +268,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 6.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -339,7 +339,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.9
 signing_key:
 specification_version: 4
 summary: metanorma-utils