ruby-filemagic 0.4.0 → 0.4.1

data/{CHANGELOG → ChangeLog}

@@ -1,16 +1,34 @@
---------------------------------------------------------------------------------
-7/28/2003 version 0.1.0
+= Revision history for ruby-filemagic
 
-* Initial release.
+== 0.4.1
 
---------------------------------------------------------------------------------
-7/30/2003 version 0.1.1
+* Added MAGIC_VERSION
+* Fixed example script
 
-* Added manual close method
-* Added unit test suite
+== 0.4.0 [2010-09-14]
+
+* Brushed up C layer
+  * Moved most of the Ruby stuff to C
+  * No longer expose internal state (@closed, @flags)
+  * No longer expose internal C methods (fm_*)
+  * Updated for magic(4) version 5.04
+
+== 0.3.0 [2010-09-10]
 
---------------------------------------------------------------------------------
-9/12/2008 version 0.2.0
+* Ruby 1.9.2 compatibility (Martin Carpenter)
+* Exposed flags as symbols (Martin Carpenter)
+
+== 0.2.2 [2010-03-02]
+
+* Allow '.' when abbreviating mime types (Eric Schwartz)
+* Cleanup and project file fixes
+
+== 0.2.1 [2008-09-18]
+
+* Added mahoro source file and tests for reference and inspiration
+* We have a Rubyforge project now! :-)
+
+== 0.2.0 [2008-09-12]
 
 * Modified C API
   * Uniform C function prefix rb_magic_ (instead of magick_)
@@ -21,29 +39,11 @@
 * Added/updated project files
 * Now available as a Rubygem!
 
---------------------------------------------------------------------------------
-9/18/2008 version 0.2.1
-
-* Added mahoro source file and tests for reference and inspiration
-* We have a Rubyforge project now! :-)
-
---------------------------------------------------------------------------------
-3/2/2010 version 0.2.2
+== 0.1.1 [2003-07-30]
 
-* Allow '.' when abbreviating mime types (Eric Schwartz)
-* Cleanup and project file fixes
-
---------------------------------------------------------------------------------
-9/10/2010 version 0.3.0
-
-* Ruby 1.9.2 compatibility (Martin Carpenter)
-* Exposed flags as symbols (Martin Carpenter)
+* Added manual close method
+* Added unit test suite
 
---------------------------------------------------------------------------------
-9/14/2010 version 0.4.0
+== 0.1.0 [2003-07-28]
 
-* Brushed up C layer
-  * Moved most of the Ruby stuff to C
-  * No longer expose internal state (@closed, @flags)
-  * No longer expose internal C methods (fm_*)
-  * Updated for magic(4) version 5.04
+* Initial release.

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to filemagic version 0.4.0
+This documentation refers to filemagic version 0.4.1
 
 
 == DESCRIPTION

data/TODO

@@ -2,7 +2,6 @@
 * Find a way to make magic_check work on NULL
 * Refactor code into initialize instead of new
 
-* Expose magic(4) version (how?)
 * Properly document C methods
 * Convert tests to RSpec
 * Add Rake tasks

data/ext/filemagic.c

@@ -271,6 +271,10 @@ void
 Init_filemagic() {
   cFileMagic = rb_define_class("FileMagic", rb_cObject);
 
+  char version[16];
+  sprintf(version, "%d.%02d", FILE_VERSION_MAJOR, patchlevel);
+  rb_define_const(cFileMagic, "MAGIC_VERSION", rb_str_new2(version));
+
   rb_define_singleton_method(cFileMagic, "new", rb_magic_new, -1);
 
   rb_define_method(cFileMagic, "initialize", rb_magic_init,     -1);

data/ext/filemagic.h

@@ -2,8 +2,9 @@
 #define __FILEMAGIC_H_
 
 #include "ruby.h"
-#include <magic.h>
 #include <math.h>
+#include <magic.h>
+#include <file/patchlevel.h>
 
 /* Ruby 1.8.5 compatibility */
 #ifndef RSTRING_LEN

data/info/example.rb

@@ -3,26 +3,29 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'filemagic'
 
-puts FileMagic.new.flags
+p FileMagic::VERSION
+p FileMagic::MAGIC_VERSION
+
+p FileMagic.new.flags
 
 FileMagic.open(:mime) { |fm|
-  puts fm.flags
-  puts fm.file(__FILE__)
+  p fm.flags
+  p fm.file(__FILE__)
 
-  fm.setflags(:raw, :continue)
-  puts fm.flags
+  fm.flags = [:raw, :continue]
+  p fm.flags
 }
 
 fm = FileMagic.new
-puts fm.flags
+p fm.flags
 
 mime = FileMagic.mime
-puts mime.flags
+p mime.flags
 
 ARGV.each { |file|
-  puts fm.file(file)
-  puts fm.file(file, true)
+  p fm.file(file)
+  p fm.file(file, true)
 
-  puts mime.file(file)
-  puts mime.file(file, true)
+  p mime.file(file)
+  p mime.file(file, true)
 }

data/lib/filemagic.rb

@@ -1,4 +1,5 @@
 require 'filemagic.so'
+require 'filemagic/version'
 
 class FileMagic
 

data/lib/filemagic/version.rb

@@ -4,7 +4,7 @@ class FileMagic
 
     MAJOR = 0
     MINOR = 4
-    TINY  = 0
+    TINY  = 1
 
     class << self
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-filemagic
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Travis Whitton
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-14 00:00:00 +02:00
+date: 2010-09-15 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -29,6 +29,7 @@ executables: []
 extensions: 
 - ext/extconf.rb
 extra_rdoc_files: 
+- ChangeLog
 - README
 files: 
 - lib/filemagic/ext.rb
@@ -45,7 +46,7 @@ files:
 - test/filemagic_test.rb
 - test/excel-example.xls
 - README
-- CHANGELOG
+- ChangeLog
 - Rakefile
 - TODO
 - info/filemagic.rd