feat: support for mn2pdf 1.97

lib/tebako-runtime/adapters/jing.rb

@@ -28,7 +28,7 @@
 # Unpack jing.jar
 class Jing
   tmp = DEFAULT_JAR
-  remove_const("DEFAULT_JAR")
+  remove_const("DEFAULT_JAR") if const_defined?("DEFAULT_JAR")
   DEFAULT_JAR = TebakoRuntime.extract_memfs(tmp)
 
   alias original_initialize initialize

lib/tebako-runtime/adapters/mn2pdf.rb

@@ -26,10 +26,27 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 # Unpack mn2pdf.jar
-module Mn2pdf
-  remove_const("MN2PDF_JAR_PATH")
-  MN2PDF_JAR_PATH = TebakoRuntime.extract_memfs(File.join(TebakoRuntime.full_gem_path("mn2pdf"), "bin", "mn2pdf.jar"))
 
+module TebakoRuntime
+  MN2PDF_J_PATH = TebakoRuntime.extract_memfs(File.join(TebakoRuntime.full_gem_path("mn2pdf"), "bin",
+                                                        "mn2pdf.jar"))
+end
+
+if Mn2pdf.const_defined?("MN2PDF_JAR_PATH")
+  module Mn2pdf
+    remove_const("MN2PDF_JAR_PATH")
+    MN2PDF_JAR_PATH = TebakoRuntime::MN2PDF_J_PATH
+  end
+end
+
+if Jvm.const_defined?("MN2PDF_JAR_PATH")
+  module Jvm
+    remove_const("MN2PDF_JAR_PATH")
+    MN2PDF_JAR_PATH = TebakoRuntime::MN2PDF_J_PATH
+  end
+end
+
+module Mn2pdf
   singleton_class.send(:alias_method, :convert_orig, :convert)
   singleton_class.send(:remove_method, :convert)
 

lib/tebako-runtime/adapters/mnconvert.rb

@@ -27,7 +27,7 @@
 
 # Unpack mn2pdf.jar
 module MnConvert
-  remove_const("MNCONVERT_JAR_PATH")
+  remove_const("MNCONVERT_JAR_PATH") if const_defined?("MNCONVERT_JAR_PATH")
   MNCONVERT_JAR_PATH = TebakoRuntime.extract_memfs(File.join(TebakoRuntime.full_gem_path("mnconvert"), "bin",
                                                              "mnconvert.jar"))
 

lib/tebako-runtime/version.rb

@@ -26,5 +26,5 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 module TebakoRuntime
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

spec/pass_through_spec.rb

@@ -32,11 +32,11 @@
   it "provides a stub for ffi gem in pass through mode on Windows" do
     if RUBY_PLATFORM =~ /msys|mingw|cygwin/
       if defined?(FFI)
-        FFI::Platform.send(:remove_const, :OS)
-        FFI::Platform.send(:remove_const, :ARCH)
-        FFI::Platform.send(:remove_const, :LIBPREFIX)
-        FFI::Platform.send(:remove_const, :LIBSUFFIX)
-        FFI::Platform.send(:remove_const, :PASS_THROUGH)
+        FFI::Platform.send(:remove_const, :OS) if Object.const_defined?(:OS)
+        FFI::Platform.send(:remove_const, :ARCH) if Object.const_defined?(:ARCH)
+        FFI::Platform.send(:remove_const, :LIBPREFIX) if Object.const_defined?(:LIBPREFIX)
+        FFI::Platform.send(:remove_const, :LIBSUFFIX) if Object.const_defined?(:LIBSUFFIX)
+        FFI::Platform.send(:remove_const, :PASS_THROUGH) if Object.const_defined?(:PASS_THROUGH)
       end
       ENV["TEBAKO_PASS_THROUGH"] = "1"
       require "ffi"
@@ -52,11 +52,11 @@
   after do
     if RUBY_PLATFORM =~ /msys|mingw|cygwin/
       ENV.delete("TEBAKO_PASS_THROUGH")
-      FFI::Platform.send(:remove_const, :OS)
-      FFI::Platform.send(:remove_const, :ARCH)
-      FFI::Platform.send(:remove_const, :LIBPREFIX)
-      FFI::Platform.send(:remove_const, :LIBSUFFIX)
-      FFI::Platform.send(:remove_const, :PASS_THROUGH)
+      FFI::Platform.send(:remove_const, :OS) if Object.const_defined?(:OS)
+      FFI::Platform.send(:remove_const, :ARCH) if Object.const_defined?(:ARCH)
+      FFI::Platform.send(:remove_const, :LIBPREFIX) if Object.const_defined?(:LIBPREFIX)
+      FFI::Platform.send(:remove_const, :LIBSUFFIX) if Object.const_defined?(:LIBSUFFIX)
+      FFI::Platform.send(:remove_const, :PASS_THROUGH) if Object.const_defined?(:PASS_THROUGH)
     end
   end
 end

spec/runtime_spec.rb

@@ -64,7 +64,7 @@ def tmpdir_name
   end
 
   it "processes a memfs file with default settings" do
