metanorma 1.4.14 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dac5b5e07f1da6269c97d7b1b0e0f5854f83eb1f91337395228b7b7f3354bc4
-  data.tar.gz: 848eb435ee3b51e989fc94e99c757e6ce920ff42a4ab137b7f6f5e765b4effc1
+  metadata.gz: 8c62d15c313b6595ca184016faa8f0996de7d1d8f1321e932e6adc89d230682d
+  data.tar.gz: f13f182618c3fec66f42e412bfe3d4baa142b877421458fb2555912ce077f8e5
 SHA512:
-  metadata.gz: 8364f0a11089ca85aa958a141c992922dd6366443e6d053197860ce14403961b9cb4069aba120ce4054242ebf5a9e40bf1d786fb9c4659dee89ea8ab4b57f22c
-  data.tar.gz: 578e518e52ed9d3404e576e957f0f523010dd2b0dcbd2376760185b92bbdd9aacac8bc2adb962425c3c3dc0ccd7fac528b377277d02b4f63c777696f77fd43b4
+  metadata.gz: 3d7e934fa1d1f0348a9877f25e037294e09513a3df04873ec6394b908d443cb2152480bd14c3e5948071657a6c4bcee2907964b8a2b408c7bb0d67a3f99e37c5
+  data.tar.gz: e1e626b4795c18b5a934262bc37faf0c4fe997832661f73e27e852f6bf66f67bde8c2b2edc86343463e3fde70eefd722e9af19fca186957761048193c70fc29b

data/.github/workflows/release.yml

@@ -18,6 +18,9 @@ jobs:
     uses: metanorma/ci/.github/workflows/rubygems-release.yml@main
     with:
       next_version: ${{ github.event.inputs.next_version }}
+      release_command: rake release
+      bundler_cache: false
+      post_install: gem install bundler rake rspec
     secrets:
       rubygems-api-key: ${{ secrets.METANORMA_CI_RUBYGEMS_API_KEY }}
       pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}

data/lib/metanorma/collection_fileparse.rb

@@ -8,7 +8,8 @@ module Metanorma
     # UUIDs, so that their IDs can at least be registered to be tracked
     # as existing.
     def read_anchors(xml)
-      xrefs = @isodoc.xref_init(@lang, @script, @isodoc, @isodoc.i18n, {})
+      xrefs = @isodoc.xref_init(@lang, @script, @isodoc, @isodoc.i18n,
+                                { locale: @locale })
       xrefs.parse xml
       xrefs.get.each_with_object({}) do |(k, v), ret|
         read_anchors1(k, v, ret)
@@ -37,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,
@@ -51,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}."
@@ -74,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 }
@@ -141,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
@@ -210,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/collection_renderer.rb

@@ -25,8 +25,9 @@ module Metanorma
     def initialize(collection, folder, options = {}) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       check_options options
       @xml = Nokogiri::XML collection.to_xml # @xml is the collection manifest
-      @lang = @xml&.at(ns("//bibdata/language"))&.text || "en"
-      @script = @xml&.at(ns("//bibdata/script"))&.text || "Latn"
+      @lang = @xml.at(ns("//bibdata/language"))&.text || "en"
+      @script = @xml.at(ns("//bibdata/script"))&.text || "Latn"
+      @locale = @xml.at(ns("//bibdata/locale"))&.text
       @doctype = doctype
       require "metanorma-#{@doctype}"
 
@@ -47,8 +48,7 @@ module Metanorma
       # list of files in the collection
       @files = read_files folder
       isodoc_populate(@isodoc)
-      FileUtils.rm_rf @outdir
-      FileUtils.mkdir_p @outdir
+      create_non_existing_directory(@outdir)
     end
 
     def dir_name_cleanse(name)
@@ -96,7 +96,7 @@ module Metanorma
     def concatenate1(out, ext)
       out.directives << "documents-inline"
       out.documents.each_key do |id|
-        next if @files[id][:attachment] || @files[id][:outputs].nil?
+        @files[id][:attachment] || @files[id][:outputs].nil? and next
 
         out.documents[id] =
           Metanorma::Document.raw_file(@files[id][:outputs][ext])
@@ -134,8 +134,8 @@ module Metanorma
     def isodoc
       x = Asciidoctor.load nil, backend: @doctype.to_sym
       isodoc = x.converter.html_converter(Dummy.new)
-      isodoc.i18n_init(@lang, @script) # read in internationalisation
-      isodoc.metadata_init(@lang, @script, isodoc.i18n)
+      isodoc.i18n_init(@lang, @script, @locale) # read in internationalisation
+      isodoc.metadata_init(@lang, @script, @locale, isodoc.i18n)
       isodoc.info(@xml, nil)
       isodoc
     end
