mahoro 0.3 → 0.4

data/{test.rb → test/test_mahoro.rb}

@@ -2,16 +2,35 @@
 
 require 'test/unit'
 require 'mahoro'
+require 'mahoro/thread_safe'
+require 'pathname'
 
 class MahoroTestCase < Test::Unit::TestCase
+	C_FILE = "#{File.dirname(__FILE__)}/../ext/mahoro/mahoro.c"
 
 	def setup
 		@m = Mahoro.new
 	end
 
+	# Different versions of libmagic may generate different values.
+	# So far, we have seen:
+	# - ASCII C program text
+	# - C source, ASCII text
+	def assert_c_text(buf)
+		assert_match(/\bC\b/, buf, "contains the letter C")
+		assert_match(/\s/, buf, "contains spaces")
+		assert_match(/(?:source|text)/, buf, "is source or text")
+	end
+
+	def test_pathname
+		@m.flags = Mahoro::NONE
+                pn = Pathname.new(C_FILE)
+		assert_c_text(@m.file(pn))
+	end
+
 	def test_file
 		@m.flags = Mahoro::NONE
-		assert_equal('ASCII C program text', @m.file('mahoro.c'))
+		assert_c_text(@m.file(C_FILE))
 	end
 
 	def test_mime_file
@@ -19,23 +38,22 @@ class MahoroTestCase < Test::Unit::TestCase
 		assert({
 		  'text/x-c; charset=us-ascii' => true,
 		  'text/x-c charset=us-ascii' => true
-		}.include?(@m.file('mahoro.c')))
+		}.include?(@m.file(C_FILE)))
 	end
 
 	def test_null_byte_in_path
-		assert_raises(ArgumentError) { @m.file("mahoro.c\0foo") }
+		assert_raises(ArgumentError) { @m.file("#{C_FILE}\0foo") }
 	end
 
 	def test_buffer
 		@m.flags = Mahoro::NONE
-		assert_equal('ASCII C program text',
-		             @m.buffer(File.read('mahoro.c')))
+		assert_c_text(@m.buffer(File.read(C_FILE)))
 	end
 
 	def test_buffer_string_convert
-		tmp = File.read('mahoro.c')
+		tmp = File.read(C_FILE)
 		buf = Struct.new(:to_str).new(tmp)
-		assert_equal('ASCII C program text', @m.buffer(buf))
+		assert_c_text(@m.buffer(buf))
 	end
 
 	def test_buffer_invalid
@@ -48,7 +66,7 @@ class MahoroTestCase < Test::Unit::TestCase
 		assert({
 		  'text/x-c; charset=us-ascii' => true,
 		  'text/x-c charset=us-ascii' => true
-		}.include?(@m.buffer(File.read('mahoro.c'))))
+		}.include?(@m.buffer(File.read(C_FILE))))
 	end
 
 	def test_valid
@@ -56,7 +74,7 @@ class MahoroTestCase < Test::Unit::TestCase
 	end
 
 	def test_valid_with_null
-		assert_raises(ArgumentError) { @m.valid? "mahoro.c\0" }
+		assert_raises(ArgumentError) { @m.valid? "#{C_FILE}\0" }
 	end
 
 	def test_compile
@@ -74,6 +92,14 @@ class MahoroTestCase < Test::Unit::TestCase
 			Mahoro.compile "magic.sample\0"
 		end
 	end
+
+	def test_thread_safe
+		before = @m.method(:file)
+		@m.extend(Mahoro::ThreadSafe)
+		@m.flags = Mahoro::NONE
+		assert_c_text(@m.file(C_FILE))
+		assert_not_equal(before.object_id, @m.method(:file).object_id)
+	end
 end
 
 # arch-tag: test

metadata

@@ -1,69 +1,71 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mahoro
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: "0.3"
+version: !ruby/object:Gem::Version
+  version: '0.4'
 platform: ruby
-authors: 
+authors:
 - Shu-yu Guo
 - Eric Wong
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-15 00:00:00 +00:00
-default_executable: 
+date: 2013-04-05 00:00:00.000000000 Z
 dependencies: []
