metanorma 1.0.1 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b847f719ea09aa03edc9b67fc73f955c682bbff4690c0d5cea06561f7fbc478
-  data.tar.gz: c545afe2938e475a9360d5ae5bd1031920de4c279edf1d1860b83ee287367faf
+  metadata.gz: 0b51503237da3dfd54719591c47f599bca877d414528c4cf9a69abdb19aec9e9
+  data.tar.gz: 1588206551663889040f94194789cee7f2fb9b095775591a08f7b613ce59fbfe
 SHA512:
-  metadata.gz: 98b3f3268ce2ac4f60d71ecff97abe398e4c49ad84ff2d8759c486a3b87788c556e23b10454b9c67b352b8a86418587c969290072ee42d131d0449af030b3466
-  data.tar.gz: 3f3cf0eb527bf6d2b7db8438d01206961e57bdb2e7249d43537dd635c4bbac3e293b50fd5dcf7f3c069c542c454aa3b2356021aafeecd5ae0fb6c8cf3b198f4f
+  metadata.gz: 6f7dd77c9a6bf129594e3bfdabc1626bcb4c58a9b68454b09e1d216f7c9e43d4ebce62ce980ed762e0ad3e9f5c3c3456b9473fe7b1670e13bdc7c2d286edc1ec
+  data.tar.gz: 9c4125021226bdd561436e37e2fbacd4bd3c3bfa48845607282dd7ce3b4789e218e2aaa835364de7268c684bbf667e5267a6224db5a4c268fce180136b835391

data/.github/workflows/macos.yml

@@ -6,15 +6,23 @@ 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
@@ -29,10 +37,10 @@ jobs:
       - name: Use Node
         uses: actions/setup-node@v1
         with:
-          node-version: '8'
+          node-version: '12'
       - name: Install Puppeteer
         run: |
-          npm install -g puppeteer
+          npm install -g puppeteer@3.0.1
       - name: Run specs
         run: |
           bundle exec rake

data/.github/workflows/ubuntu.yml

@@ -6,15 +6,23 @@ on:
   push:
     branches: [ master ]
   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
@@ -29,15 +37,17 @@ jobs:
       - name: Use Node
         uses: actions/setup-node@v1
         with:
-          node-version: '8'
+          node-version: '12'
       - name: Install Puppeteer
         run: |
-          npm install -g puppeteer
+          sudo apt-get update
+          sudo apt-get install libgbm1
+          npm install -g puppeteer@3.0.1
       - name: Run specs
         run: |
           bundle exec rake
       - name: Trigger dependent repositories
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/master' && matrix.ruby == '2.6'
         env:
           GH_USERNAME: ${{ secrets.PAT_USERNAME }}
           GH_ACCESS_TOKEN: ${{ secrets.PAT_TOKEN }}

data/.github/workflows/windows.yml

@@ -6,15 +6,23 @@ 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
@@ -31,10 +39,10 @@ jobs:
       - name: Use Node
         uses: actions/setup-node@v1
         with:
-          node-version: '8'
+          node-version: '12'
       - name: Install Puppeteer
         run: |
-          npm install -g puppeteer
+          npm install -g puppeteer@3.0.1
       - name: Run specs
         run: |
           bundle exec rake

data/lib/metanorma/compile.rb

@@ -9,9 +9,9 @@ module Metanorma
     end
 
     def compile(filename, options = {})
+      require_libraries(options)
       options = options_extract(filename, options)
       validate(options) or return nil
-      require_libraries(options)
       @processor = @registry.find_processor(options[:type].to_sym)
       extensions = get_extensions(options) or return nil
       (file, isodoc = process_input(filename, options)) or return nil
@@ -103,7 +103,7 @@ module Metanorma
     def process_input(filename, options)
       case extname = File.extname(filename)
       when ".adoc"
-        Util.log("[metanorma] Processing: Asciidoctor input.", :info)
+        Util.log("[metanorma] Processing: AsciiDoc input.", :info)
         file = read_file(filename)
         options[:asciimath] and
           file.sub!(/^(=[^\n]+\n)/, "\\1:mn-keep-asciimath:\n")
@@ -205,7 +205,11 @@ module Metanorma
           options[:relaton] = outfilename
           relaton_export(isodoc, options)
         else
+          begin
           @processor.output(isodoc, outfilename, ext, isodoc_options)
+          rescue StandardError => e  
+            puts e.message
+          end
         end
         if options[:wrapper] and /html$/.match file_extension
           outfilename = outfilename.sub(/\.html$/, "")

data/lib/metanorma/input/asciidoc.rb

@@ -34,6 +34,10 @@ module Metanorma
         }.reject { |_, val| val.nil? }
       end
 
