metanorma 1.5.0 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90bf0ce070f2311504682547eb3024210586686123020f92a776fc590fe478a9
-  data.tar.gz: 330f7930f8c1bfd3972fff06b59d1a31bdd78893a849d4b01f377051c7137089
+  metadata.gz: 2dd771e6d08104e0da071e1a9326ebdd909565d6e53b5393b4375dde3507e157
+  data.tar.gz: ff4931bf6d1fd1bbed2ffb47b4dbf6dbda95027caff1d24f388f881e4827da65
 SHA512:
-  metadata.gz: 878e9d88ee70e5bfeda7198d596b77d4785f0c4aab345aedf7eabf67d5a28dddfb04df560376376b2137aa20f330986efee59d3f456ccf15d4fbca64ce45d1c8
-  data.tar.gz: 69f19f897413b45d7111fcabeba645a2aaffe48900230b18f08eef4977219d009ac91a5952f9c1afb985fb31ccb936f25b169ebc1c29e46256852d358869a6d8
+  metadata.gz: 55f9e339d45f4cd40e6666660fdd2ad2c52b85332c07b64b66f59208cabd703e79ac38dda55070c99cd79a45b09199fb487b7aa5701553e1599d8239f8a50959
+  data.tar.gz: ba2ccbb163a0bad558a56680a8bf66d112ca3cc0f72fb87772b678b029d3c8ac3e27152f28442c5cade32149ab86a09e1ebebe19786e1a770c53f85036f3723e

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/collection_renderer.rb

@@ -119,7 +119,7 @@ module Metanorma
       end
 
       def attr(key)
-        if key == "fonts-manifest" && @font_locations
+        if key == "fonts-manifest" && @fonts_manifest
           @fonts_manifest
         end
       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

@@ -71,7 +71,8 @@ module Metanorma
            toc-figures toc-tables toc-recommendations fonts
            font-license-agreement pdf-allow-access-content
            pdf-encrypt-metadata iso-word-template document-scheme
-           localize-number).freeze
+           localize-number iso-word-bg-strip-color
+           modspec-identifier-base).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.5.0".freeze
+  VERSION = "1.5.2".freeze
 end

data/metanorma.gemspec

@@ -14,13 +14,14 @@ Gem::Specification.new do |spec|
   spec.license       = "BSD-2-Clause"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
+    f.match(%r{^(test|spec|features|bin|.github)/}) \
+    || f.match(%r{Rakefile|bin/rspec})
   end
   spec.extra_rdoc_files = %w[README.adoc CHANGELOG.adoc LICENSE.txt]
   spec.bindir        = "bin"
   # spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = ">= 2.5.0"
+  spec.required_ruby_version = ">= 2.7.0"
 
   spec.add_runtime_dependency "asciidoctor"
   spec.add_runtime_dependency "fontist", ">= 1.14.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-26 00:00:00.000000000 Z
+date: 2022-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -258,10 +258,6 @@ extra_rdoc_files:
 - CHANGELOG.adoc
 - LICENSE.txt
 files:
-- ".github/workflows/dependent_repos.env"
-- ".github/workflows/notify.yml"
-- ".github/workflows/rake.yml"
-- ".github/workflows/release.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rspec"
@@ -271,12 +267,6 @@ files:
 - Gemfile
 - LICENSE.txt
 - README.adoc
-- Rakefile
-- bin/console
-- bin/metanorma-pdf.js
-- bin/rasterize.js
-- bin/rspec
-- bin/setup
 - lib/metanorma.rb
 - lib/metanorma/asciidoctor_extensions.rb
 - lib/metanorma/asciidoctor_extensions/glob_include_processor.rb
@@ -314,14 +304,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Metanorma is the standard of standards; the metanorma gem allows you to create

data/.github/workflows/dependent_repos.env

@@ -1,2 +0,0 @@
-ORGANISATION=metanorma
-DEPENDENT_REPOS="metanorma-docker"

data/.github/workflows/notify.yml

@@ -1,47 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: notify
-
-on:
-  repository_dispatch:
-    types: [ notify ]
-
-jobs:
-  notify:
-    name: Notify dependent repos
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Trigger repositories
-        env:
-          GH_USERNAME: metanorma-ci
-          GH_ACCESS_TOKEN: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
-        run: |
-          curl -LO --retry 3 https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/trigger-gh-actions.sh
-          [[ -f ".github/workflows/dependent_repos.env" ]] && source .github/workflows/dependent_repos.env
-          CLIENT_PAYLOAD=$(cat <<EOF
-          "{ "ref": "${{ github.event.client_payload.ref }}", "repo": "${GITHUB_REPOSITORY}" }"
-          EOF
-          )
-          for repo in $TEMPLATE_REPOS" $SAMPLES_REPOS"
-          do
-            sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY "$CLIENT_PAYLOAD"
-          done
-
-      - name: Trigger release repositories
-        if: github.event.client_payload.ref == 'refs/heads/master' || startsWith(github.event.client_payload.ref, 'refs/tags/v')
-        env:
-          GH_USERNAME: metanorma-ci
-          GH_ACCESS_TOKEN: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
-        run: |
-          curl -LO --retry 3 https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/trigger-gh-actions.sh
-          [[ -f ".github/workflows/dependent_repos.env" ]] && source .github/workflows/dependent_repos.env
-          CLIENT_PAYLOAD=$(cat <<EOF
-          "{ "ref": "${{ github.event.client_payload.ref }}", "repo": "${GITHUB_REPOSITORY}" }"
-          EOF
-          )
-          for repo in $DEPENDENT_REPOS
-          do
-            sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY "$CLIENT_PAYLOAD"
-          done

data/.github/workflows/rake.yml

@@ -1,15 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: rake
-
-on:
-  push:
-    branches: [ master, main ]
-    tags: [ v* ]
-  pull_request:
-
-jobs:
-  rake:
-    uses: metanorma/ci/.github/workflows/inkscape-rake.yml@main
-    secrets:
-      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}

data/.github/workflows/release.yml

@@ -1,27 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: release
-
-on:
-  workflow_dispatch:
-    inputs:
-      next_version:
-        description: |
-          Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
-        required: true
-        default: 'skip'
-  push:
-    tags: [ v* ]
-
-jobs:
-  release:
-    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/Rakefile

@@ -1,6 +0,0 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-task default: :spec

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "metanorma"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/bin/metanorma-pdf.js

@@ -1,39 +0,0 @@
-#!/usr/bin/env node
-'use strict';
-
-const puppeteer = require('puppeteer');
-
-const args = () => {
-  let args = ['--no-sandbox', '--disable-setuid-sandbox', '--headless'];
-  if (!process.platform.startsWith('win')) {
-    args << '--single-process';
-  }
-  return {args};
-}
-
-const createPdf = async() => {
-  let browser;
-  let exitCode = 0;
-  try {
-    browser = await puppeteer.launch(args());
-    const page = await browser.newPage();
-    await page.goto(process.argv[2], {
-      waitUntil: 'networkidle0',
-      timeout: 120000 //ms
-    });
-    await page.pdf({
-      path: process.argv[3],
-      format: 'A4'
-    });
-  } catch (err) {
-    console.error(err.message);
-    console.error(err.stack);
-    exitCode = 1;
-  } finally {
-    if (browser) {
-      browser.close();
-    }
-    process.exit(exitCode);
-  }
-};
-createPdf();

data/bin/rasterize.js

@@ -1,49 +0,0 @@
-"use strict";
-var page = require('webpage').create(),
-    system = require('system'),
-    address, output, size, pageWidth, pageHeight;
-
-if (system.args.length < 3 || system.args.length > 5) {
-    console.log('Usage: rasterize.js URL filename [paperwidth*paperheight|paperformat] [zoom]');
-    console.log('  paper (pdf output) examples: "5in*7.5in", "10cm*20cm", "A4", "Letter"');
-    console.log('  image (png/jpg output) examples: "1920px" entire page, window width 1920px');
-    console.log('                                   "800px*600px" window, clipped to 800x600');
-    phantom.exit(1);
-} else {
-    address = system.args[1];
-    output = system.args[2];
-    page.viewportSize = { width: 600, height: 600 };
-    if (system.args.length > 3 && system.args[2].substr(-4) === ".pdf") {
-        size = system.args[3].split('*');
-        page.paperSize = size.length === 2 ? { width: size[0], height: size[1], margin: '0px' }
-                                           : { format: system.args[3], orientation: 'portrait', margin: '1cm' };
-    } else if (system.args.length > 3 && system.args[3].substr(-2) === "px") {
-        size = system.args[3].split('*');
-        if (size.length === 2) {
-            pageWidth = parseInt(size[0], 10);
-            pageHeight = parseInt(size[1], 10);
-            page.viewportSize = { width: pageWidth, height: pageHeight };
-            page.clipRect = { top: 0, left: 0, width: pageWidth, height: pageHeight };
-        } else {
-            console.log("size:", system.args[3]);
-            pageWidth = parseInt(system.args[3], 10);
-            pageHeight = parseInt(pageWidth * 3/4, 10); // it's as good an assumption as any
-            console.log ("pageHeight:",pageHeight);
-            page.viewportSize = { width: pageWidth, height: pageHeight };
-        }
-    }
-    if (system.args.length > 4) {
-        page.zoomFactor = system.args[4];
-    }
-    page.open(address, function (status) {
-        if (status !== 'success') {
-            console.log('Unable to load the address!');
-            phantom.exit(1);
-        } else {
-            window.setTimeout(function () {
-                page.render(output);
-                phantom.exit();
-            }, 200);
-        }
-    });
-}

data/bin/rspec

@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application 'rspec' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-bundle_binstub = File.expand_path("../bundle", __FILE__)
-
-if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
-    load(bundle_binstub)
-  else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
-  end
-end
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("rspec-core", "rspec")

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here