sane-ffi 0.1.0 → 0.1.1

data/lib/sane/api.rb

@@ -2,7 +2,9 @@ class Sane
   module API
     extend FFI::Library
 
-    ffi_lib "sane"
+    lib_paths = Array(ENV["SANE_LIB"] || Dir["/{opt,usr}/{,local/}lib{,64}/libsane.{1.dylib,so.1*}"])
+    fallback_names = %w(libsane.1.dylib libsane.so.1 sane1.dll)
+    ffi_lib(lib_paths + fallback_names)
 
     enum :status, [:good, 0, :unsupported, :cancelled, :device_busy, :inval, :eof, :jammed, :no_docs, :cover_open, :io_error, :no_mem, :access_denied]
     enum :value_type, [:bool, 0, :int, :fixed, :string, :button, :group]

data/lib/sane/device.rb

@@ -93,11 +93,11 @@ class Sane
       option_count.times.map do |i|
         begin
           self[i]
-        rescue Error => e
-          if e.status == :inval
+        rescue Error => exception
+          if exception.status == :inval
             nil # we can't read values of some options (i.e. buttons), ignore them
           else
-            raise e
+            raise exception
           end
         end
       end
@@ -107,11 +107,6 @@ class Sane
       Hash[*option_names.zip(option_values).flatten]
     end
 
-    def option_lookup(option_name)
-      return option_name if (0..option_count).include?(option_name)
-      option_descriptors.index { |option| option[:name] == option_name.to_s } or raise(ArgumentError, "Option not found: #{option_name}")
-    end
-
     def describe(option)
       option_descriptors[option_lookup(option)]
     end
@@ -122,6 +117,11 @@ class Sane
 
     private
 
+    def option_lookup(option_name)
+      return option_name if (0..option_count).include?(option_name)
+      option_descriptors.index { |option| option[:name] == option_name.to_s } or raise(ArgumentError, "Option not found: #{option_name}")
+    end
+
     def ensure_closed!
       raise("Device is already open") if open?
     end

data/lib/sane/version.rb

@@ -1,3 +1,3 @@
 class Sane
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -2,7 +2,7 @@
 name: sane-ffi
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - "Jakub Ku\xC5\xBAma"