working on dlopen problem

1 files changed, 16 insertions, 18 deletions

diff --git a/lib/ffi_yajl/ext.rb b/lib/ffi_yajl/ext.rb
index 3a25174..d3d7222 100644
--- a/lib/ffi_yajl/ext.rb
+++ b/lib/ffi_yajl/ext.rb
@@ -7,34 +7,32 @@ require 'libyajl2'
 begin
   require 'fiddle'
 rescue LoadError
+end
+begin
   require 'dl'
+rescue LoadError
 end
 
 module FFI_Yajl
+  # FIXME: DRY with ffi_yajl/ffi.rb
+  libname = ::FFI.map_library_name("yajl")
+  libpath = File.expand_path(File.join(Libyajl2.opt_path, libname))
+  libpath.gsub!(/dylib/, 'bundle')
+  libpath = ::FFI.map_library_name("yajl") unless File.exist?(libpath)
+  if defined?(Fiddle) && Fiddle.respond_to?(:dlopen)
+    ::Fiddle.dlopen(libpath)
+  elsif defined?(DL) && DL.respond_to?(:dlopen)
+    ::DL.dlopen(libpath)
+  else
+    ffi_lib libpath
+  end
+
   class Parser
-    # FIXME: DRY with ffi_yajl/ffi.rb
-    libname = ::FFI.map_library_name("yajl")
-    libpath = File.expand_path(File.join(Libyajl2.opt_path, libname))
-    libpath.gsub!(/dylib/, 'bundle')
-    if defined?(Fiddle) && Fiddle.respond_to?(:dlopen)
-      ::Fiddle.dlopen(libpath)
-    else
-      ::DL.dlopen(libpath)
-    end
     require 'ffi_yajl/ext/parser'
     include FFI_Yajl::Ext::Parser
   end
 
   class Encoder
-    # FIXME: DRY with ffi_yajl/ffi.rb
-    libname = ::FFI.map_library_name("yajl")
-    libpath = File.expand_path(File.join(Libyajl2.opt_path, libname))
-    libpath.gsub!(/dylib/, 'bundle')
-    if defined?(Fiddle) && Fiddle.respond_to?(:dlopen)
-      ::Fiddle.dlopen(libpath)
-    else
-      ::DL.dlopen(libpath)
-    end
     require 'ffi_yajl/ext/encoder'
     include FFI_Yajl::Ext::Encoder
   end