ffi-magic 2011.04 → 2011.04.22

data/README.md

@@ -2,11 +2,21 @@
 
 ## Usage
 
-    require 'ffi-magic'
-    magic = Magic.new
-    magic.file('spec/magic.png')
-    # => "PNG image data, 100 x 67, 8-bit/color RGB, non-interlaced"
-    magic.flags = Magic::MIME
-    # => 1040
-    magic.file('spec/magic.png')
-    # => "image/png; charset=binary"
+```ruby
+require 'ffi-magic'
+magic = Magic.new
+magic.file('spec/magic.png')
+# => "PNG image data, 100 x 67, 8-bit/color RGB, non-interlaced"
+magic.flags = Magic::MIME
+# => 1040
+magic.file('spec/magic.png')
+# => "image/png; charset=binary"
+```
+
+### Getting the MIME Type
+
+```ruby
+magic = Magic.new(Magic::MIME)
+magic.file('spec/magic.png')
+# => "image/png"
+```

data/doc/AUTHORS

@@ -1,4 +1,4 @@
 Following persons have contributed to ffi-magic.
 (Sorted by number of submitted patches, then alphabetically)
 
-     3 Michael Fellinger <m.fellinger@gmail.com>
+     7 Michael Fellinger <m.fellinger@gmail.com>

data/doc/CHANGELOG

@@ -1,3 +1,19 @@
+[9d387d0 | Fri Apr 22 03:03:02 UTC 2011] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Version 2011.04.22
+
+[faba9e5 | Fri Apr 22 03:02:49 UTC 2011] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix bug in Magic#buffer, makes specs pass
+
+[e2e046a | Fri Apr 22 02:41:48 UTC 2011] Michael Fellinger <m.fellinger@gmail.com>
+
+  * clean up
+
+[6ccf92e | Fri Apr 22 02:41:41 UTC 2011] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Point out that you can pass the flag to Magic.new
+
 [5a53006 | Fri Apr 22 02:04:14 UTC 2011] Michael Fellinger <m.fellinger@gmail.com>
 
   * Version 2011.04

data/ffi-magic.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ffi-magic}
-  s.version = "2011.04"
+  s.version = "2011.04.22"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael 'manveru' Fellinger"]

data/lib/ffi-magic.rb

@@ -6,15 +6,15 @@ class Magic
   extend FFI::Library
   ffi_lib ['magic', 'libmagic.so.1']
 
-  attach_function :magic_open,     [:int],    :pointer
-  attach_function :magic_error,    [:pointer],            :string
-  attach_function :magic_load,     [:pointer, :string], :int
-  attach_function :magic_file,     [:pointer, :string], :string
-  attach_function :magic_setflags, [:pointer, :int],          :void
-  attach_function :magic_buffer,   [:pointer, :string, :int], :string
-  attach_function :magic_check,    [:pointer, :string], :int
-  attach_function :magic_compile,  [:pointer, :string], :int
-  attach_function :magic_close,    [:pointer], :void
+  attach_function :magic_open, [:int], :pointer
+  attach_function :magic_error, [:pointer], :string
+  attach_function :magic_load, [:pointer, :string], :int
+  attach_function :magic_file, [:pointer, :string], :string
+  attach_function :magic_setflags, [:pointer, :int], :void
+  attach_function :magic_buffer, [:pointer, :pointer, :int], :string
+  attach_function :magic_check, [:pointer, :string], :int
+  attach_function :magic_compile, [:pointer, :string], :int
+  attach_function :magic_close, [:pointer], :void
 
   NONE              = 0x000000
   DEBUG             = 0x000001
@@ -82,7 +82,7 @@ class Magic
 
   def buffer(input)
     input.force_encoding(Encoding::BINARY)
-    magic_buffer(@cookie, input, input.bytesize.to_s)
+    magic_buffer(@cookie, input, input.bytesize)
   end
 
   def flags=(flags)

data/lib/ffi-magic/version.rb

@@ -1,3 +1,3 @@
 class Magic
-  VERSION = "2011.04"
+  VERSION = "2011.04.22"
 end

data/spec/ffi-magic.rb

@@ -20,12 +20,12 @@ describe 'Magic' do
 
   should 'buffer' do
     @m.flags = Magic::NONE
-    @m.buffer(File.read(file)).should == "ASCII C++ program text"
+    @m.buffer(File.read(file)).should == "PNG image data, 100 x 67, 8-bit/color RGB, non-interlaced"
   end
 
   should 'buffer MIME' do
     @m.flags = Magic::MIME
-    @m.buffer(File.read(file)).should == "text/x-c++; charset=us-ascii"
+    @m.buffer(File.read(file)).should == "image/png; charset=binary"
   end
 
   should 'have a valid database' do

metadata

@@ -5,7 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2011
   - 4
-  version: "2011.04"
+  - 22
+  version: 2011.04.22
 platform: ruby
 authors: 
 - Michael 'manveru' Fellinger