metanorma 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90bf0ce070f2311504682547eb3024210586686123020f92a776fc590fe478a9
-  data.tar.gz: 330f7930f8c1bfd3972fff06b59d1a31bdd78893a849d4b01f377051c7137089
+  metadata.gz: 8c62d15c313b6595ca184016faa8f0996de7d1d8f1321e932e6adc89d230682d
+  data.tar.gz: f13f182618c3fec66f42e412bfe3d4baa142b877421458fb2555912ce077f8e5
 SHA512:
-  metadata.gz: 878e9d88ee70e5bfeda7198d596b77d4785f0c4aab345aedf7eabf67d5a28dddfb04df560376376b2137aa20f330986efee59d3f456ccf15d4fbca64ce45d1c8
-  data.tar.gz: 69f19f897413b45d7111fcabeba645a2aaffe48900230b18f08eef4977219d009ac91a5952f9c1afb985fb31ccb936f25b169ebc1c29e46256852d358869a6d8
+  metadata.gz: 3d7e934fa1d1f0348a9877f25e037294e09513a3df04873ec6394b908d443cb2152480bd14c3e5948071657a6c4bcee2907964b8a2b408c7bb0d67a3f99e37c5
+  data.tar.gz: e1e626b4795c18b5a934262bc37faf0c4fe997832661f73e27e852f6bf66f67bde8c2b2edc86343463e3fde70eefd722e9af19fca186957761048193c70fc29b

data/lib/metanorma/collection_fileparse.rb

@@ -38,10 +38,8 @@ module Metanorma
 
     # @param bib [Nokogiri::XML::Element]
     # @param identifier [String]
-    def update_bibitem(bib, identifier) # rubocop:disable Metrics/AbcSize
-      docid = bib&.at(ns("./docidentifier"))&.children&.to_xml
-      return fail_update_bibitem(docid, identifier) unless @files[docid]
-
+    def update_bibitem(bib, identifier)
+      docid = get_bibitem_docid(bib, identifier) or return
       newbib = dup_bibitem(docid, bib)
       bib.replace(newbib)
       _file, url = targetfile(@files[docid], relative: true, read: false,
@@ -52,6 +50,19 @@ module Metanorma
       newbib.at(ns("./docidentifier")).previous = uri_node
     end
 
+    def get_bibitem_docid(bib, identifier)
+      # IDs for repo references are untyped by default
+      docid = bib.at(ns("./docidentifier[not(@type)]")) ||
+        bib.at(ns("./docidentifier"))
+      docid &&= docid.children.to_xml
+      if @files[docid]
+        docid
+      else
+        fail_update_bibitem(docid, identifier)
+        nil
+      end
+    end
+
     def fail_update_bibitem(docid, identifier)
       error = "[metanorma] Cannot find crossreference to document #{docid} "\
               "in document #{identifier}."
@@ -75,7 +86,8 @@ module Metanorma
     # in another file in the collection)
     # @param file [String] XML content
     # @param identifier [String] docid
-    # @param internal_refs [Hash{String=>Hash{String=>String}] schema name to anchor to filename
+    # @param internal_refs [Hash{String=>Hash{String=>String}] schema name to
+    #   anchor to filename
     # @return [String] XML content
     def update_xrefs(file, identifier, internal_refs)
       docxml = Nokogiri::XML(file) { |config| config.huge }
@@ -142,11 +154,12 @@ module Metanorma
     def update_direct_refs_to_docs(docxml, identifier)
       erefs = collect_erefs(docxml)
       docxml.xpath(ns("//bibitem[not(ancestor::bibitem)]")).each do |b|
-        docid = b&.at(ns("./docidentifier[@type = 'repository']"))&.text
+        docid = b.at(ns("./docidentifier[@type = 'repository']"))&.text
         next unless docid && %r{^current-metanorma-collection/}.match(docid)
 
         update_bibitem(b, identifier)
-        docid = b&.at(ns("./docidentifier"))&.children&.to_xml or next
+        docid = b.at(ns("./docidentifier")) or next
+        docid = docid.children.to_xml
         erefs[:citeas][docid] and update_anchors(b, docxml, docid)
       end
     end
@@ -211,9 +224,9 @@ module Metanorma
     # anchor given the locality, and insert it into the crossref
     def update_anchor_create_loc(_bib, eref, docid)
       ins = eref.at(ns("./localityStack")) or return
-      type = ins&.at(ns("./locality/@type"))&.text
+      type = ins.at(ns("./locality/@type"))&.text
       type = "clause" if type == "annex"
-      ref = ins&.at(ns("./locality/referenceFrom"))&.text
+      ref = ins.at(ns("./locality/referenceFrom"))&.text
       anchor = @files[docid][:anchors].dig(type, ref) or return
       ins << "<locality type='anchor'><referenceFrom>#{anchor.sub(/^_/, '')}"\
              "</referenceFrom></locality>"

data/lib/metanorma/document.rb

@@ -40,9 +40,9 @@ module Metanorma
       end
 
       def attachment_bibitem(identifier)
-        Nokogiri::XML(
-          "<bibdata><docidentifier>#{identifier}</docidentifier></bibdata>",
-        )
+        Nokogiri::XML <<~DOCUMENT
+          <bibdata><docidentifier>#{identifier}</docidentifier></bibdata>
+        DOCUMENT
       end
 
       private
@@ -94,9 +94,10 @@ module Metanorma
 
     # @return [String]
     def type
-      @type ||= (@bibitem.docidentifier.first&.type&.downcase ||
-                 @bibitem.docidentifier.first&.id&.match(/^[^\s]+/)&.to_s)&.downcase ||
-      "standoc"
+      first = @bibitem.docidentifier.first
+      @type ||= (first&.type&.downcase ||
+                 first&.id&.match(/^[^\s]+/)&.to_s)&.downcase ||
+        "standoc"
     end
 
     private

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "1.5.0".freeze
+  VERSION = "1.5.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-26 00:00:00.000000000 Z
+date: 2022-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor