metanorma 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb71b62025d938d52251d5bfb6d1911b3de32299500e12b8fa414a63520a86c3
-  data.tar.gz: df9deea25ea6e374426ad40b3146c63610251873ec652142acffc9274af5856c
+  metadata.gz: 189106fda9c97a62268cdf23a26f7b10f9784cff4d9cdf590563c0f9e71aaea5
+  data.tar.gz: feec6fdbfbcdb931b3ca3ce782d9ba35248481902e66ca515b94f60346217dfe
 SHA512:
-  metadata.gz: 6404a68d6371fb24f27e36cc69dc0479da638ec79ef3bb48edf1939d6ec3beffb36c5b86f1402bc238a01ed05481dac255a30ac043cf8a806b24d464e5a16592
-  data.tar.gz: 1881fb5c6c4e3c1d6239b1a4c34dca109f4bc489d33942d42c8e09c9177aef29ce557219aeff7656458bd6e2de918859155728b908ba64c7d6c68c8f1bbdb942
+  metadata.gz: e6843c3813d6d378a320ccdec21e85174889a0634396a0e1e15eeaf82192bf80414a8e698a7818cfebc575a3925e46007c6a006964179979682e51ea49a173b5
+  data.tar.gz: 972d7e156885833eab9f91e142dd427dea72093d0a7eee665b5229e6e1dbd41bed117c8e72a09d6be9b6f2360c11eec3fa70eb0eb84807f5656bc08b496f56fc

data/.github/workflows/notify.yml

