ruby-filemagic 0.2.2 → 0.3.0

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to filemagic version 0.2.2
+This documentation refers to filemagic version 0.3.0
 
 
 == DESCRIPTION
@@ -59,6 +59,12 @@ Rubyforge project:: <http://rubyforge.org/projects/ruby-filemagic>
 * Jens Wille <mailto:jens.wille@uni-koeln.de>
 
 
+== CREDITS
+
+* Martin Carpenter <mailto:mcarpenter@free.fr> for Ruby 1.9.2 compatibility
+  and other improvements.
+
+
 == COPYING
 
 The filemagic extension library is copywrited free software by Travis Whitton

data/Rakefile

@@ -1,4 +1,4 @@
-require %q{lib/filemagic/version}
+require %q{./lib/filemagic/version}
 
 begin
   require 'hen'
@@ -11,16 +11,16 @@ begin
     },
 
     :gem => {
-      :version          => FileMagic::VERSION,
-      :summary          => 'Ruby bindings to the magic(4) library',
-      :authors          => ['Travis Whitton', 'Jens Wille'],
-      :email            => ['tinymountain@gmail.com', 'jens.wille@uni-koeln.de'],
-      :homepage         => 'http://ruby-filemagic.rubyforge.org/',
-      :files            => FileList['lib/**/*.rb', 'ext/**/*.c', 'test/*'].to_a,
-      :extensions       => FileList['ext/**/extconf.rb'].to_a,
-      :extra_files      => FileList['[A-Z]*', 'info/*'].to_a
+      :version     => FileMagic::VERSION,
+      :summary     => 'Ruby bindings to the magic(4) library',
+      :authors     => ['Travis Whitton', 'Jens Wille'],
+      :email       => ['tinymountain@gmail.com', 'jens.wille@uni-koeln.de'],
+      :homepage    => 'http://ruby-filemagic.rubyforge.org/',
+      :files       => FileList['lib/**/*.rb', 'ext/**/*.c', 'test/*'].to_a,
+      :extensions  => FileList['ext/**/extconf.rb'].to_a,
+      :extra_files => FileList['[A-Z]*', 'info/*'].to_a
     }
   }}
-rescue LoadError
-  abort "Please install the 'hen' gem first."
+rescue LoadError => err
+  warn "Please install the `hen' gem first. (#{err})"
 end

data/ext/filemagic.c

@@ -33,6 +33,7 @@ static void rb_magic_free(magic_t cookie) {
 }
 
 static VALUE rb_magic_init(VALUE self, VALUE flags) {
+  return Qnil;
 }
 
 /* Frees resources allocated */