+      def empty_attr(attr, name)
+        attr&.sub(/^#{name}:\s*$/, "#{name}: true")&.sub(/^#{name}:\s+/, "")
+      end
+
       def extract_options(file)
         headerextract = file.sub(/\n\n.*$/m, "\n")
 
@@ -58,7 +62,16 @@ module Metanorma
         /\n:data-uri-image: (?<datauriimage>[^\n]+)\n/ =~ headerextract
         /\n:htmltoclevels: (?<htmltoclevels>[^\n]+)\n/ =~ headerextract
         /\n:doctoclevels: (?<doctoclevels>[^\n]+)\n/ =~ headerextract
-        /\n:hierarchical-assets: (?<hierarchical_assets>[^\n]+)\n/ =~ headerextract
+        /\n:(?<hierarchical_assets>hierarchical-assets:[^\n]*)\n/ =~ headerextract
+        /\n:(?<use_xinclude>use-xinclude:[^\n]*)\n/ =~ headerextract
+        /\n:(?<break_up_urls_in_tables>break-up-urls-in-tables:[^\n]*)\n/ =~ headerextract
+
+        defined?(hierarchical_assets) and
+          hierarchical_assets = empty_attr(hierarchical_assets, "hierarchical-assets")
+        defined?(use_xinclude) and
+          use_xinclude = empty_attr(use_xinclude, "use-xinclude")
+        defined?(break_up_urls_in_tables) and
+          break_up_urls_in_tables = empty_attr(break_up_urls_in_tables, "break-up-urls-in-tables")
         {
           script: defined?(script) ? script : nil,
           bodyfont: defined?(bodyfont) ? bodyfont : nil,
@@ -82,6 +95,8 @@ module Metanorma
           htmltoclevels: defined?(htmltoclevels) ? htmltoclevels : nil,
           doctoclevels: defined?(doctoclevels) ? doctoclevels : nil,
           hierarchical_assets: defined?(hierarchical_assets) ? hierarchical_assets : nil,
+          use_xinclude: defined?(use_xinclude) ? use_xinclude : nil,
+          break_up_urls_in_tables: defined?(break_up_urls_in_tables) ? break_up_urls_in_tables : nil,
         }.reject { |_, val| val.nil? }
       end
 

data/lib/metanorma/output.rb

@@ -1,5 +1,6 @@
 require_relative "./output/base"
 require_relative "./output/pdf"
+require_relative "./output/xslfo"
 
 module Metanorma
   module Output

data/lib/metanorma/output/pdf.rb

@@ -1,4 +1,5 @@
 require "open3"
+require_relative "./utils.rb"
 require "pathname"
 require "shellwords"
 
@@ -7,9 +8,7 @@ module Metanorma
     class Pdf < Base
 
       def convert(url_path, output_path)
-        file_url = url_path
-        file_url = "file://#{url_path}" if Pathname.new(file_url).absolute?
-        file_url = "file://#{Dir.pwd}/#{url_path}" unless %r{^file://} =~ file_url
+        file_url = Utils::file_path(url_path)
         pdfjs = File.join(File.dirname(__FILE__), "../../../bin/metanorma-pdf.js")
 
         node_path = ENV["NODE_PATH"] || `npm root --quiet -g`.strip

data/lib/metanorma/output/utils.rb

@@ -0,0 +1,16 @@
+require "pathname"
+
+module Metanorma
+  module Output
+    module Utils
+      class << self
+        def file_path(url_path)
+          file_url = url_path
+          file_url = "file://#{url_path}" if Pathname.new(file_url).absolute?
+          file_url = "file://#{Dir.pwd}/#{url_path}" unless %r{^file://} =~ file_url
+          file_url
+        end
+      end
+    end
+  end
+end

data/lib/metanorma/output/xslfo.rb

@@ -0,0 +1,15 @@
+require 'mn2pdf'
+require_relative "./utils.rb"
+
+module Metanorma
+  module Output
+    class XslfoPdf < Base
+      def convert(url_path, output_path, xsl_stylesheet)
+        return if url_path.nil? || output_path.nil? || xsl_stylesheet.nil?
+
+        Mn2pdf.convert(url_path, output_path, xsl_stylesheet)
+      end
+    end
+  end
+end
+

data/lib/metanorma/registry.rb

@@ -48,7 +48,7 @@ module Metanorma
       @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
+          acc[k] = x.converter.xml_root_tag
         end
         acc
       end

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "1.0.1"
+  VERSION = "1.0.6"
 end

data/metanorma.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'asciidoctor'
   spec.add_runtime_dependency 'htmlentities'
   spec.add_runtime_dependency 'nokogiri'
+  spec.add_runtime_dependency 'mn2pdf', "~> 1"
 
   spec.add_development_dependency "rake", "~> 12.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.0.1
+  version: 1.0.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-03 00:00:00.000000000 Z
+date: 2020-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mn2pdf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -177,6 +191,8 @@ files:
 - lib/metanorma/output.rb
 - lib/metanorma/output/base.rb
 - lib/metanorma/output/pdf.rb
+- lib/metanorma/output/utils.rb
+- lib/metanorma/output/xslfo.rb
 - lib/metanorma/processor.rb
 - lib/metanorma/registry.rb
 - lib/metanorma/util.rb