metanorma 0.3.18 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e21da3c608de6a3e0c7ee58193b6da323e99ac3d71c1ff55b26dc5c15e8e176c
-  data.tar.gz: 953981d803ee6b4a29af3ebae91641205d7af697b268ac9c9605b4e996b425fb
+  metadata.gz: 1d0a42d18ad2b95b3d714ad8564f52946bfc3f7aea5d92c0811145aaa73dbe02
+  data.tar.gz: 5f2eadd66a58d2d26a0ff281a67438030a41eb0a5bc0b6fe3c80f6731703b93f
 SHA512:
-  metadata.gz: 2ee31399c24eadc600bdb96a12143d1d007252b628c0f22baf8efac30b0a53ae07235c61a8198dec773d6b851381c87b06fc146377ca5a3babbf8417c91f5174
-  data.tar.gz: 007b54fefb79aeec05bcb455bf0d9f3578baa5c652d3a8cba380a0371d5f01b5e0f1a78475ff7b7627304e3f4af40d086ae529dff51a41392c46836d0953a787
+  metadata.gz: 6aee169581e757063339606669a64c7027e98fd6f817d9944f23b66dde5dba28050e1985cf8c98331be2a4438fe6f7bb7573a9ffa53bf526db2292817c64cc30
+  data.tar.gz: dd1bfa19872fea3ca3d61f462998f00d961de3dfc4f22f9893263f88a5dd18dbcb13518696c9514e200d8eac759bdcb461dcda637e0187b364208a0cca1124cd

data/.github/workflows/dependent_repos.env

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

data/.github/workflows/macos.yml

@@ -2,13 +2,18 @@
 # use ci-master https://github.com/metanorma/metanorma-build-scripts
 name: macos
 
-on: [push]
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ '**' ]
 
 jobs:
   test-macos:
     name: Test on Ruby ${{ matrix.ruby }} macOS
     runs-on: macos-latest
     strategy:
+      fail-fast: false
       matrix:
         ruby: [ '2.6', '2.5', '2.4' ]
     steps:
@@ -20,7 +25,7 @@ jobs:
           architecture: 'x64'
       - name: Update gems
         run: |
-          sudo gem install bundler -v "~> 2" --force
+          sudo gem install bundler --force
           bundle install --jobs 4 --retry 3
       - name: Use Node
         uses: actions/setup-node@v1

data/.github/workflows/ubuntu.yml

@@ -2,13 +2,17 @@
 # use ci-master https://github.com/metanorma/metanorma-build-scripts
 name: ubuntu
 
-on: [push]
+on:
+  push:
+    branches: [ master ]
+  pull_request:
 
 jobs:
   test-linux:
     name: Test on Ruby ${{ matrix.ruby }} Ubuntu
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         ruby: [ '2.6', '2.5', '2.4' ]
     steps:
@@ -20,7 +24,7 @@ jobs:
           architecture: 'x64'
       - name: Update gems
         run: |
-          gem install bundler -v "~> 2"
+          gem install bundler 
           bundle install --jobs 4 --retry 3
       - name: Use Node
         uses: actions/setup-node@v1
@@ -32,3 +36,15 @@ jobs:
       - name: Run specs
         run: |
           bundle exec rake
+      - name: Trigger dependent repositories
+        if: github.ref == 'refs/heads/master'
+        env:
+          GH_USERNAME: ${{ secrets.PAT_USERNAME }}
+          GH_ACCESS_TOKEN: ${{ secrets.PAT_TOKEN }}
+        run: |
+          curl -LO --retry 3 https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/trigger-gh-actions.sh
+          source .github/workflows/dependent_repos.env
+          for repo in $DEPENDENT_REPOS
+          do
+            sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY
+          done

data/.github/workflows/windows.yml

@@ -2,13 +2,18 @@
 # use ci-master https://github.com/metanorma/metanorma-build-scripts
 name: windows
 
-on: [push]
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ '**' ]
 
 jobs:
   test-windows:
     name: Test on Ruby ${{ matrix.ruby }} Windows
     runs-on: windows-latest
     strategy:
+      fail-fast: false
       matrix:
         ruby: [ '2.6', '2.5', '2.4' ]
     steps:
@@ -21,7 +26,7 @@ jobs:
       - name: Update gems
         shell: pwsh
         run: |
-          gem install bundler -v "~> 2"
+          gem install bundler 
           bundle config --local path vendor/bundle
           bundle update
           bundle install --jobs 4 --retry 3

data/lib/metanorma/compile.rb

@@ -28,8 +28,19 @@ module Metanorma
       end
     end
 
+    def xml_options_extract(file)
+      xml = Nokogiri::XML(file)
+      if xml.root
+        @registry.root_tags.each do |k, v|
+          return { type: k }  if v == xml.root.name
+        end
+      end
+      {}
+    end
+
     def options_extract(filename, options)
       o = Metanorma::Input::Asciidoc.new.extract_metanorma_options(File.read(filename, encoding: "utf-8"))
+      o = o.merge(xml_options_extract(File.read(filename, encoding: "utf-8")))
       options[:type] ||= o[:type]&.to_sym
       dir = filename.sub(%r(/[^/]+$), "/")
       options[:relaton] ||= "#{dir}/#{o[:relaton]}" if o[:relaton]

data/lib/metanorma/input/asciidoc.rb

@@ -1,3 +1,5 @@
+require "nokogiri"
+
 module Metanorma
   module Input
 

data/lib/metanorma/processor.rb

@@ -6,6 +6,7 @@ module Metanorma
 
     attr_reader :short
     attr_reader :input_format
+    attr_reader :asciidoctor_backend
 
     def initialize
       raise "This is an abstract class!"

data/lib/metanorma/registry.rb

@@ -44,5 +44,14 @@ module Metanorma
       end
     end
 
+    def root_tags
+      @processors.inject({}) do |acc, (k,v)|
+        if v.asciidoctor_backend
+          x = Asciidoctor.load nil, {backend: v.asciidoctor_backend}
+          acc[k] = x.converter.class::XML_ROOT_TAG
+        end
+        acc
+      end
+    end
   end
 end

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "0.3.18"
+  VERSION = "1.0.0"
 end

data/metanorma.gemspec

@@ -25,8 +25,8 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'asciidoctor'
   spec.add_runtime_dependency 'htmlentities'
+  spec.add_runtime_dependency 'nokogiri'
 
-  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "byebug", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 0.3.18
+  version: 1.0.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-19 00:00:00.000000000 Z
+date: 2020-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -146,6 +146,7 @@ extra_rdoc_files:
 - CHANGELOG.adoc
 - LICENSE.txt
 files:
+- ".github/workflows/dependent_repos.env"
 - ".github/workflows/macos.yml"
 - ".github/workflows/ubuntu.yml"
 - ".github/workflows/windows.yml"
@@ -156,7 +157,6 @@ files:
 - CHANGELOG.adoc
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.adoc
 - Rakefile

data/Gemfile.lock

@@ -1,167 +0,0 @@
-PATH
-  remote: .
-  specs:
-    metanorma (0.3.18)
-      asciidoctor
-      htmlentities
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    asciidoctor (2.0.10)
-    asciimath (1.0.9)
-    byebug (10.0.2)
-    cnccs (0.1.5)
-    concurrent-ruby (1.1.5)
-    diff-lcs (1.3)
-    equivalent-xml (0.6.0)
-      nokogiri (>= 1.4.3)
-    faraday (0.17.0)
-      multipart-post (>= 1.2, < 3)
-    ffi (1.11.2)
-    gb-agencies (0.0.6)
-    html2doc (0.9.2)
-      asciimath (~> 1.0.9)
-      htmlentities (~> 4.3.4)
-      image_size
-      mime-types
-      nokogiri (>= 1.10.4)
-      thread_safe
-      uuidtools
-    htmlentities (4.3.4)
-    iev (0.2.3)
-      nokogiri (>= 1.10.4)
-    image_size (2.0.2)
-    isodoc (1.0.8)
-      asciimath
-      html2doc (~> 0.9.0)
-      htmlentities (~> 4.3.4)
-      liquid
-      metanorma (~> 0.3.0)
-      nokogiri (>= 1.10.4)
-      rake (~> 12.0)
-      roman-numerals
-      sassc (~> 2.2.1)
-      thread_safe
-      uuidtools
-    isoics (0.1.8)
-    liquid (4.0.3)
-    metanorma-iso (1.3.8)
-      isodoc (~> 1.0.0)
-      metanorma-standoc (~> 1.3.0)
-      ruby-jing
-    metanorma-standoc (1.3.8)
-      asciidoctor (~> 2.0.0)
-      concurrent-ruby
-      html2doc (~> 0.9.0)
-      iev (~> 0.2.1)
-      isodoc (~> 1.0.0)
-      mimemagic
-      relaton (~> 0.5.0)
-      relaton-iev (~> 0.1.0)
-      ruby-jing
-      sterile (~> 1.0.14)
-      unicode2latex (~> 0.0.1)
-    mime-types (3.3)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
-    mimemagic (0.3.3)
-    mini_portile2 (2.4.0)
-    mixlib-shellout (2.4.4)
-    multipart-post (2.1.1)
-    nokogiri (1.10.5)
-      mini_portile2 (~> 2.4.0)
-    optout (0.0.2)
-    public_suffix (4.0.1)
-    rake (12.3.3)
-    relaton (0.5.14)
-      relaton-calconnect (~> 0.1.0)
-      relaton-gb (~> 0.6.0)
-      relaton-iec (~> 0.4.0)
-      relaton-ietf (~> 0.6.0)
-      relaton-iso (~> 0.6.0)
-      relaton-itu (~> 0.3.0)
-      relaton-nist (~> 0.3.0)
-      relaton-ogc (~> 0.1.0)
-    relaton-bib (0.3.12)
-      addressable
-      nokogiri
-    relaton-calconnect (0.1.0)
-      faraday
-      relaton-iso-bib (~> 0.3.0)
-    relaton-gb (0.6.7)
-      cnccs (~> 0.1.1)
-      gb-agencies (~> 0.0.1)
-      relaton-iso-bib (~> 0.3.0)
-    relaton-iec (0.4.10)
-      addressable
-      relaton-iso-bib (~> 0.3.0)
-    relaton-ietf (0.6.10)
-      relaton-bib (~> 0.3.0)
-    relaton-iev (0.1.1)
-      relaton (~> 0.5.0)
-    relaton-iso (0.6.9)
-      relaton-iec (~> 0.4.0)
-      relaton-iso-bib (~> 0.3.0)
-    relaton-iso-bib (0.3.12)
-      isoics (~> 0.1.6)
-      relaton-bib (~> 0.3.0)
-      ruby_deep_clone (~> 0.8.0)
-    relaton-itu (0.3.7)
-      relaton-iso-bib (~> 0.3.0)
-    relaton-nist (0.3.8)
-      relaton-bib (~> 0.3.0)
-      rubyzip
-    relaton-ogc (0.1.4)
-      faraday
-      relaton-iso-bib (~> 0.3.0)
-    roman-numerals (0.3.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-command (1.0.3)
-      mixlib-shellout (~> 2.0)
-      rspec (~> 3.2)
-      rspec-its (~> 1.2)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-its (1.3.0)
-      rspec-core (>= 3.0.0)
-      rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.9.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
-    ruby-jing (0.0.1)
-      optout (>= 0.0.2)
-    ruby_deep_clone (0.8.0)
-    rubyzip (2.0.0)
-    sassc (2.2.1)
-      ffi (~> 1.9)
-    sterile (1.0.14)
-      nokogiri
-    thread_safe (0.3.6)
-    unicode2latex (0.0.3)
-    uuidtools (2.1.5)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 2.0)
-  byebug (~> 10.0)
-  equivalent-xml (~> 0.6)
-  metanorma!
-  metanorma-iso (~> 1.3)
-  rake (~> 12.0)
-  rspec (~> 3.0)
-  rspec-command (~> 1.0)
-
-BUNDLED WITH
-   2.0.2