ruby-filemagic 0.4.2 → 0.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a838370185e74426017deaa1c9b9e41935636c68
+  data.tar.gz: c7fc52e6fd4a78dea2ede8b329641cc2f4a6fa17
+SHA512:
+  metadata.gz: c05274940e05af64ac2609e9a03d3fc22a4175f61d1e29d83e30c85a129531953383952d82e491040431d9127f7fecb5fde61c38a30966f793eda611194d074c
+  data.tar.gz: 05869472cbb9bfec6be74f95976a8ea26d3dbca77070578a6e69505d66882e480047a6df765973cbaebdcc410de57bb9a7b72a85a91cdc08f9356d80b0e61e91

data/ChangeLog

@@ -1,5 +1,13 @@
+# markup: rd
+
 = Revision history for ruby-filemagic
 
+== 0.5.0 [2013-12-19]
+
+* Removed usage of +RARRAY_PTR+ (cf. Ruby bug
+  {#8399}[https://bugs.ruby-lang.org/issues/8399]).
+* Housekeeping.
+
 == 0.4.2 [2010-09-16]
 
 * Not all versions/distributions have file/patchlevel.h

data/README

@@ -2,14 +2,14 @@
 
 == VERSION
 
-This documentation refers to filemagic version 0.4.2
+This documentation refers to filemagic version 0.5.0
 
 
 == DESCRIPTION
 
 === Revised version
 
-September 12, 2008 Jens Wille <jens.wille@uni-koeln.de>
+September 12, 2008 Jens Wille <jens.wille@gmail.com>
 
 Similar to Ricardo[http://github.com/ricardochimal/ruby-filemagic]
 I wanted this project to make some progress. My needs went a bit
@@ -43,16 +43,16 @@ Travis
 == LINKS
 
 <b></b>
-Homepage::          <http://grub.ath.cx/filemagic/>
-Documentation::     <http://ruby-filemagic.rubyforge.org/>
-Source code::       <http://github.com/blackwinter/ruby-filemagic>
-Rubyforge project:: <http://rubyforge.org/projects/ruby-filemagic>
+Homepage (defunct):: http://grub.ath.cx/filemagic/
+Documentation::      http://blackwinter.github.com/ruby-filemagic
+Source code::        http://github.com/blackwinter/ruby-filemagic
+RubyGem::            http://rubygems.org/gems/ruby-filemagic
 
 
 == AUTHORS
 
 * Travis Whitton <mailto:tinymountain@gmail.com> (Original author)
-* Jens Wille <mailto:jens.wille@uni-koeln.de>
+* Jens Wille <mailto:jens.wille@gmail.com>
 
 
 == CREDITS

data/Rakefile

@@ -1,24 +1,25 @@
-require %q{./lib/filemagic/version}
+require File.expand_path(%q{../lib/filemagic/version}, __FILE__)
 
 begin
   require 'hen'
 
   Hen.lay! {{
-    :rubyforge => {
-      :package  => 'ruby-filemagic',
-      :project  => 'ruby-filemagic',
-      :rdoc_dir => nil
-    },
-
     :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/**/*.[ch]', 'test/*'].to_a,
-      :extensions  => FileList['ext/**/extconf.rb'].to_a,
-      :extra_files => FileList['[A-Z]*', 'info/*'].to_a
+      :name         => %q{ruby-filemagic},
+      :version      => FileMagic::VERSION,
+      :summary      => 'Ruby bindings to the magic(4) library',
+      :authors      => ['Travis Whitton', 'Jens Wille'],
+      :email        => ['tinymountain@gmail.com', 'jens.wille@gmail.com'],
+      :license      => %q{Ruby},
+      :homepage     => :blackwinter,
+      :extra_files  => FileList['info/*'].to_a,
+      :dependencies => %w[],
+      :extension    => {
+        :name          => 'filemagic',
+        :ext_dir       => 'ext',
+        :lib_dir       => 'lib',
+        :cross_compile => false
+      }
     }
   }}
 rescue LoadError => err

data/ext/filemagic.c

@@ -32,7 +32,8 @@ rb_magic_new(int argc, VALUE *argv, VALUE class) {
     args[1] = rb_hash_new();
   }
 
-  args[0] = rb_magic_flags_to_int(argc, argv);
+  args[0] = rb_magic_flags_to_int(rb_ary_new4(argc, argv));
+
   if ((cookie = magic_open(NUM2INT(args[0]))) == NULL) {
     rb_fatal("out of memory");
   }
@@ -165,7 +166,7 @@ rb_magic_setflags(VALUE self, VALUE flags) {
   magic_t cookie;
 
   flags = rb_Array(flags);
-  flags = rb_magic_flags_to_int(RARRAY_LEN(flags), RARRAY_PTR(flags));
+  flags = rb_magic_flags_to_int(flags);
   rb_iv_set(self, "_flags", flags);
 
   GetMagicCookie(self, cookie);
@@ -205,13 +206,13 @@ rb_magic_compile(VALUE self, VALUE file) {
 }
 
 static VALUE
-rb_magic_flags_to_int(int argc, VALUE *argv) {
+rb_magic_flags_to_int(VALUE ary) {
   VALUE map = rb_const_get(cFileMagic, rb_intern("FLAGS_BY_SYM"));
   VALUE f, g;
   int i = MAGIC_NONE, j;
 
-  for (j = 0; j < argc; j++) {
-    f = argv[j];
+  for (j = 0; j < RARRAY_LEN(ary); j++) {
+    f = rb_ary_entry(ary, j);
 
     switch (TYPE(f)) {
       case T_SYMBOL:
@@ -222,7 +223,8 @@ rb_magic_flags_to_int(int argc, VALUE *argv) {
         else {
           f = rb_funcall(f, rb_intern("inspect"), 0);
           rb_raise(rb_eArgError,
-            "%s: %s", NIL_P(g) ? "no such flag" : "flag not available",
+            "%s: %s",
+            NIL_P(g) ? "no such flag" : "flag not available",
             StringValueCStr(f)
           );
           break;
@@ -269,9 +271,9 @@ rb_magic_free(magic_t cookie) {
 
 void
 Init_filemagic() {
+  char version[8] = "0";
   cFileMagic = rb_define_class("FileMagic", rb_cObject);
 
-  char version[8] = "0";
 #ifdef FILE_VERSION_MAJOR
   sprintf(version, "%d.%02d", FILE_VERSION_MAJOR, patchlevel);
 #endif

data/ext/filemagic.h

@@ -12,20 +12,17 @@
 #ifndef RSTRING_LEN
 #define RSTRING_LEN(s) (RSTRING(s)->len)
 #endif
-#ifndef RSTRING_PTR
-#define RSTRING_PTR(s) (RSTRING(s)->ptr)
-#endif
 #ifndef RARRAY_LEN
 #define RARRAY_LEN(s) (RARRAY(s)->len)
 #endif
-#ifndef RARRAY_PTR
-#define RARRAY_PTR(s) (RARRAY(s)->ptr)
-#endif
 
 #define GetMagicCookie(obj, cookie) {\
-  if (RTEST(rb_magic_closed_p(obj)))\
+  if (RTEST(rb_magic_closed_p(obj))) {\
     rb_raise(rb_eRuntimeError, "closed stream");\
-  Data_Get_Struct(obj, struct magic_set, cookie);\
+  }\
+  else {\
+    Data_Get_Struct((obj), struct magic_set, (cookie));\
+  }\
 }
 
 static VALUE cFileMagic, rb_FileMagicError;
@@ -42,7 +39,7 @@ static VALUE rb_magic_setflags(VALUE, VALUE);
 static VALUE rb_magic_check(int, VALUE*, VALUE);
 static VALUE rb_magic_compile(VALUE, VALUE);
 
-static VALUE rb_magic_flags_to_int(int, VALUE*);
+static VALUE rb_magic_flags_to_int(VALUE);
 static VALUE rb_magic_apply_simple(VALUE, const char*, VALUE);
 
 static void rb_magic_free(magic_t);

data/lib/filemagic.rb

@@ -39,7 +39,7 @@ class FileMagic
   # Map flag values to their names (Integer => :name).
   FLAGS_BY_INT = FLAGS_BY_SYM.invert.update(0 => :none)
 
-  # Extract "simple" MIME type
+  # Extract "simple" MIME type.
   SIMPLE_RE = %r{([.\w\/-]+)}
 
   @fm = Hash.new { |fm, flags|

data/lib/filemagic/ext.rb

@@ -62,7 +62,6 @@ class File
   def self.file_type(file, *flags)
     FileMagic.fm(*flags).file(file.respond_to?(:path) ? file.path : file)
   rescue FileMagic::FileMagicError
-    nil
   end
 
 end
@@ -74,7 +73,6 @@ class String
   def self.file_type(string, *flags)
     FileMagic.fm(*flags).buffer(string)
   rescue FileMagic::FileMagicError
-    nil
   end
 
 end

data/lib/filemagic/version.rb

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

data/test/filemagic_test.rb

@@ -1,7 +1,4 @@
 require 'test/unit'
-
-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
@@ -10,7 +7,7 @@ class TestFileMagic < Test::Unit::TestCase
     fm = FileMagic.new(FileMagic::MAGIC_NONE)
 
     res = fm.file(path_to('pyfile'))
-    assert_equal('a python script text executable', res)
+    assert_equal('Python script, ASCII text executable', res)
 
     if File.symlink?(path_to('pylink'))
       res = fm.file(path_to('pylink'))
@@ -21,7 +18,7 @@ class TestFileMagic < Test::Unit::TestCase
     fm = FileMagic.new(FileMagic::MAGIC_SYMLINK)
 
     res = fm.file(path_to('pylink'))
-    assert_equal('a python script text executable', res)
+    assert_equal('Python script, ASCII text executable', res)
 
     fm.close
     fm = FileMagic.new(FileMagic::MAGIC_SYMLINK | FileMagic::MAGIC_MIME)
@@ -33,7 +30,7 @@ class TestFileMagic < Test::Unit::TestCase
     fm = FileMagic.new(FileMagic::MAGIC_COMPRESS)
 
     res = fm.file(path_to('pyfile-compressed.gz'))
-    assert_match(/^a python script text executable \(gzip compressed data, was "pyfile-compressed", from Unix/, res)
+    assert_match(/^Python script, ASCII text executable \(gzip compressed data, was "pyfile-compressed", from Unix/, res)
 
     fm.close
   end
@@ -42,12 +39,12 @@ class TestFileMagic < Test::Unit::TestCase
     fm = FileMagic.new(FileMagic::MAGIC_NONE)
     res = fm.buffer("#!/bin/sh\n")
     fm.close
-    assert_match(/shell script text executable$/, res)
+    assert_equal('POSIX shell script, ASCII text executable', res)
   end
 
   def test_check
     fm = FileMagic.new(FileMagic::MAGIC_NONE)
-    res = fm.check(path_to('perl'))
+    res = silence_stderr { fm.check(path_to('perl')) }
     fm.close
     assert_equal(0, res)
   end
@@ -67,7 +64,7 @@ class TestFileMagic < Test::Unit::TestCase
       block_fm = fm
       fm.file(path_to('pyfile'))
     }
-    assert_equal('a python script text executable', res)
+    assert_equal('Python script, ASCII text executable', res)
     assert block_fm.closed?
   end
 
@@ -100,7 +97,7 @@ class TestFileMagic < Test::Unit::TestCase
   def test_mahoro_file
     fm = FileMagic.new
     fm.flags = FileMagic::MAGIC_NONE
-    assert_equal('ASCII C program text', fm.file(path_to('mahoro.c')))
+    assert_equal('C source, ASCII text', fm.file(path_to('mahoro.c')))
   end
 
   def test_mahoro_mime_file
@@ -112,7 +109,7 @@ class TestFileMagic < Test::Unit::TestCase
   def test_mahoro_buffer
     fm = FileMagic.new
     fm.flags = FileMagic::MAGIC_NONE
-    assert_equal('ASCII C program text', fm.buffer(File.read(path_to('mahoro.c'))))
+    assert_equal('C source, ASCII text', fm.buffer(File.read(path_to('mahoro.c'))))
   end
 
   def test_mahoro_mime_buffer
@@ -123,7 +120,7 @@ class TestFileMagic < Test::Unit::TestCase
 
   def test_mahoro_valid
     fm = FileMagic.new
-    assert(fm.valid?, 'Default database was not valid.')
+    assert(silence_stderr { fm.valid? }, 'Default database was not valid.')
   end
 
   # test abbreviating mime types
@@ -137,7 +134,7 @@ class TestFileMagic < Test::Unit::TestCase
     fm.simplified = true
     assert fm.simplified?
     assert_equal('text/plain', fm.file(path_to('perl')))
-    assert_equal('application/vnd.ms-office', fm.file(path_to('excel-example.xls')))
+    assert_equal('application/msword', fm.file(path_to('excel-example.xls')))
   end
 
   # utility methods:
@@ -146,4 +143,11 @@ class TestFileMagic < Test::Unit::TestCase
     File.join(dir, file)
   end
 
+  def silence_stderr
+    require 'nuggets/io/redirect'
+    $stderr.redirect { yield }
+  rescue LoadError
+    yield
+  end
+
 end

metadata

@@ -1,98 +1,85 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruby-filemagic
-version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 2
-  version: 0.4.2
+version: !ruby/object:Gem::Version
+  version: 0.5.0
 platform: ruby
-authors: 
+authors:
 - Travis Whitton
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-09-16 00:00:00 +02:00
-default_executable: 
+date: 2013-12-19 00:00:00.000000000 Z
 dependencies: []
-
 description: Ruby bindings to the magic(4) library
-email: 
+email:
 - tinymountain@gmail.com
-- jens.wille@uni-koeln.de
+- jens.wille@gmail.com
 executables: []
-
-extensions: 
+extensions:
 - ext/extconf.rb
-extra_rdoc_files: 
-- ChangeLog
+extra_rdoc_files:
 - README
-files: 
+- ChangeLog
+- ext/filemagic.c
+files:
+- lib/filemagic.rb
 - lib/filemagic/ext.rb
 - lib/filemagic/version.rb
-- lib/filemagic.rb
-- ext/filemagic.h
-- ext/filemagic.c
-- test/pyfile
-- test/mahoro.c
-- test/pylink
-- test/pyfile-compressed.gz
-- test/perl
-- test/leaktest.rb
-- test/filemagic_test.rb
-- test/excel-example.xls
-- README
+- info/example.rb
+- info/filemagic.rd
 - ChangeLog
+- README
 - Rakefile
 - TODO
-- info/filemagic.rd
-- info/example.rb
 - ext/extconf.rb
-has_rdoc: true
-homepage: http://ruby-filemagic.rubyforge.org/
-licenses: []
+- ext/filemagic.c
+- ext/filemagic.h
+- test/excel-example.xls
+- test/filemagic_test.rb
+- test/leaktest.rb
+- test/mahoro.c
+- test/perl
+- test/pyfile
+- test/pyfile-compressed.gz
+- test/pylink
+homepage: http://github.com/blackwinter/ruby-filemagic
+licenses:
+- Ruby
+metadata: {}
+post_install_message: |2+
 
-post_install_message: 
-rdoc_options: 
-- --title
-- ruby-filemagic Application documentation
-- --main
-- README
-- --line-numbers
-- --inline-source
-- --charset
+  ruby-filemagic-0.5.0 [2013-12-19]:
+
+  * Removed usage of +RARRAY_PTR+ (cf. Ruby bug
+    {#8399}[https://bugs.ruby-lang.org/issues/8399]).
+  * Housekeeping.
+
+rdoc_options:
+- "--title"
+- ruby-filemagic Application documentation (v0.5.0)
+- "--charset"
 - UTF-8
-- --all
-require_paths: 
+- "--line-numbers"
+- "--all"
+- "--main"
+- README
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  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
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: ruby-filemagic
-rubygems_version: 1.3.7
+rubyforge_project: 
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby bindings to the magic(4) library
 test_files: []
-