magic 0.2.3 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/lib/magic.rb

@@ -10,6 +10,7 @@ require "magic/database"
 module Magic
   class << self
     # Guesses mime of given file
+    #
     # ====== Example
     #   Magic.guess_file_mime("public/images/rails.png")
     #   # => "image/png; charset=binary"
@@ -18,6 +19,7 @@ module Magic
     end
 
     # Guesses mime encoding of given file
+    #
     # ===== Example
     #   Magic.guess_file_mime_encoding("public/images/rails.png")
     #   # => "binary"
@@ -26,6 +28,7 @@ module Magic
     end
 
     # Guesses mime type of given file
+    #
     # ===== Example
     #   Magic.guess_file_mime_type("public/images/rails.png")
     #   # => "image/png"
@@ -34,6 +37,7 @@ module Magic
     end
 
     # Guesses mime type of given string
+    #
     # ===== Example
     #   Magic.guess_string_mime("Magic® File™")
     #   # => "text/plain; charset=utf-8"
@@ -42,6 +46,7 @@ module Magic
     end
 
     # Guesses mime type of given string
+    #
     # ===== Example
     #   Magic.guess_string_mime_encoding("Magic® File™")
     #   # => "utf-8"
@@ -50,6 +55,7 @@ module Magic
     end
 
     # Guesses mime type of given string
+    #
     # ===== Example
     #   Magic.guess_string_mime_type("Magic® File™")
     #   # => "text/plain"
@@ -58,14 +64,15 @@ module Magic
     end
 
     # Creates magic database and yields it to the given block
+    #
     # ===== Example
     #   Magic.guess(:mime) { |db| db.buffer("Magic® File™") }
     #   # => "text/plain; charset=utf-8"
     def guess(*args)
       db = Database.new(*args)
-      yield(db).tap do
-        db.close
-      end
+      result = yield(db)
+      db.close
+      result
     end
   end
 end

data/lib/magic/api.rb

@@ -2,10 +2,9 @@ module Magic
   module Api #:nodoc:
     extend FFI::Library
 
-    ffi_lib ["/opt/local/lib/libmagic.1.dylib",
-             "libmagic.1.dylib",
-             "libmagic.so.1",
-             "magic1.dll"]
+    lib_paths = Array(ENV["MAGIC_LIB"] || Dir["/{opt,usr}/{,local/}lib{,64}/libmagic.{1.dylib,so.1*}"])
+    fallback_names = %w(libmagic.1.dylib libmagic.so.1 magic1.dll)
+    ffi_lib(lib_paths + fallback_names)
 
     attach_function :magic_open, [:int], :pointer
     attach_function :magic_close, [:pointer], :void

data/magic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{magic}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Kuźma"]
-  s.date = %q{2010-02-08}
+  s.date = %q{2010-02-10}
   s.description = %q{Ruby FFI bindings to libmagic}
   s.email = %q{qoobaa@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: magic
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - "Jakub Ku\xC5\xBAma"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-08 00:00:00 +01:00
+date: 2010-02-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency