charlock_holmes 0.6.7 → 0.6.8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    charlock_holmes (0.6.7)
+    charlock_holmes (0.6.8)
 
 GEM
   remote: http://rubygems.org/

data/ext/charlock_holmes/converter.c

@@ -23,7 +23,7 @@ static VALUE rb_converter_convert(VALUE self, VALUE rb_txt, VALUE rb_src_enc, VA
 	// first determin the size of the output buffer
 	out_len = ucnv_convert(dst_enc, src_enc, NULL, 0, src_txt, src_len, &status);
 	if (status != U_BUFFER_OVERFLOW_ERROR) {
-		rb_raise(rb_eArgError, u_errorName(status));
+		rb_raise(rb_eArgError, "%s", u_errorName(status));
 	}
 	out_buf = malloc(out_len);
 
@@ -32,11 +32,11 @@ static VALUE rb_converter_convert(VALUE self, VALUE rb_txt, VALUE rb_src_enc, VA
 	out_len = ucnv_convert(dst_enc, src_enc, out_buf, out_len, src_txt, src_len, &status);
 	if (U_FAILURE(status)) {
 		free(out_buf);
-		rb_raise(rb_eArgError, u_errorName(status));
+		rb_raise(rb_eArgError, "%s", u_errorName(status));
 	}
 
 #ifdef HAVE_RUBY_ENCODING_H
-	(rb_encoding *)rb_enc = rb_enc_find(dst_enc);
+	rb_enc = (void *)rb_enc_find(dst_enc);
 #endif
 
 	rb_out = charlock_new_enc_str(out_buf, out_len, rb_enc);
@@ -50,4 +50,4 @@ void _init_charlock_converter() {
 	rb_cConverter = rb_define_class_under(rb_mCharlockHolmes, "Converter", rb_cObject);
 
 	rb_define_singleton_method(rb_cConverter, "convert", rb_converter_convert, 3);
-}
+}

data/ext/charlock_holmes/encoding_detector.c

@@ -54,14 +54,10 @@ static int detect_binary_content(charlock_detector_t *detector, VALUE rb_str) {
 	binary_result = magic_buffer(detector->magic, RSTRING_PTR(rb_str), RSTRING_LEN(rb_str));
 
 	if (binary_result) {
-		if (strstr(binary_result, "library") ||
-				strstr(binary_result, "bundle") ||
-				strstr(binary_result, "archive") ||
-				(!strstr(binary_result, "text") && strstr(binary_result, "executable")) ||
-				strstr(binary_result, "data"))
+		if (!strstr(binary_result, "text"))
 			return 1;
 	} else {
-		rb_raise(rb_eStandardError, magic_error(detector->magic));
+		rb_raise(rb_eStandardError, "%s", magic_error(detector->magic));
 	}
 
 	return 0;
@@ -275,12 +271,12 @@ static VALUE rb_encdec__alloc(VALUE klass)
 
 	detector->csd = ucsdet_open(&status);
 	if (U_FAILURE(status)) {
-		rb_raise(rb_eStandardError, u_errorName(status));
+		rb_raise(rb_eStandardError, "%s", u_errorName(status));
 	}
 
 	detector->magic = magic_open(0);
 	if (detector->magic == NULL) {
-		rb_raise(rb_eStandardError, magic_error(detector->magic));
+		rb_raise(rb_eStandardError, "%s", magic_error(detector->magic));
 	}
 
 	// load the libmagic database

data/ext/charlock_holmes/extconf.rb

@@ -58,8 +58,8 @@ Dir.chdir("#{CWD}/src") do
   sys("tar zxvf #{src}")
   Dir.chdir(dir) do
     sys("./configure --prefix=#{CWD}/dst/ --disable-shared --enable-static --with-pic")
-    sys("make")
-    sys("make install")
+    sys("make -C src install")
+    sys("make -C magic install")
   end
 end
 

data/lib/charlock_holmes/version.rb

@@ -1,3 +1,3 @@
 module CharlockHolmes
-  VERSION = "0.6.7"
+  VERSION = "0.6.8"
 end

data/spec/encoding_detector_spec.rb

@@ -104,7 +104,7 @@ describe CharlockHolmes::EncodingDetector do
     MAPPING.each do |mapping|
       file, encoding, type = mapping
 
-      test "#{file} should be detected as #{encoding}" do
+      test "#{file} should be detected as #{encoding || 'binary'}" do
         path = File.expand_path "../fixtures/#{file}", __FILE__
         content = File.read path
         guessed = @detector.detect content

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: charlock_holmes
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 6
-  - 7
-  version: 0.6.7
+  - 8
+  version: 0.6.8
 platform: ruby
 authors: 
 - Brian Lopez
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-07 00:00:00 -07:00
+date: 2011-09-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency