mn2pdf 1.35 → 1.41.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9da4d3e27d47a7c3481099c318bbcd84f2cddf6f99fe20c780a2dce5cc7cfbf8
-  data.tar.gz: 5016a600084d804e9af4eab8963eadec037618e735775fd71834cab7a28ec7d0
+  metadata.gz: 0f6b75a4c0cb45a4c674233bd1375d83636d08428d0a85dfa7c4b49cd84f0a96
+  data.tar.gz: 26caeb9c3f8a3f7ad24c565e9515aad2701e248dc2a97efab5e139f5adb3c1a3
 SHA512:
-  metadata.gz: 7144cda257263609b1b6af00fef463efc246b31cfc3616a5725a1fb822e6db38d7d8c1bf4fb7692f5da96bacd6317f4e0ce79c07f7571cbc20936f6fcbaaddae
-  data.tar.gz: ec963f56db73727fec464af90be84e61db929410239cb3bb2b6fde0a874f57528ee0f8a96d91bef8861f71772f3962305ab71d78e568ce033a294b0b2daefce2
+  metadata.gz: 15b8bfc72495756a092fe272037a1bbe988054fcde62e7398694e0c04d664f6c949416274496f7970b199ebdc4c047d8c443f635d4ccbdb26a92385373283082
+  data.tar.gz: 95073bc9550325ac5435e71c21249a992ffdcb74118f87631c81c84086809c08a481484e3089405439cf85403c0b4455d8d82c95ffcbba6a15d060b3738e7572

data/.github/workflows/rake.yml

@@ -10,23 +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@v2
-        with:
-          submodules: true
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-
-      - run: bundle exec rake
+    uses: metanorma/metanorma-build-scripts/.github/workflows/generic-rake.yml@main
+    secrets:
+      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}

data/.github/workflows/release.yml

@@ -4,28 +4,38 @@ on:
   push:
     tags:
       - '*'
+  workflow_dispatch:
+    inputs:
+      next_version:
+        description: |
+          Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
+        required: true
+        default: 'skip'
 
 jobs:
   release:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v1
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
+
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: '2.6'
-          architecture: 'x64'
-      - name: Update gems
-        run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3
-      - name: Update mn2pdf.jar
-        run: |
-          rm -f bin/mn2pdf.jar
-          rake bin/mn2pdf.jar
-      - name: Run specs
-        run: |
-          bundle exec rake
+          bundler-cache: true
+
+      - run: rm -f bin/mn2pdf.jar && bundle exec rake bin/mn2pdf.jar
+
+      - run: bundle exec rake
+
+      - run: gem install gem-release
+
+      - run: |
+          git config user.name github-actions
+          git config user.email github-actions@github.com
+
+      - if: github.event_name == 'workflow_dispatch' && github.event.inputs.next_version != 'skip'
+        run: gem bump --version ${{ github.event.inputs.next_version }} --tag --push
+
       - name: Publish to rubygems.org
         env:
           RUBYGEMS_API_KEY: ${{secrets.METANORMA_CI_RUBYGEMS_API_KEY}}

data/Rakefile

@@ -9,7 +9,7 @@ task :default => :spec
 require 'open-uri'
 
 file 'bin/mn2pdf.jar' do |file|
-  ver = Mn2pdf::VERSION
+  ver = Mn2pdf::MN2PDF_JAR_VERSION
   url = "https://github.com/metanorma/mn2pdf/releases/download/v#{ver}/mn2pdf-#{ver}.jar"
   File.open(file.name, 'wb') do |file|
     file.write open(url).read

data/lib/mn2pdf/version.rb

@@ -1,3 +1,4 @@
 module Mn2pdf
-  VERSION = "1.35".freeze
+  VERSION = "1.41.1".freeze
+  MN2PDF_JAR_VERSION = "1.41".freeze
 end

data/lib/mn2pdf.rb

@@ -1,12 +1,15 @@
 require "open3"
 require "rbconfig"
-require "mn2pdf/version"
+require "tempfile"
+require "yaml"
 
 module Mn2pdf
   MN2PDF_JAR_PATH = File.join(File.dirname(__FILE__), "../bin/mn2pdf.jar")
