metanorma-standoc 2.9.1 → 2.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08c688771192b46a0cabe0ec82dc8b88902a49577b4af1fafb8c3efc00192a6d'
-  data.tar.gz: 27b915f4d6ba5ebe4c8a16cf1c02a26f9cf37af524d6d3bdbc145ce360280df7
+  metadata.gz: afbcf21ea1b8e99868178616c755a4dcef811f631326c65f6835ad491d1f2835
+  data.tar.gz: 9d3499adf6025521d2683f4456e64b1cd27dd63722c231de8fab7aa47fe79973
 SHA512:
-  metadata.gz: e0717e6c250f4ae7b649ce1943abf0665dad4abdf1b9b20021681e64a141967c34d53a3ed4de04b8112a4cc8ea8df79f4afd46ea96aa28622d2b6d0314f349a0
-  data.tar.gz: 41d8468137fd2b538597dd8379b1364f189c0d500cba23b691513754a84eb3423aa8eb46794258cdad7e21c799f518b305f46240817d4858dcb24d8848050a80
+  metadata.gz: 46a8beb31cb6230dccdcdb36352dd05e705a3114d0b1b6e04b46b1a445aa1fe30249426c81be8a441f615c95fe633cc078bd70c030616cdc25ff4c50eb45ab76
+  data.tar.gz: 300aeca29fa514e88535c4f60577f9a6e83446f195b76e7e15029ae912d0beb06c0f6f028b098e4662ab53fbf83fc8e675a920ef7c3269f1e501afa835ba127f

data/lib/metanorma/standoc/cleanup_bibitem.rb

@@ -36,7 +36,7 @@ module Metanorma
 
       def extract_notes_from_biblio(refs)
         refs.xpath("./bibitem").each do |r|
-          r.xpath("./note[@appended]").reverse.each do |n|
+          r.xpath("./note[@appended]").reverse_each do |n|
             n.delete("appended")
             r.next = n
           end
@@ -147,34 +147,38 @@ module Metanorma
 
       def save_attachment(path, bib)
         init_attachments
+        path = File.join(@localdir, path)
         valid_attachment?(path, bib) or return ""
         f = File.basename(path)
         File.exist?(File.join(@attachmentsdir, f)) and
           f += "_#{UUIDTools::UUID.random_create}"
-        ret = File.join(@attachmentsdir, f)
-        FileUtils.cp(path, ret)
-        datauri_attachment(ret, bib.document)
-        ret
+        out_fld = File.join(@attachmentsdir, f)
+        FileUtils.cp(path, out_fld)
+        datauri_attachment(out_fld, bib.document)
+        File.join(@attachmentsfld, f)
       end
 
       def datauri_attachment(path, doc)
         @datauriattachment or return
-        n = add_misc_container(doc)
+        m = add_misc_container(doc)
         f = File.basename(path)
-        d = Vectory::Utils.datauri(path)
-        n << "<attachment name='#{f}'>#{d}</attachment>"
+        d = Vectory::Utils::datauri(path, @localdir)
+        m << "<attachment name='#{f}'/>"
+        m.last_element_child << d
       end
 
       def valid_attachment?(path, bib)
         File.exist?(path) and return true
-        @log.add("Bibliography", bib, "Attachment #{path} does not exist",
+        p = Pathname.new(path).cleanpath
+        @log.add("Bibliography", bib, "Attachment #{p} does not exist",
                  severity: 0)
         false
       end
 
       def init_attachments
         @attachmentsdir and return
-        @attachmentsdir = File.join(@output_dir, "_#{@filename}_attachments")
+        @attachmentsfld = "_#{@filename}_attachments"
+        @attachmentsdir = File.join(@output_dir, @attachmentsfld)
         FileUtils.rm_rf(@attachmentsdir)
         FileUtils.mkdir_p(@attachmentsdir)
       end

data/lib/metanorma/standoc/cleanup_ref.rb

@@ -17,7 +17,7 @@ module Metanorma
         bib = sort_biblio(refs.xpath("./bibitem"))
         insert = refs.at("./bibitem")&.previous_element
         refs.xpath("./bibitem").each(&:remove)
-        bib.reverse.each do |b|
+        bib.reverse_each do |b|
           (insert and insert.next = b.to_xml) or
             refs.children.first.add_previous_sibling b.to_xml
         end

data/lib/metanorma/standoc/cleanup_text.rb

@@ -35,7 +35,7 @@ module Metanorma
 
       IGNORE_QUOTES_ELEMENTS =
         %w(pre tt sourcecode stem asciimath figure bibdata passthrough
-           identifier presentation-metadata semantic-metadata).freeze
+           identifier metanorma-extension).freeze
 
       def uninterrupt_quotes_around_xml_skip(elem)
         !(/\A['"]/.match?(elem.text) &&

data/lib/metanorma/standoc/ref_queue.rb

@@ -40,7 +40,7 @@ module Metanorma
       def reference_queue(results, size)
         (1..size).each.with_object([]) do |_, m|
           ref, i, doc = results.pop
-          m[i.to_i] = { ref: ref }
+          m[i.to_i] = { ref: }
           if doc.is_a?(RelatonBib::RequestError)
             @log.add("Bibliography", nil, "Could not retrieve #{ref[:code]}: " \
                                           "no access to online site", severity: 1)
@@ -69,7 +69,7 @@ module Metanorma
 
       def merge_publishers(base, add)
         ins = base.at("//contributor[last()]") || base.children[-1]
-        add.xpath("//contributor[role/@type = 'publisher']").reverse.each do |p|
+        add.xpath("//contributor[role/@type = 'publisher']").reverse_each do |p|
           ins.next = p
         end
       end
@@ -80,14 +80,14 @@ module Metanorma
           v.at("//docidentifier[@primary = 'true']") or
             v.at("//docidentifier")["primary"] = true
         end
-        add.xpath("//docidentifier").reverse.each do |p|
+        add.xpath("//docidentifier").reverse_each do |p|
           ins.next = p
         end
       end
 
       def merge_urls(base, add)
         ins = base.at("./uri[last()]") || base.at("./title[last()]")
-        add.xpath("./uri").reverse.each do |p|
+        add.xpath("./uri").reverse_each do |p|
           ins.next = p
         end
       end

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.9.1".freeze
+    VERSION = "2.9.2".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -59,5 +59,6 @@ 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.add_development_dependency "xml-c14n"
   # spec.metadata["rubygems_mfa_required"] = "true"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 2.9.1
+  version: 2.9.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-22 00:00:00.000000000 Z
+date: 2024-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -416,6 +416,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: xml-c14n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   metanorma-standoc realises standards following the Metanorma standoc model