-
 description: |-
   An interface to libmagic to determine file types using "magic" numbers.
   This can be used in place of calling the file(1) command in Ruby scripts.
   Shu-yu Guo is the original author but all maintenance is handled by
   Eric Wong nowadays.
-  
+
   source: http://bogomips.org/mahoro.git/
+  documentation: http://bogomips.org/mahoro/
 email: normalperson@yhbt.net
 executables: []
-
-extensions: 
-- extconf.rb
-extra_rdoc_files: []
-
-files: 
+extensions:
+- ext/mahoro/extconf.rb
+extra_rdoc_files:
+- ext/mahoro/mahoro.c
+files:
+- .gitignore
+- GNUmakefile
 - INSTALL
-- extconf.rb
+- README
+- ext/mahoro/extconf.rb
+- ext/mahoro/mahoro.c
+- ext/mahoro/nogvl_compat.h
+- lib/mahoro/thread_safe.rb
 - magic.sample
-- mahoro.c
 - mahoro.gemspec
 - maintainership-transfer.mbox.gz
-- test.rb
-has_rdoc: true
-homepage: http://mahoro.rubyforge.org/
-licenses: 
+- setup.rb
+- test/test_mahoro.rb
+- www/.gitignore
+homepage: http://bogomips.org/mahoro/README
+licenses:
 - Public Domain
+metadata: {}
 post_install_message: 
-rdoc_options: []
-
-require_paths: 
+rdoc_options:
+- --exclude
+- \.o
+- --exclude
+- \.so
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: mahoro
-rubygems_version: 1.6.2
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: An interface to libmagic
-test_files: 
-- test.rb
+test_files: []

data/mahoro.c