+  DEFAULT_JAVA_OPTS = ["-Xss5m", "-Xmx2048m"].freeze
+  FONTS_MANIFEST = :font_manifest
 
   def self.jvm_options
-    options = []
+    options = DEFAULT_JAVA_OPTS.dup
 
     if RbConfig::CONFIG["host_os"].match?(/darwin|mac os/)
       options << "-Dapple.awt.UIElement=true"
@@ -17,8 +20,9 @@ module Mn2pdf
 
   def self.help
     cmd = ["java", *jvm_options, "-jar", MN2PDF_JAR_PATH].join(" ")
-    message, = Open3.capture3(cmd)
-    message
+    # help message goes to STDERR (from mn2pdf v1.36)
+    _, help_message, = Open3.capture3(cmd)
+    help_message
   end
 
   def self.version
@@ -27,22 +31,73 @@ module Mn2pdf
     message.strip
   end
 
-  def self.convert(url_path, output_path, xsl_stylesheet, options = "")
-    return if url_path.nil? || output_path.nil? || xsl_stylesheet.nil?
+  def self.convert(url_path, output_path, xsl_stylesheet, options = {})
+    cmd = build_cmd(url_path, output_path, xsl_stylesheet)
+
+    return unless cmd
+
+    case options
+    when String
+      cmd << options
+
+      mn2pdf(cmd)
+    when Hash
+      manifest = options.delete(FONTS_MANIFEST)
+
+      options.each do |k, v|
+        sep = k.to_s.end_with?("=") ? "" : " "
+        cmd << "#{k}#{sep}#{quote(v)}"
+      end
+      if manifest
+        dump_fontist_manifest_locations(manifest) do |manifest_path|
+          cmd << "--font-manifest" << quote(manifest_path)
+          mn2pdf(cmd)
+        end
+      else
+        mn2pdf(cmd)
+      end
+    else
+      warn "Unsupported options type #{options.class}"
+    end
+  end
+
+  def self.build_cmd(url, output, xslt)
+    return if url.nil? || output.nil? || xslt.nil?
 
-    cmd = ["java", "-Xss5m", "-Xmx2048m", *jvm_options,
-           "-jar", MN2PDF_JAR_PATH, "--xml-file", url_path,
-           "--xsl-file", xsl_stylesheet, "--pdf-file", output_path, options].join(" ")
+    ["java", *jvm_options,
+     "-jar", MN2PDF_JAR_PATH,
+     "--xml-file", quote(url),
+     "--xsl-file", quote(xslt),
+     "--pdf-file", quote(output)]
+  end
 
+  def self.mn2pdf(cmd)
+    cmd = cmd.join(" ")
     puts cmd
-    stdout_str, error_str, status = Open3.capture3(cmd)
+    out, err, status = Open3.capture3(cmd)
 
-    raise prepare_error_msg(stdout_str, error_str) unless status.success?
+    raise prepare_error_msg(out, err) unless status.success?
   end
 
-  def self.prepare_error_msg(stdout_str, error_str)
+  def self.prepare_error_msg(stdout, stderr)
     # Strip default mn2pdf message
-    stdout_str = stdout_str.gsub("Preparing...", "").strip
-    ["[mn2pdf] Fatal:", stdout_str, error_str].join(" ").strip
+    stdout = stdout.gsub("Preparing...", "").strip
+    ["[mn2pdf] Fatal:", stdout, stderr].join(" ").strip
+  end
+
+  def self.quote(str)
+    return "" if str.nil? || str.empty?
+    return str if /^'.*'$/.match(str) || /^".*"$/.match(str)
+
+    %("#{str}")
+  end
+
+  def self.dump_fontist_manifest_locations(manifest)
+    Tempfile.create(["fontist_locations", ".yml"]) do |f|
+      f.write manifest.to_yaml
+      f.flush
+
+      yield f.path
+    end
   end
 end

data/mn2pdf.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.files         = `git ls-files`.split("\n")
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mn2pdf
 version: !ruby/object:Gem::Version
-  version: '1.35'
+  version: 1.41.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-03 00:00:00.000000000 Z
+date: 2022-02-11 00:00:00.000000000 Z
 dependencies: []
 description: |
   mn2pdf converts Metanorma XML into PDF.
@@ -49,7 +49,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="