metanorma-iho 0.4.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe0847c09cfdfde2e17055709884e36114585df1c82e72ca972959da5537b915
-  data.tar.gz: 61017f76453d1a730328e274a5f6b150c0761c69340cbd92244b2ce1fc01efba
+  metadata.gz: 4082060ac60fbd1e8eba4fcf79e0591b0e41b8efe8977c1ace2a00ed3c37d1e5
+  data.tar.gz: 58176a042041336c07803e46439ebc0ef095c84353db29847669aea5ceeeedb6
 SHA512:
-  metadata.gz: e4be9b3b344e0ea3c98bf779a1880770a97a5099c56857ecce0d2f55b05ad34d67288b092b71d10a25d520da7b6777bb41d648bb1fba6e2451ca34d15a66d34d
-  data.tar.gz: d67e94e5dc7b1460503b60da913339dd59e46b709917e97af3daa064b67ef21c586333f8860b36fcb15e2301a960bf44f86340c87c0effbe0c0a8685085fa37d
+  metadata.gz: '048b316ef1689e16aa924af0b3b868c725dc64c3d36142c74adecd5c01a4a8c696250d9fbe4f3dfdfc835bd3f8b8185a9d9c20aa5bb2bed4b23c51791dca4b19'
+  data.tar.gz: c55b5acea52a9d45aa69eb970ea689e8375b5241a4c05486d020e44628a4ae70b8e8ae9c09e96ab801078cb5925e6aabef7427ce442f603751fee092f456b27b

data/.github/workflows/rake.yml

@@ -10,34 +10,6 @@ on:
 
 jobs:
   rake:
-    name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '3.0', '2.7', '2.6', '2.5' ]
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
-        experimental: [ false ]
-    steps:
-      - uses: actions/checkout@master
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-
-      - uses: metanorma/metanorma-build-scripts/plantuml-setup-action@master
-
-      - run: bundle exec rake
-
-  tests-passed:
-    needs: rake
-    runs-on: ubuntu-latest
-    steps:
-      - uses: peter-evans/repository-dispatch@v1
-        with:
-          token: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
-          repository: ${{ github.repository }}
-          event-type: tests-passed
-          client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
+    uses: metanorma/metanorma-build-scripts/.github/workflows/generic-rake.yml@main
+    secrets:
+      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}

data/.gitignore

@@ -1 +1,12 @@
 .rubocop-https--*
+
+/.rspec_status
+/Gemfile.devel
+/Gemfile.lock
+/coverage/
+/test.doc
+/test.err
+/test.html
+/test.pdf
+/test.presentation.xml
+/test_*_htmlimages/

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "asciidoctor/rsd"
+require "metanorma/iho"
 
 # 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.

data/lib/isodoc/iho/base_convert.rb

@@ -27,7 +27,7 @@ module IsoDoc
           xml.span do |s|
             node&.children&.each { |x| parse(x, s) }
           end
-        end.join("")
+        end.join
       end
 
       def multiplenames_and(names)
@@ -56,13 +56,15 @@ module IsoDoc
       def inline_bibitem_ref_code(bib)
         id = bib.at(ns("./docidentifier[not(@type = 'DOI' or "\
                        "@type = 'metanorma' or @type = 'ISSN' or "\
-                       "@type = 'ISBN' or @type = 'rfc-anchor')]"))
-        id ||= bib.at(ns("./docidentifier[not(@type = 'metanorma')]"))
-        return [nil, id, nil] if id
+                       "@type = 'ISBN' or @type = 'rfc-anchor' or "\
+                       "@type = 'metanorma-ordinal')]"))
+        id ||= bib.at(ns("./docidentifier[not(@type = 'metanorma' or "\
+                         "@type = 'metanorma-ordinal')]"))
+        return [nil, id, nil, nil] if id
 
         id = Nokogiri::XML::Node.new("docidentifier", bib.document)
         id << "(NO ID)"
-        [nil, id, nil]
+        [nil, id, nil, nil]
       end
 
       def extract_edition(bib)
@@ -101,9 +103,9 @@ module IsoDoc
         c = p.at(ns("./completename")) and return c.text
         s = p&.at(ns("./surname"))&.text or return
         i = p.xpath(ns("./initial")) and
-          front = i.map { |e| e.text.gsub(/[^[:upper:]]/, "") }.join("")
+          front = i.map { |e| e.text.gsub(/[^[:upper:]]/, "") }.join
         i.empty? and f = p.xpath(ns("./forename")) and
-          front = f.map { |e| e.text[0].upcase }.join("")
+          front = f.map { |e| e.text[0].upcase }.join
         front ? "#{s} #{front}" : s
       end
 
@@ -117,10 +119,10 @@ module IsoDoc
           ftitle&.children&.each { |n| parse(n, out) }
         else
           id = render_identifier(inline_bibitem_ref_code(bib))
-          out << id[1] if id[1]
+          out << id[:sdo] if id[:sdo]
           ed = extract_edition(bib) if iho?(bib)
           out << " edition #{ed}" if ed
-          out << ": " if id[1] || ed
+          out << ": " if id[:sdo] || ed
           iso_title(bib)&.children&.each { |n| parse(n, out) }
           out << ", "
           author = extract_author(bib)