mn2pdf 1.96 → 1.97

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f995c968b26cd711a41e58589e0c64cd4f26ebe09a7274bea8591478358122ff
-  data.tar.gz: c574684e8ec29ea41ac279787ad136979036de2c49e86bce1eced9fc152c307b
+  metadata.gz: 03474d63db276351bed0aab5f76b80ce7f18dda8abf198e4c785f7a0242cf1ed
+  data.tar.gz: '02333967ae637ce3748ea696701207a2d03fc4e8786920dcb5ea7326da857835'
 SHA512:
-  metadata.gz: 1e01d97441251afea4f1c5a510023d97df9681c29a7f24a8c107fc88d5afb2be34932161286ce4000f7c32f4bb7c6fe159a5a39fc14d5bde19463ee2a75076ff
-  data.tar.gz: 86c3d5a0401a374ff7bebed8025184a8cfea5b50f1f1efd77743cdf03acf316092f367a039a0dd2189199ef6a9aea2f2f8aad08cb99e0fa5d2dc093694a4b732
+  metadata.gz: 21e6b59a3777b7bbb3898538afd00a1f9408bb5c57e417abf042c1656d901760129f129e04ac1629c147e6e2402b27adf219562d4c9458d9cf5656f71edeedf1
+  data.tar.gz: 5b4c925822d7134cf37d4f7723861a34b4bb4401e4e17ef8fdc1e8148825d66cc96311b44fb7ce28b8c2848ff9e5b2d43f707a09ea590c823fd6a2e3531e8bfe

data/lib/mn2pdf/jvm.rb

@@ -0,0 +1,60 @@
+require "open3"
+require "pathname"
+require "rbconfig"
+
+module Jvm
+  MN2PDF_JAR_PATH = Pathname.new(__FILE__)
+    .dirname
+    .join("../../bin/mn2pdf.jar")
+    .realpath
+  DEFAULT_JAVA_OPTS = %w[-Xss10m -Xmx3g -Djava.awt.headless=true].freeze
+
+  def self.to_bytes(value)
+    case value[-1].downcase
+    when "k"
+      value.to_i * 1024
+    when "m"
+      value.to_i * 1024 * 1024
+    when "g"
+      value.to_i * 1024 * 1024 * 1024
+    else
+      value.to_i
+    end
+  end
+
+  def self.ensure_java_opts(opts, key, min_value_bytes)
+    flag, idx = opts.each_with_index.find { |opt, _| opt.start_with?(key) }
+    if flag
+      flag_value_bytes = to_bytes(flag[key.length..-1])
+
+      if flag_value_bytes < min_value_bytes
+        min_value_str = "#{key}#{min_value_bytes / (1024 * 1024)}m"
+        opts[idx] = min_value_str
+      end
+    else
+      opts << "#{key}#{min_value_bytes / (1024 * 1024)}m"
+    end
+  end
+
+  def self.options
+    result = ENV["JAVA_OPTS"]&.split || DEFAULT_JAVA_OPTS.dup
+
+    ensure_java_opts(result, "-Xss", to_bytes("10m"))
+    ensure_java_opts(result, "-Xmx", to_bytes("3g"))
+
+    if RbConfig::CONFIG["host_os"].match?(/darwin|mac os/)
+      result << "-Dapple.awt.UIElement=true"
+    end
+
+    result << "-Duser.home=#{Dir.home}"
+
+    result
+  end
+
+  def self.run(args = [])
+    cmd = ["java", *options, "-jar", MN2PDF_JAR_PATH, *args].join(" ")
+    puts cmd
+    stdout, stderr, status = Open3.capture3(cmd)
+    [stdout, stderr, status]
+  end
+end

data/lib/mn2pdf/version.rb

@@ -1,4 +1,4 @@
 module Mn2pdf
-  VERSION = "1.96".freeze
+  VERSION = "1.97".freeze
   MN2PDF_JAR_VERSION = VERSION
 end

data/lib/mn2pdf.rb