@@ -70,7 +71,7 @@ static VALUE rb_magic_file(VALUE self, VALUE file) {
   const char *m;
   magic_t cookie;
 
-  m = STR2CSTR(file);
+  m = StringValuePtr(file);
   GetMagicCookie(self, cookie);
   if ((m = magic_file(cookie, m)) == NULL)
     rb_raise(rb_FileMagicError, magic_error(cookie));
@@ -80,11 +81,11 @@ static VALUE rb_magic_file(VALUE self, VALUE file) {
 
 /* Return a string describing the string buffer */
 static VALUE rb_magic_buffer(VALUE self, VALUE buffer) {
-  int i = RSTRING(buffer)->len;
+  int i = RSTRING_LEN(buffer);
   const char *m;
   magic_t cookie;
 
-  m = STR2CSTR(buffer);
+  m = StringValuePtr(buffer);
   GetMagicCookie(self, cookie);
   if ((m = magic_buffer(cookie, m, i)) == NULL)
     rb_raise(rb_FileMagicError, magic_error(cookie));
@@ -110,7 +111,7 @@ static VALUE rb_magic_check(VALUE self, VALUE file) {
   magic_t cookie;
 
   GetMagicCookie(self, cookie);
-  m = STR2CSTR(file);
+  m = StringValuePtr(file);
   retval = magic_check(cookie, m);
 
   return INT2FIX(retval);
@@ -123,7 +124,7 @@ static VALUE rb_magic_compile(VALUE self, VALUE file) {
   magic_t cookie;
 
   GetMagicCookie(self, cookie);
-  m = STR2CSTR(file);
+  m = StringValuePtr(file);
   retval = magic_compile(cookie, m);
 
   return INT2FIX(retval);

data/lib/filemagic.rb

@@ -2,8 +2,8 @@ require 'filemagic.so'
 
 class FileMagic
 
-  # Map abbreviated flag names to their values (:name => Constant).
-  MAGIC_FLAGS = [
+  # Map flag names to their values (:name => Integer).
+  FLAGS_BY_SYM = [
     :none,               # No flags
     :debug,              # Turn on debugging
     :symlink,            # Follow symlinks
@@ -31,7 +31,9 @@ class FileMagic
     flags.update(flag => const_defined?(const) && const_get(const))
   }
 
-  attr_reader :flags
+  # Map flag values to their names (Integer => :name).
+  FLAGS_BY_INT = FLAGS_BY_SYM.invert.update(0 => :none)
+
   attr_writer :simplified
 
   @fm = Hash.new { |fm, flags|
@@ -93,21 +95,22 @@ class FileMagic
 
     # Build the actual flags from the named flags passed as arguments.
     def build_flags(*flags)
-      _flags = *flags
+      int_flags = *flags
 
-      unless _flags.is_a?(Integer)
-        _flags = MAGIC_NONE
+      unless int_flags.is_a?(Integer)
+        int_flags = MAGIC_NONE
 
         flags.flatten.each { |flag|
-          if value = flag.is_a?(Integer) ? flag : MAGIC_FLAGS[flag.to_sym]
-            _flags |= value
+          if value = flag.is_a?(Integer) ? flag : FLAGS_BY_SYM[flag.to_sym]
+            int_flags |= value
           else
-            raise ArgumentError, "#{value.nil? ? 'no such flag' : 'flag not available'}: #{flag}"
+            err = value.nil? ? 'no such flag' : 'flag not available'
+            raise ArgumentError, "#{err}: #{flag}"
           end
         }
       end
 
-      _flags
+      int_flags
     end
 
   end
@@ -116,7 +119,7 @@ class FileMagic
   def initialize(*flags)
     fm_initialize(*flags)
 
-    @flags  = *flags
+    @flags  = flags
     @closed = false
   end
 
@@ -132,22 +135,39 @@ class FileMagic
     simplify_mime(fm_file(file), simplified)
   end
 
+  # Returns the flags as integer.
+  def int_flags
+    @flags.first
+  end
+
+  # Returns the flags as array of symbols.
+  def flags
+    int, flags, log2 = int_flags, [], Math.log(2)
+
+    while int > 0
+      flags << FLAGS_BY_INT[flag = 2 ** Math.log(int).div(log2)]
+      int -= flag
+    end
+
+    flags.reverse
+  end
+
   # Optionally cut off additional information after mime-type.
   def buffer(buffer, simplified = simplified?)
     simplify_mime(fm_buffer(buffer), simplified)
   end
 
   def setflags(*flags)
-    previous_flags, @flags = @flags, self.class.build_flags(*flags)
-    fm_setflags(@flags)
-
-    previous_flags
+    @flags = [self.class.build_flags(*flags)]
+    fm_setflags(int_flags)
   end
+
   alias_method :flags=, :setflags
 
   def check(file = "\0")
     fm_check(file)
   end
+
   alias_method :valid?, :check
 
   def compile(file)

data/lib/filemagic/version.rb

@@ -3,8 +3,8 @@ class FileMagic
   module Version
 
     MAJOR = 0
-    MINOR = 2
-    TINY  = 2
+    MINOR = 3
+    TINY  = 0
 
     class << self
 

data/test/filemagic_test.rb

@@ -1,6 +1,7 @@
 require 'test/unit'
 
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+top_dir = File.join(File.dirname(__FILE__), '..')
+$:.unshift(File.join(top_dir, 'lib'), File.join(top_dir, 'ext'))
 require 'filemagic'
 
 class TestFileMagic < Test::Unit::TestCase
@@ -26,7 +27,7 @@ class TestFileMagic < Test::Unit::TestCase
     fm = FileMagic.new(FileMagic::MAGIC_SYMLINK | FileMagic::MAGIC_MIME)
 
     res = fm.file(path_to('pylink'))
-    assert_equal('text/plain', res)
+    assert_equal('text/plain; charset=us-ascii', res)
 
     fm.close
     fm = FileMagic.new(FileMagic::MAGIC_COMPRESS)
@@ -70,17 +71,17 @@ class TestFileMagic < Test::Unit::TestCase
 
   def test_setflags
     fm = FileMagic.new(FileMagic::MAGIC_NONE)
-    assert_equal(FileMagic::MAGIC_NONE, fm.flags)
+    assert_equal([], fm.flags)
     fm.setflags(FileMagic::MAGIC_SYMLINK)
-    assert_equal(FileMagic::MAGIC_SYMLINK, fm.flags)
+    assert_equal([:symlink], fm.flags)
     fm.close
   end
 
   def test_abbr
     fm = FileMagic.new(:mime, :continue)
-    assert_equal(FileMagic::MAGIC_MIME | FileMagic::MAGIC_CONTINUE, fm.flags)
+    assert_equal([:mime_type, :continue, :mime_encoding] , fm.flags)
     fm.setflags(:symlink)
-    assert_equal(FileMagic::MAGIC_SYMLINK, fm.flags)
+    assert_equal([:symlink], fm.flags)
     fm.close
   end
 
@@ -95,7 +96,7 @@ class TestFileMagic < Test::Unit::TestCase
   def test_mahoro_mime_file
     fm = FileMagic.new
     fm.flags = FileMagic::MAGIC_MIME
-    assert_equal('text/x-c', fm.file(path_to('mahoro.c')))
+    assert_equal('text/x-c; charset=us-ascii', fm.file(path_to('mahoro.c')))
   end
 
   def test_mahoro_buffer
@@ -107,7 +108,7 @@ class TestFileMagic < Test::Unit::TestCase
   def test_mahoro_mime_buffer
     fm = FileMagic.new
     fm.flags = FileMagic::MAGIC_MIME
-    assert_equal('text/x-c', fm.buffer(File.read(path_to('mahoro.c'))))
+    assert_equal('text/x-c; charset=us-ascii', fm.buffer(File.read(path_to('mahoro.c'))))
   end
 
   def test_mahoro_valid

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-filemagic
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Travis Whitton
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-02 00:00:00 +01:00
+date: 2010-09-10 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -48,6 +49,7 @@ files:
 - TODO
 - info/filemagic.rd
 - info/example.rb
+- ext/extconf.rb
 has_rdoc: true
 homepage: http://ruby-filemagic.rubyforge.org/
 licenses: []
@@ -60,29 +62,33 @@ rdoc_options:
 - README
 - --line-numbers
 - --inline-source
-- --all
 - --charset
 - UTF-8
+- --all
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: ruby-filemagic
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby bindings to the magic(4) library