metanorma 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5afd8795a47a00890fd05c762db66dfdb4803e8a3e7279b5c25fc579094a4824
-  data.tar.gz: 21af01a41736b2c7b8a521d9489323c3a4ef2273670546acd898d9820445eaf0
+  metadata.gz: 17965bd6b4a4f5f6bc620947633b3286e938812e0fab3a8e71b92eb8651120a8
+  data.tar.gz: ea9f2b8b5db24dff0c95351747daf35d3de9c7dbe010657e2bc5eae655fc1c78
 SHA512:
-  metadata.gz: 0715b1527df4e4e3169f176c9301a1c6cec2fe0a72a46c61613d45addc11186d81a8f2400c65aa395e01721870f94e081706a935480d5e87c638e10f484afd70
-  data.tar.gz: d47bdf3f165768070fd249fa7f1bbb5e6f65305c345f4848ba7dd03820ae1729f3dde273986cd5d5e03c1f218f73da444387b19705399d50805b300d43991829
+  metadata.gz: 9afa1bd9a2b75a8d7fc409899220b7a3460fabfebd739aa0263f557d55d93f27deb8dc1bd96fa4d6f57b23a9200510e239f2c33b79678d48e5b9eab41e783f7c
+  data.tar.gz: 7e787898c91da56beb6da5fa575c1e0b2c988265e88d42f835a5b281f0894f3dfa83f42c0c5011a6436b6bc0b9ef169ef9906bfdb88896da3426ebd2b3cc5c54

data/.github/workflows/macos.yml

@@ -29,10 +29,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.0
       - name: Run specs
         run: |
           bundle exec rake

data/.github/workflows/ubuntu.yml

@@ -29,10 +29,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.0
       - name: Run specs
         run: |
           bundle exec rake

data/.github/workflows/windows.yml

@@ -31,10 +31,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.0
       - name: Run specs
         run: |
           bundle exec rake

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,19 @@
+require "open3"
+require "tempfile"
+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?
+        pdfjar = File.join(File.dirname(__FILE__), "../../../bin/mn2pdf.jar")
+        cmd = ["java", "-jar", pdfjar, "--xml-file", url_path, "--xsl-file",
+               xsl_stylesheet, "--pdf-file", output_path].join(" ")
+        _, error_str, status = Open3.capture3(cmd)
+        raise error_str unless status.success?
+      end
+    end
+  end
+end
+

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-17 00:00:00.000000000 Z
+date: 2020-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -162,6 +162,7 @@ files:
 - Rakefile
 - bin/console
 - bin/metanorma-pdf.js
+- bin/mn2pdf.jar
 - bin/rasterize.js
 - bin/rspec
 - bin/setup
@@ -177,6 +178,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