@@ -3,78 +3,60 @@ require "rbconfig"
 require "tempfile"
 require "yaml"
 
+require "mn2pdf/jvm"
+
 module Mn2pdf
-  MN2PDF_JAR_PATH = File.join(File.dirname(__FILE__), "../bin/mn2pdf.jar")
-  DEFAULT_JAVA_OPTS = %w[-Xss10m -Xmx3g -Djava.awt.headless=true].freeze
   FONTS_MANIFEST = :font_manifest
 
-  def self.jvm_options
-    options = DEFAULT_JAVA_OPTS.dup
-
-    if RbConfig::CONFIG["host_os"].match?(/darwin|mac os/)
-      options << "-Dapple.awt.UIElement=true"
-    end
-
-    options << "-Duser.home=#{Dir.home}"
-
-    options
-  end
-
   def self.help
-    cmd = ["java", *jvm_options, "-jar", MN2PDF_JAR_PATH].join(" ")
     # help message goes to STDERR (from mn2pdf v1.36)
-    _, help_message, = Open3.capture3(cmd)
+    _, help_message, = Jvm.run
     help_message
   end
 
   def self.version
-    cmd = ["java", *jvm_options, "-jar", MN2PDF_JAR_PATH, "-v"].join(" ")
-    message, = Open3.capture3(cmd)
+    message, = Jvm.run(%w[-v])
     message.strip
   end
 
   def self.convert(url_path, output_path, xsl_stylesheet, options = {})
-    cmd = build_cmd(url_path, output_path, xsl_stylesheet)
+    args = build_args(url_path, output_path, xsl_stylesheet)
 
-    return unless cmd
+    return unless args
 
     case options
     when String
-      mn2pdf(cmd + [options])
+      mn2pdf(args + [options])
     when Hash
-      mn2pdf_hash(cmd, options)
+      mn2pdf_hash(args, options)
     else
       warn "Unsupported options type #{options.class}"
     end
   end
 
-  def self.build_cmd(url, output, xslt)
+  def self.build_args(url, output, xslt)
     return if url.nil? || output.nil? || xslt.nil?
 
-    ["java", *jvm_options,
-     "-jar", MN2PDF_JAR_PATH,
-     "--xml-file", quote(url),
+    ["--xml-file", quote(url),
      "--xsl-file", quote(xslt),
      "--pdf-file", quote(output)]
   end
 
-  def self.mn2pdf_hash(cmd, options)
+  def self.mn2pdf_hash(args, options)
     manifest = options.delete(FONTS_MANIFEST)
-    options_to_cmd(options, cmd)
+    options_to_cmd(options, args)
     if manifest
       dump_fontist_manifest_locations(manifest) do |manifest_path|
-        cmd << "--font-manifest" << quote(manifest_path)
-        mn2pdf(cmd)
+        args << "--font-manifest" << quote(manifest_path)
+        mn2pdf(args)
       end
     else
-      mn2pdf(cmd)
+      mn2pdf(args)
     end
   end
 
-  def self.mn2pdf(cmd)
-    cmd = cmd.join(" ")
-    puts cmd
-    stdout, stderr, status = Open3.capture3(cmd)
+  def self.mn2pdf(args)
+    stdout, stderr, status = Jvm.run(args)
 
     unless status.success?
       puts_error_log(stdout, stderr)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mn2pdf
 version: !ruby/object:Gem::Version
-  version: '1.96'
+  version: '1.97'
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-26 00:00:00.000000000 Z
+date: 2024-08-23 00:00:00.000000000 Z
 dependencies: []
 description: |
   mn2pdf converts Metanorma XML into PDF.
@@ -36,6 +36,7 @@ files:
 - bin/mn2pdf.jar
 - bin/setup
 - lib/mn2pdf.rb
+- lib/mn2pdf/jvm.rb
 - lib/mn2pdf/version.rb
 - mn2pdf.gemspec
 homepage: https://github.com/metanorma/mn2pdf-ruby