metanorma-utils 1.5.0 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33b64b5be38c76e221acfab262018c83cd448fc96ee1423c3d01cba7950a7427
-  data.tar.gz: 557d07f77f11df468cdab64b9c49067dde93897a30c18ba026a119705b406fe3
+  metadata.gz: edeeb87ccd74f0291767f8b7f11a67c1c670a183935b4fa9e03f886f383e915d
+  data.tar.gz: f9ec9f2dd952a8893bb4876ff826c48dc590c1188ce9d1e26dd8de4ad5adce7c
 SHA512:
-  metadata.gz: 12f71c44d00c21d7e9184513ca4abb4035cdea9b4dc669256b19e8f2f24d3204a5764701eac78966a3714eceb240731fb53fcf8815d1dc05d44337b797d53093
-  data.tar.gz: 2c956a89db56bd5afb818ac0078a45f838407b78a39bbba6ef403358f789c3a9dfdba20c65dbb67a57d3ed6c94a3a3098380ae0febbf7045a73d8ba788681d31
+  metadata.gz: 8c24b7db0805bd859259e20f9ea029a7a010ebbdc256966db51ebb16e6bd8724d4adf53cfae7d45e32b716fa84bb8691b30b923fb9bd1f09c6a3c722ad6b8bcd
+  data.tar.gz: ff2f10cc3b20c51d693e218acdcd8177b697c93d4ed707a80ec2ad1d65788d72d1de68083078c5696f8d5f3be4a38cd6b4c4bd3a4815f3a4e1e0bf8a6718474e

data/lib/utils/log.rb

@@ -37,13 +37,23 @@ module Metanorma
       end
 
       def context(node)
-        return nil if node.is_a? String
-
-        node.respond_to?(:to_xml) and return node.to_xml
+        node.is_a? String and return nil
+        node.respond_to?(:to_xml) and return human_readable_xml(node)
         node.respond_to?(:to_s) and return node.to_s
         nil
       end
 
+      # try to approximate input, at least for maths
+      def human_readable_xml(node)
+        ret = node.dup
+        ret.xpath(".//*[local-name() = 'stem']").each do |s|
+          sub = s.at("./*[local-name() = 'asciimath'] | " \
+                     "./*[local-name() = 'latexmath']")
+          sub and s.replace(sub)
+        end
+        ret.to_xml
+      end
+
       def write(file)
         File.open(file, "w:UTF-8") do |f|
           f.puts "#{file} errors"

data/lib/utils/main.rb

@@ -17,9 +17,8 @@ module Metanorma
       # , " => ," : CSV definition does not deal with space followed by quote
       # at start of field
       def csv_split(text, delim = ";")
-        return if text.nil?
-
-        CSV.parse_line(text&.gsub(/#{delim} "(?!")/, "#{delim}\""),
+        text.nil? || text.empty? and return []
+        CSV.parse_line(text.gsub(/#{delim} "(?!")/, "#{delim}\""),
                        liberal_parsing: true,
                        col_sep: delim)&.compact&.map(&:strip)
       end
@@ -55,7 +54,7 @@ module Metanorma
         HTMLEntities.new.encode(
           HTMLEntities.new.decode(
             text.gsub(/ --? /, " — ")
-            .gsub(/--/, "—"),
+            .gsub("--", "—"),
           )
             .smart_format, :basic
         )
@@ -65,7 +64,7 @@ module Metanorma
         elem.traverse do |n|
           next unless n.text?
 
-          n.replace(n.text.gsub(/\s+--?\s+/, "–").gsub(/--/, "–"))
+          n.replace(n.text.gsub(/\s+--?\s+/, "–").gsub("--", "–"))
         end
       end
 

data/lib/utils/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Utils
-    VERSION = "1.5.0".freeze
+    VERSION = "1.5.4".freeze
   end
 end

data/metanorma-utils.gemspec

@@ -24,7 +24,6 @@ Gem::Specification.new do |spec|
     f.match(%r{^(test|spec|features|bin|.github)/}) \
     || f.match(%r{Rakefile|bin/rspec})
   end
-  spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.add_dependency "asciidoctor", ">= 2"
@@ -37,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "sterile", "~> 1.0.14"
   spec.add_dependency "uuidtools"
 
+  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
@@ -48,4 +48,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "vcr", "~> 6.1.0"
   spec.add_development_dependency "webmock"
+  #spec.metadata["rubygems_mfa_required"] = "true"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-utils
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-16 00:00:00.000000000 Z
+date: 2023-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  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: debug
   requirement: !ruby/object:Gem::Requirement