@@ -146,7 +146,7 @@ module Metanorma
       nav = indexfile(@xml.at(ns("//manifest")))
       i18n = isodoc.i18n
       i18n.set("navigation", nav)
-      isodoc.metadata_init(@lang, @script, i18n)
+      isodoc.metadata_init(@lang, @script, @locale, i18n)
       # populate the @meta class of isodoc with the various metadata fields
       # native to the flavour; used to populate Liquid
       isodoc.info(@xml, nil)
@@ -240,6 +240,12 @@ module Metanorma
 
     private
 
+    def create_non_existing_directory(output_directory)
+      if !File.exist?(output_directory)
+        FileUtils.mkdir_p(output_directory)
+      end
+    end
+
     def format_sort(formats)
       ret = []
       formats.include?(:xml) and ret << :xml

data/lib/metanorma/compile_validate.rb

@@ -29,31 +29,32 @@ module Metanorma
         Util.log("[metanorma] Info: Loading `#{flavor}` gem "\
                  "for standard type `#{stdtype}`.", :info)
       end
-      require_flavor(flavor, stdtype)
+      require_flavor(flavor)
       unless @registry.supported_backends.include? stdtype
-        Util.log("[metanorma] Error: The `#{flavor}` gem "\
-                 "still doesn't support `#{stdtype}`. Exiting.", :fatal)
+        Util.log("[metanorma] Error: The `#{flavor}` gem does not "\
+                 "support the standard type #{stdtype}. Exiting.", :fatal)
       end
     end
 
-    def require_flavor(flavor, stdtype)
+    def require_flavor(flavor)
       require flavor
       Util.log("[metanorma] Info: gem `#{flavor}` loaded.", :info)
-    rescue Gem::ConflictError
-      Util.log("[metanorma] Error: Couldn't resolve dependencies for "\
-               "`metanorma-#{stdtype}`, Please add it to your Gemfile "\
-               "and run bundle install first", :fatal)
-    rescue LoadError
+    rescue LoadError => e
+      error_log = "#{Date.today}-error.log"
+      File.write(error_log, e)
+
       msg = <<~MSG
-        [metanorma] Error: loading gem `#{flavor}` failed. Exiting.
+        Error: #{e.message}
+        Metanorma has encountered an exception.
+
+        If this problem persists, please report this issue at the following link:
+
+        * https://github.com/metanorma/metanorma/issues/new
 
-        Troubleshooting:
-        1. If you are using metanorma via bundler/ruby, make sure that your
-           Gemfile contains a line:
-             gem "metanorma-#{stdtype}"
+        Please attach the #{error_log} file.
+        Your valuable feedback is very much appreciated!
 
-        2. If you are using brew/choco/snap packages, please report an issue
-           to https://github.com/metanorma/packed-mn/issues/new"
+        - The Metanorma team
       MSG
       Util.log(msg, :fatal)
     end

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/input/asciidoc.rb

@@ -70,7 +70,8 @@ module Metanorma
            pdf-allow-print pdf-allow-print-hq pdf-allow-fill-in-forms
            toc-figures toc-tables toc-recommendations fonts
            font-license-agreement pdf-allow-access-content
-           pdf-encrypt-metadata iso-word-template document-scheme).freeze
+           pdf-encrypt-metadata iso-word-template document-scheme
+           localize-number).freeze
 
       def extract_options(file)
         header = file.sub(/\n\n.*$/m, "\n")

data/lib/metanorma/version.rb

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

data/metanorma.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "asciidoctor"
   spec.add_runtime_dependency "fontist", ">= 1.14.3"
   spec.add_runtime_dependency "htmlentities"
-  spec.add_runtime_dependency "isodoc", ">= 2.2.3.1"
+  spec.add_runtime_dependency "isodoc", ">= 2.3.1"
   spec.add_runtime_dependency "metanorma-utils", "~> 1.4.0"
   spec.add_runtime_dependency "mn2pdf", "~> 1"
   spec.add_runtime_dependency "nokogiri"
@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
-  spec.add_development_dependency "metanorma-iso", "~> 2.1.7"
+  spec.add_development_dependency "metanorma-iso"
   spec.add_development_dependency "mnconvert"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 1.4.14
+  version: 1.5.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-06 00:00:00.000000000 Z
+date: 2022-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.3.1
+        version: 2.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.3.1
+        version: 2.3.1
 - !ruby/object:Gem::Dependency
   name: metanorma-utils
   requirement: !ruby/object:Gem::Requirement
@@ -154,16 +154,16 @@ dependencies:
   name: metanorma-iso
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.7
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.7
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mnconvert
   requirement: !ruby/object:Gem::Requirement