-    TebakoRuntime.send(:remove_const, :COMPILER_MEMFS)
+    TebakoRuntime.send(:remove_const, :COMPILER_MEMFS) if defined?(TebakoRuntime::COMPILER_MEMFS)
     TebakoRuntime::COMPILER_MEMFS = File.join(__dir__, "fixtures", "files")
 
     test_file = File.join(TebakoRuntime::COMPILER_MEMFS, "test1.file")
@@ -75,7 +75,7 @@ def tmpdir_name
   end
 
   it "processes memfs files with the same extension when wild option is given" do
-    TebakoRuntime.send(:remove_const, :COMPILER_MEMFS)
+    TebakoRuntime.send(:remove_const, :COMPILER_MEMFS) if defined?(TebakoRuntime::COMPILER_MEMFS)
     TebakoRuntime::COMPILER_MEMFS = File.join(__dir__, "fixtures", "files")
 
     test1_file = File.join(TebakoRuntime::COMPILER_MEMFS, "test1.file")
@@ -89,7 +89,7 @@ def tmpdir_name
 
   it "processes a memfs file with manually set cache folder" do
     cache = Pathname.new(Dir.mktmpdir("test-"))
-    TebakoRuntime.send(:remove_const, :COMPILER_MEMFS)
+    TebakoRuntime.send(:remove_const, :COMPILER_MEMFS) if defined?(TebakoRuntime::COMPILER_MEMFS)
     TebakoRuntime::COMPILER_MEMFS = File.join(__dir__, "fixtures", "files")
 
     test_file = File.join(TebakoRuntime::COMPILER_MEMFS, "test1.file")
@@ -106,7 +106,7 @@ def tmpdir_name
   end
 
   it "processes a memfs file with quoted name" do
-    TebakoRuntime.send(:remove_const, :COMPILER_MEMFS)
+    TebakoRuntime.send(:remove_const, :COMPILER_MEMFS) if defined?(TebakoRuntime::COMPILER_MEMFS)
     TebakoRuntime::COMPILER_MEMFS = File.join(__dir__, "fixtures", "files")
 
     test_file = File.join(TebakoRuntime::COMPILER_MEMFS, "test1.file")
@@ -123,7 +123,7 @@ def tmpdir_name
   end
 
   it "provides an adapter for jing gem" do
-    TebakoRuntime.send(:remove_const, :COMPILER_MEMFS)
+    TebakoRuntime.send(:remove_const, :COMPILER_MEMFS) if defined?(TebakoRuntime::COMPILER_MEMFS)
     TebakoRuntime::COMPILER_MEMFS = File.join(__dir__, "fixtures", "jing")
     test_schema = File.join(TebakoRuntime::COMPILER_MEMFS, "schema.rnc")
     test_xml = File.join(TebakoRuntime::COMPILER_MEMFS, "valid.xml")
@@ -139,9 +139,12 @@ def tmpdir_name
   end
 
   it "provides an adapter for mn2pdf gem" do
-    expect(TebakoRuntime).to receive(:extract_memfs).with(File.join(TebakoRuntime.full_gem_path("mn2pdf"), "bin",
-                                                                    "mn2pdf.jar")).and_call_original
+    fake_jar_path = "/tmp/mn2pdf.jar"
+    expect(TebakoRuntime).to receive(:extract_memfs).with(File.join(
+                                                            TebakoRuntime.full_gem_path("mn2pdf"), "bin", "mn2pdf.jar"
+                                                          )).and_return(fake_jar_path)
     require "mn2pdf"
+    expect(Jvm::MN2PDF_JAR_PATH).to eq(fake_jar_path)
   end
 
   it "provides an adapter for mnconvert gem" do
@@ -151,7 +154,7 @@ def tmpdir_name
   end
 
   it "provides an adapter for net/http gem" do
-    TebakoRuntime.send(:remove_const, :COMPILER_MEMFS)
+    TebakoRuntime.send(:remove_const, :COMPILER_MEMFS) if defined?(TebakoRuntime::COMPILER_MEMFS)
     TebakoRuntime::COMPILER_MEMFS = File.join(TebakoRuntime.full_gem_path("tebako-runtime"), "lib")
 
     tfile = File.join(TebakoRuntime.full_gem_path("tebako-runtime"), "lib", "cert", "cacert.pem.mozilla")
@@ -170,7 +173,7 @@ def tmpdir_name
   end
 
   it "provides an adapter for sassc gem" do
-    TebakoRuntime.send(:remove_const, :COMPILER_MEMFS)
+    TebakoRuntime.send(:remove_const, :COMPILER_MEMFS) if defined?(TebakoRuntime::COMPILER_MEMFS)
     TebakoRuntime::COMPILER_MEMFS = __dir__
 
     require "sassc"
@@ -204,7 +207,7 @@ def tmpdir_name
   end
 
   it "provides an adapter for sinatra gem" do
-    TebakoRuntime.send(:remove_const, :COMPILER_MEMFS)
+    TebakoRuntime.send(:remove_const, :COMPILER_MEMFS) if defined?(TebakoRuntime::COMPILER_MEMFS)
     TebakoRuntime::COMPILER_MEMFS = __dir__
 
     require "sinatra"