@@ -1,320 +0,0 @@
-/*
- * This file is Public Domain.
- */
-
-#include <ruby.h>
-#include <magic.h>
-
-#ifndef RSTRING_LEN
-#  define RSTRING_LEN(s)->len
-#endif
-#ifndef RSTRING_PTR
-#  define RSTRING_PTR(s)->ptr
-#endif
-
-static VALUE cMahoro;
-static VALUE eMahoroError;
-
-static void
-mahoro_free(ptr)
-	void *ptr;
-{
-	if (ptr)
-		magic_close((magic_t)ptr);
-}
-
-static VALUE
-mahoro_allocate(klass)
-	VALUE klass;
-{
-	return Data_Wrap_Struct(klass, 0, mahoro_free, 0);
-}
-
-static VALUE
-mahoro_initialize(argc, argv, self)
-	int argc;
-	VALUE *argv, self;
-{
-	int flags = MAGIC_NONE;
-	char *path = 0;
-	magic_t cookie;
-	VALUE vpath, vflags;
-
-	switch(rb_scan_args(argc, argv, "02", &vflags, &vpath)) {
-		case 2:
-			if(!NIL_P(vpath)) {
-				path = StringValueCStr(vpath);
-			}
-			/* fallthrough */
-		case 1:
-			flags = FIX2INT(vflags);
-			break;
-	}
-
-	if(!(cookie = magic_open(flags))) {
-		rb_raise(eMahoroError, "failed to initialize magic cookie");
-	}
-
-	if(magic_load(cookie, path)) {
-		rb_raise(eMahoroError, "failed to load database: %s",
-		                      magic_error(cookie));
-	}
-
-	DATA_PTR(self) = cookie;
-
-	return self;
-}
-
-static VALUE
-mahoro_file(self, path)
-	VALUE self, path;
-{
-	const char *msg;
-	magic_t cookie = (magic_t)DATA_PTR(self);
-
-	if(!(msg = magic_file(cookie, StringValueCStr(path)))) {
-		rb_raise(eMahoroError, "failed lookup: %s", magic_error(cookie));
-	}
-
-	return rb_str_new2(msg);
-}
-
-static VALUE
-mahoro_buffer(self, input)
-	VALUE self, input;
-{
-	const char *msg;
-	magic_t cookie = (magic_t)DATA_PTR(self);
-
-	StringValue(input);
-
-	if(!(msg = magic_buffer(cookie, RSTRING_PTR(input),
-	                                RSTRING_LEN(input)))) {
-		rb_raise(eMahoroError, "failed lookup: %s", magic_error(cookie));
-	}
-
-	return rb_str_new2(msg);
-}
-
-static VALUE
-mahoro_set_flags(self, flags)
-	VALUE self, flags;
-{
-	magic_t cookie = (magic_t)DATA_PTR(self);
-
-	return INT2FIX(magic_setflags(cookie, FIX2INT(flags)));
-}
-
-static VALUE
-mahoro_check(argc, argv, self)
-	int argc;
-	VALUE *argv, self;
-{
-	char *path = 0;
-	VALUE vpath;
-	magic_t cookie = (magic_t)DATA_PTR(self);
-
-	switch(rb_scan_args(argc, argv, "01", &vpath)) {
-		case 1:
-			if(!NIL_P(vpath)) {
-				path = StringValueCStr(vpath);
-			}
-			break;
-	}
-
-	if(!magic_check(cookie, path)) {
-		return Qtrue;
-	} else {
-		return Qfalse;
-	}
-}
-
-static VALUE
-mahoro_compile(self, path)
-	VALUE self, path;
-{
-	magic_t cookie = (magic_t)DATA_PTR(self);
-
-	if(magic_compile(cookie, StringValueCStr(path))) {
-		rb_raise(eMahoroError, "failed compile: %s", magic_error(cookie));
-	}
-
-	return Qtrue;
-}
-
-static VALUE
-mahoro_s_compile(klass, path)
-	VALUE klass, path;
-{
-	VALUE m = rb_funcall(klass, rb_intern("new"), 0, 0);
-
-	return mahoro_compile(m, path);
-}
-
-static VALUE
-mahoro_load(self, path)
-	VALUE self, path;
-{
-	magic_t cookie = (magic_t)DATA_PTR(self);
-
-	if(magic_load(cookie, StringValueCStr(path))) {
-		rb_raise(eMahoroError, "failed load: %s", magic_error(cookie));
-	}
-
-	return self;
-}
-
-void Init_mahoro(void)
-{
-	cMahoro      = rb_define_class("Mahoro", rb_cObject);
-	eMahoroError = rb_define_class_under(cMahoro, "Error", rb_eStandardError);
-
-	/* No special handling, the default */
-	rb_define_const(cMahoro, "NONE", INT2FIX(MAGIC_NONE));
-
-	/* print debugging messages to stderr */
-	rb_define_const(cMahoro, "DEBUG", INT2FIX(MAGIC_DEBUG));
-
-	/* Follow symlinks */
-	rb_define_const(cMahoro, "SYMLINK", INT2FIX(MAGIC_SYMLINK));
-
-	/* Check inside compressed files */
-	rb_define_const(cMahoro, "COMPRESS", INT2FIX(MAGIC_COMPRESS));
-
-	/* Look at the contents of devices */
-	rb_define_const(cMahoro, "DEVICES", INT2FIX(MAGIC_DEVICES));
-
-#ifdef MAGIC_MIME_TYPE
-	/*
-	 * Return only the MIME type
-	 * This constant may not be defined on older systems.
-	 */
-	rb_define_const(cMahoro, "MIME_TYPE", INT2FIX(MAGIC_MIME_TYPE));
-#endif
-
-	/* Return all matches */
-	rb_define_const(cMahoro, "CONTINUE", INT2FIX(MAGIC_CONTINUE));
-
-	/*
-	 * Check the magic database for consistency and
-	 * print warnings to stderr
-	 */
-	rb_define_const(cMahoro, "CHECK", INT2FIX(MAGIC_CHECK));
-
-	/* preserve access time of files analyzed */
-	rb_define_const(cMahoro, "PRESERVE_ATIME",
-	                      INT2FIX(MAGIC_PRESERVE_ATIME));
-
-	/*
-	 * Don't translate unprintable characters to a \\ooo octal
-	 * representation
-	 */
-	rb_define_const(cMahoro, "RAW", INT2FIX(MAGIC_RAW));
-
-	/*
-	 * Treat operating system errors while trying to open files
-	 * and follow symlinks as real errors, instead of printing
-	 * them in the magic buffer.
-	 */
-	rb_define_const(cMahoro, "ERROR", INT2FIX(MAGIC_ERROR));
-
-#ifdef MAGIC_MIME_ENCODING
-	/*
-	 * Return a MIME encoding, instead of a textual description.
-	 * This constant may not be defined on older systems.
-	 */
-	rb_define_const(cMahoro, "MIME_ENCODING", INT2FIX(MAGIC_MIME_ENCODING));
-#endif
-
-	/* return both MIME type and encoding */
-	rb_define_const(cMahoro, "MIME", INT2FIX(MAGIC_MIME));
-
-#ifdef MAGIC_APPLE
-	/*
-	 * Return both Apple creator and type.
-	 * This constant may not be defined on older systems.
-	 */
-	rb_define_const(cMahoro, "APPLE", INT2FIX(MAGIC_APPLE));
-#endif
-
-#ifdef MAGIC_NO_CHECK_COMPRESS
-	/*
-	 * Don't check for or inside compressed files.
-	 * This constant may not be defined on older systems.
-	 */
-	rb_define_const(cMahoro, "NO_CHECK_COMPRESS",
-		        INT2FIX(MAGIC_NO_CHECK_COMPRESS));
-#endif
-
-#ifdef MAGIC_NO_CHECK_TAR
-	/*
-	 * Don't examine tar files.
-	 * This constant may not be defined on older systems.
-	 */
-	rb_define_const(cMahoro, "NO_CHECK_TAR", INT2FIX(MAGIC_NO_CHECK_TAR));
-#endif
-
-#ifdef MAGIC_NO_CHECK_SOFT
-	/*
-	 * Don't consult magic files.
-	 * This constant may not be defined on older systems.
-	 */
-	rb_define_const(cMahoro, "NO_CHECK_SOFT", INT2FIX(MAGIC_NO_CHECK_SOFT));
-#endif
-
-#ifdef MAGIC_NO_CHECK_APPTYPE
-	/*
-	 * Don't check application type (EMX only).
-	 * This constant may not be defined on older systems.
-	 */
-	rb_define_const(cMahoro, "NO_CHECK_APPTYPE",
-	                INT2FIX(MAGIC_NO_CHECK_APPTYPE));
-#endif
-
-#ifdef MAGIC_NO_CHECK_ELF
-	/*
-	 * Don't check for ELF details.
-	 * This constant may not be defined on older systems.
-	 */
-	rb_define_const(cMahoro, "NO_CHECK_ELF", INT2FIX(MAGIC_NO_CHECK_ELF));
-#endif
-
-#ifdef MAGIC_NO_CHECK_ASCII
-	/*
-	 * Don't check for various types of ASCII text files.
-	 * This constant may not be defined on older systems.
-	 */
-	rb_define_const(cMahoro, "NO_CHECK_TEXT",
-	                INT2FIX(MAGIC_NO_CHECK_ASCII));
-#endif
-
-#ifdef MAGIC_NO_CHECK_TOKENS
-	/*
-	 * Don't check for known tokens inside ASCII files.
-	 * This constant may not be defined on older systems.
-	 */
-	rb_define_const(cMahoro, "NO_CHECK_TOKENS",
-	                INT2FIX(MAGIC_NO_CHECK_TOKENS));
-#endif
-
-#ifdef MAGIC_NO_CHECK_ENCODING
-	/*
-	 * Don't check for text encodings.
-	 * This constant may not be defined on older systems.
-	 */
-	rb_define_const(cMahoro, "NO_CHECK_ENCODING",
-	                INT2FIX(MAGIC_NO_CHECK_ENCODING));
-#endif
-
-	rb_define_alloc_func(cMahoro, mahoro_allocate);
-	rb_define_method(cMahoro, "initialize", mahoro_initialize, -1);
-	rb_define_method(cMahoro, "file", mahoro_file, 1);
-	rb_define_method(cMahoro, "buffer", mahoro_buffer, 1);
-	rb_define_method(cMahoro, "flags=", mahoro_set_flags, 1);
-	rb_define_method(cMahoro, "valid?", mahoro_check, -1);
-	rb_define_singleton_method(cMahoro, "compile", mahoro_s_compile, 1);
-	rb_define_method(cMahoro, "compile", mahoro_compile, 1);
-	rb_define_method(cMahoro, "load", mahoro_load, 1);
-}
-
-/* arch-tag: mahoro */