library.rb in sunscraper-1.1.0.beta1

- old
+ new
@@ -1,37 +1,41 @@
-if !defined?(RUBY_ENGINE) && RUBY_VERSION =~ /^1.8/
-  raise RuntimeError, "Sunscraper does not work on Ruby MRI 1.8.x."
+if RUBY_PLATFORM =~ /darwin/i || RbConfig::CONFIG['target_os'] == 'darwin'
+  raise RuntimeError, "Sunscraper/embed does not work on OS X. Use Sunscraper/standalone."
 end
 
 require 'ffi'
+require 'rbconfig'
 
 # @private
-module Sunscraper::Library
-  extend FFI::Library
+module Sunscraper
+  module Library
+    extend FFI::Library
 
-  # RbConfig sniffing does not work on JRuby.
-  if Gem.win_platform?
-    extension = 'dll'
-  elsif RUBY_PLATFORM =~ /darwin/i
-    extension = 'dylib'
-  else
-    extension = 'so'
-  end
+    if Gem.win_platform?
+      extension = 'dll'
+    else
+      extension = 'so'
+    end
 
-  ffi_lib File.join(Gem.loaded_specs['sunscraper'].full_gem_path,
-                    'ext', "libsunscraper.#{extension}")
+    ffi_lib File.join(Gem.loaded_specs['sunscraper'].full_gem_path,
+                      'ext', 'embed', "libsunscraper.#{extension}")
 
-  attach_function 'create',    :sunscraper_create,    [],                  :pointer
-  attach_function 'load_html', :sunscraper_load_html, [:pointer, :string], :void
-  attach_function 'load_url',  :sunscraper_load_url,  [:pointer, :string], :void
-  attach_function 'fetch',     :sunscraper_fetch,     [:pointer],          :string
-  attach_function 'discard',   :sunscraper_discard,   [:pointer],          :void
+    attach_function 'create',    :sunscraper_create,    [],                  :pointer
+    attach_function 'load_html', :sunscraper_load_html, [:pointer, :string], :void
+    attach_function 'load_url',  :sunscraper_load_url,  [:pointer, :string], :void
+    attach_function 'fetch',     :sunscraper_fetch,     [:pointer],          :string
+    attach_function 'discard',   :sunscraper_discard,   [:pointer],          :void
 
-  if RUBY_ENGINE == 'ruby'
-    # MRI uses ffi gem and has GVL. Hence, it needs a rb_thread_blocking_region call.
-    attach_function 'wait',    :sunscraper_wait,      [:pointer, :uint],   :void,    :blocking => true
-  else
-    # Rubinius does not have GVL neither it has options in attach_function.
-    # Same for JRuby.
-    attach_function 'wait',    :sunscraper_wait,      [:pointer, :uint],   :void
+    if RUBY_ENGINE == 'ruby'
+      # MRI uses ffi gem and has GVL. Hence, it needs a rb_thread_blocking_region call.
+      attach_function 'wait',    :sunscraper_wait,      [:pointer, :uint],   :void,    :blocking => true
+    else
+      # Rubinius does not have GVL neither it has options in attach_function.
+      # Same for JRuby.
+      attach_function 'wait',    :sunscraper_wait,      [:pointer, :uint],   :void
+    end
+
+    attach_function 'finalize',  :sunscraper_finalize,  [],                  :void
+
+    at_exit { finalize }
   end
 end
\ No newline at end of file