@@ -0,0 +1,47 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
+name: notify
+
+on:
+  push:
+    branches: [ master ]
+    tags:
+      - '*'
+
+jobs:
+  notify:
+    name: Notify dependent repos
+    runs-on: ubuntu-latest
+    steps:
+      - 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_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.ref == 'refs/heads/master' || startsWith(github.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_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

@@ -0,0 +1,44 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
+name: rake
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+
+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: [ '2.6', '2.5', '2.4' ]
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+        experimental: [ false ]
+        include:
+          - ruby: '2.7'
+            os: 'ubuntu-latest'
+            experimental: true
+          - ruby: '2.7'
+            os: 'windows-latest'
+            experimental: true
+          - ruby: '2.7'
+            os: 'macos-latest'
+            experimental: true
+    steps:
+      - uses: actions/checkout@master
+
+      - name: Use Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Update gems
+        run: bundle install --jobs 4 --retry 3
+
+      - name: Run specs
+        run: bundle exec rake

data/lib/metanorma/collection.rb

@@ -12,10 +12,10 @@ module Metanorma
 
     # @return [Array<String>] documents-inline to inject the XML into
     #   the collection manifest; documents-external to keeps them outside
-    attr_reader :directives
+    attr_accessor :directives
 
     # @return [Hash<String, Metanorma::Document>]
-    attr_reader :documents
+    attr_accessor :documents
 
     # @param file [String] path to source file
     # @param directives [Array<String>] documents-inline to inject the XML into
@@ -47,7 +47,7 @@ module Metanorma
       Nokogiri::XML::Builder.new do |xml|
         xml.send("metanorma-collection",
                  "xmlns" => "http://metanorma.org") do |mc|
-          @bibdata.to_xml mc, bibdata: true, date_format: :full
+          mc << @bibdata.to_xml(bibdata: true, date_format: :full)
           @manifest.to_xml mc
           content_to_xml "prefatory", mc
           doccontainer mc

data/lib/metanorma/collection_renderer.rb

@@ -49,9 +49,32 @@ module Metanorma
       folder = File.dirname col.file
       cr = new(col.to_xml, folder, options)
       cr.files
+      cr.concatenate(col, options)
       cr.coverpage if options[:format]&.include?(:html)
     end
 
+    def concatenate(col, options)
+      options[:format] << :presentation if options[:format].include?(:pdf)
+      options[:format].uniq.each do |e|
+        next unless %i(presentation xml).include?(e)
+        ext = e == :presentation ? "presentation.xml" : e.to_s
+        out = col.clone
+        out.directives << "documents-inline"
+        out.documents.keys.each do |id|
+          filename = @files[id][:outputs][e]
+          out.documents[id] = Metanorma::Document.raw_file(filename)
+        end
+        File.open(File.join(@outdir, "collection.#{ext}"), "w:UTF-8") { |f| f.write(out.to_xml) }
+      end
+      options[:format].include?(:pdf) and
+        pdfconv.convert(File.join(@outdir, "collection.presentation.xml"))
+    end
+
+    def pdfconv
+      x = Asciidoctor.load nil, backend: @doctype.to_sym
+      x.converter.pdf_converter(Dummy.new)
+    end
+
     # Dummy class
     class Dummy
       def attr(_xyz); end
@@ -220,7 +243,7 @@ module Metanorma
       docid = bib&.at(ns("./docidentifier"))&.text
       unless @files[docid]
         warn "Cannot find crossreference to document #{docid} in document "\
-        "#{identifier}!"
+          "#{identifier}!"
         abort
       end
       id = bib["id"]
@@ -288,9 +311,12 @@ module Metanorma
           # warn "metanorma compile -x html #{f.path}"
           c = Compile.new
           c.compile f.path, format: :asciidoc, extension_keys: @format
-          @format.each do |ext|
+          @files[identifier][:outputs] = {}
+          @format.each do |e|
+            ext = c.processor.output_formats[e]
             fn = File.basename(filename).sub(/(?<=\.)[^\.]+$/, ext.to_s)
             FileUtils.mv f.path.sub(/\.xml$/, ".#{ext}"), File.join(@outdir, fn)
+            @files[identifier][:outputs][e] = File.join(@outdir, fn)
           end
         end
       end

data/lib/metanorma/compile.rb

@@ -5,7 +5,7 @@ require "htmlentities"
 module Metanorma
   class Compile
     # @return [Array<String>]
-    attr_reader :errors
+    attr_reader :errors, :processor
 
     def initialize
       @registry = Metanorma::Registry.instance

data/lib/metanorma/document.rb

@@ -4,9 +4,10 @@ module Metanorma
     attr_reader :file
 
     # @param bibitem [RelatonBib::BibliographicItem]
-    def initialize(bibitem, file)
+    def initialize(bibitem, file, options = {})
       @bibitem = bibitem
       @file = file
+      @raw = options[:raw]
     end
 
     class << self
@@ -22,6 +23,12 @@ module Metanorma
         new from_xml(xml)
       end
 
+      # raw XML file, can be used to put in entire file instead of just bibitem
+      def raw_file(filename)
+        doc = Nokogiri::XML(File.read(filename, encoding: "UTF-8"))
+        new(doc, filename, raw: true)
+      end
+
       private
 
       # #param xml [Nokogiri::XML::Document, Nokogiri::XML::Element]
@@ -47,7 +54,7 @@ module Metanorma
         when :xml
           from_xml Nokogiri::XML(File.read(file, encoding: "UTF-8"))
         when :yaml
-          yaml = File.read(file, ecoding: "UTF-8")
+          yaml = File.read(file, encoding: "UTF-8")
           Relaton::Cli::YAMLConvertor.convert_single_file(yaml)
         end
       end
@@ -68,15 +75,19 @@ module Metanorma
 
     # @return [String]
     def type
-      @type ||= (@bibitem.docidentifier.first&.type ||
-        @bibitem.docidentifier.first&.id&.match(/^[^\s]+/)&.to_s)&.downcase ||
-        "standoc"
+      @type ||= (@bibitem.docidentifier.first&.type&.downcase ||
+                 @bibitem.docidentifier.first&.id&.match(/^[^\s]+/)&.to_s)&.downcase ||
+      "standoc"
     end
 
     private
 
     def render_xml(builder)
-      builder.send(type + "-standard") { |b| @bibitem.to_xml b, bibdata: true }
+      if @raw
+        builder << @bibitem.root.to_xml
+      else
+        builder.send(type + "-standard") { |b| b << @bibitem.to_xml(bibdata: true) }
+      end
     end
   end
 end

data/lib/metanorma/input/asciidoc.rb

@@ -7,8 +7,7 @@ module Metanorma
 
       def process(file, filename, type, options = {})
         require "asciidoctor"
-        ::Asciidoctor.convert(
-          file,
+        out_opts = {
           to_file: false,
           safe: :safe,
           backend: type,
@@ -16,8 +15,28 @@ module Metanorma
           attributes: [
             "nodoc", "stem", "xrefstyle=short", "docfile=#{filename}",
             "output_dir=#{options[:"output-dir"]}"
-          ],
-        )
+          ]
+        }
+        unless asciidoctor_validate(file, filename, out_opts)
+          warn "Cannot continue compiling Asciidoctor document"
+          abort
+        end
+        ::Asciidoctor.convert(file, out_opts)
+      end
+
+      def asciidoctor_validate(file, filename, options)
+        err = nil
+        begin
+          previous_stderr, $stderr = $stderr, StringIO.new
+          ::Asciidoctor.load(file, options)
+          %r{(\n|^)asciidoctor: ERROR: ['"]?#{Regexp.escape(filename || 
+            "<empty>")}['"]?: line \d+: include file not found: }.match($stderr.string) and
+              err = $stderr.string
+        ensure
+          $stderr = previous_stderr
+        end
+        warn err unless err.nil?
+        err.nil?
       end
 
       def extract_metanorma_options(file)

data/lib/metanorma/output/xslfo.rb

@@ -4,10 +4,10 @@ require_relative "./utils.rb"
 module Metanorma
   module Output
     class XslfoPdf < Base
-      def convert(url_path, output_path, xsl_stylesheet)
+      def convert(url_path, output_path, xsl_stylesheet, options = "")
         return if url_path.nil? || output_path.nil? || xsl_stylesheet.nil?
 
-        Mn2pdf.convert(quote(url_path), quote(output_path), quote(xsl_stylesheet))
+        Mn2pdf.convert(quote(url_path), quote(output_path), quote(xsl_stylesheet), options)
       end
 
       def quote(x)

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "1.1.3"
+  VERSION = "1.2.0"
 end

data/metanorma.gemspec

@@ -27,13 +27,16 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'htmlentities'
   spec.add_runtime_dependency 'nokogiri'
   spec.add_runtime_dependency 'mn2pdf', "~> 1"
-  spec.add_dependency "relaton-cli", "~> 1.2.0"
+# get relaton-cli to avoic circular reference with metanorma-standoc
+  #spec.add_dependency "relaton-cli"
+  #spec.add_dependency "metanorma-standoc", "~> 1.5.3"
 
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "byebug", "~> 10.0"
   spec.add_development_dependency "rspec-command", "~> 1.0"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
-  spec.add_development_dependency "metanorma-iso", "~> 1.5"
-  spec.add_development_dependency "isodoc", "~> 1.2.1"
+  spec.add_development_dependency "metanorma-iso", "~> 1.5.8"
+  spec.add_development_dependency "sassc", "~> 2.4.0"
+  #spec.add_development_dependency "isodoc", "~> 1.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-14 00:00:00.000000000 Z
+date: 2020-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
-- !ruby/object:Gem::Dependency
-  name: relaton-cli
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -156,28 +142,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.5.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.5.8
 - !ruby/object:Gem::Dependency
-  name: isodoc
+  name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 2.4.0
 description: Library to process any Metanorma standard.
 email:
 - open.source@ribose.com
@@ -189,9 +175,8 @@ extra_rdoc_files:
 - LICENSE.txt
 files:
 - ".github/workflows/dependent_repos.env"
-- ".github/workflows/macos.yml"
-- ".github/workflows/ubuntu.yml"
-- ".github/workflows/windows.yml"
+- ".github/workflows/notify.yml"
+- ".github/workflows/rake.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rspec"

data/.github/workflows/macos.yml

@@ -1,38 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: macos
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    paths-ignore:
-      - .github/workflows/ubuntu.yml
-      - .github/workflows/windows.yml
-
-jobs:
-  test-macos:
-    name: Test on Ruby ${{ matrix.ruby }} macOS
-    runs-on: macos-latest
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-        experimental: [false]
-        include:
-          - ruby: '2.7'
-            experimental: true
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Update gems
-        run: |
-          sudo gem install bundler --force
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          bundle exec rake

data/.github/workflows/ubuntu.yml

@@ -1,56 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: ubuntu
-
-on:
-  push:
-    branches: [ master ]
-    tags:
-      - '*'
-  pull_request:
-    paths-ignore:
-      - .github/workflows/macos.yml
-      - .github/workflows/windows.yml
-
-jobs:
-  test-linux:
-    name: Test on Ruby ${{ matrix.ruby }} Ubuntu
-    runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-        experimental: [false]
-        include:
-          - ruby: '2.7'
-            experimental: true
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Update gems
-        run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          bundle exec rake
-      - name: Trigger repositories
-        if: matrix.ruby == '2.6'
-        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_REF}", "repo": "${GITHUB_REPOSITORY}" }"
-          EOF
-          )
-          for repo in $REPOS
-          do
-            sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY "$CLIENT_PAYLOAD"
-          done

data/.github/workflows/windows.yml

@@ -1,40 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: windows
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    paths-ignore:
-      - .github/workflows/macos.yml
-      - .github/workflows/ubuntu.yml
-
-jobs:
-  test-windows:
-    name: Test on Ruby ${{ matrix.ruby }} Windows
-    runs-on: windows-latest
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-        experimental: [false]
-        include:
-          - ruby: '2.7'
-            experimental: true
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Update gems
-        shell: pwsh
-        run: |
-          gem install bundler
-          bundle config --local path vendor/bundle
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          bundle exec rake