charlock_holmes 0.6.0 → 0.6.2

data/Gemfile.lock

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

data/README.md

@@ -81,7 +81,7 @@ If the traditional `gem install charlock_holmes` doesn't work, you may need to s
 
 At the time of writing, Homebrew for OSX installs ICU (icu4c is the package name) and libmagic as keg-only installs so you'll have to specify the location during the gem install:
 
-`gem install charlock_holmes --with-icu-dir=/usr/local/Cellar/icu4c/4.4.1 --with-magic-dir=/usr/local/Cellar/libmagic/5.04`
+`gem install charlock_holmes -- --with-icu-dir=/usr/local/Cellar/icu4c/4.4.1 --with-magic-dir=/usr/local/Cellar/libmagic/5.04`
 
 If you're using Bundler and need to specify a custom path(s), you can do so with the `bundle config` command:
 

data/ext/charlock_holmes/converter.c

@@ -25,24 +25,24 @@ static VALUE rb_converter_convert(VALUE self, VALUE rb_txt, VALUE rb_src_enc, VA
 	if (status != U_BUFFER_OVERFLOW_ERROR) {
 		rb_raise(rb_eArgError, u_errorName(status));
 	}
-	out_buf = xmalloc(out_len);
+	out_buf = malloc(out_len);
 
 	// now do the actual conversion
 	status = U_ZERO_ERROR;
 	out_len = ucnv_convert(dst_enc, src_enc, out_buf, out_len, src_txt, src_len, &status);
 	if (U_FAILURE(status)) {
-		xfree(out_buf);
+		free(out_buf);
 		rb_raise(rb_eArgError, u_errorName(status));
 	}
 
-	xfree(out_buf);
-
 #ifdef HAVE_RUBY_ENCODING_H
 	(rb_encoding *)rb_enc = rb_enc_find(dst_enc);
 #endif
 
 	rb_out = charlock_new_enc_str(out_buf, out_len, rb_enc);
 
+	free(out_buf);
+
 	return rb_out;
 }
 

data/ext/charlock_holmes/encoding_detector.c

@@ -260,6 +260,8 @@ static void rb_encdec__free(void *obj)
 
 	if (detector->magic)
 		magic_close(detector->magic);
+
+	free(detector);
 }
 
 static VALUE rb_encdec__alloc(VALUE klass)
@@ -268,7 +270,8 @@ static VALUE rb_encdec__alloc(VALUE klass)
 	UErrorCode status = U_ZERO_ERROR;
 	VALUE obj;
 
-	obj = Data_Make_Struct(klass, charlock_detector_t, NULL, rb_encdec__free, (void *)detector);
+	detector = malloc(sizeof(charlock_detector_t*));
+	obj = Data_Wrap_Struct(klass, NULL, rb_encdec__free, (void *)detector);
 
 	detector->csd = ucsdet_open(&status);
 	if (U_FAILURE(status)) {

data/ext/charlock_holmes/extconf.rb

@@ -1,7 +1,7 @@
 require 'mkmf'
 
 $CFLAGS << ' -Wall -funroll-loops'
-$CFLAGS << ' -Wextra -O0 -ggdb3' if ENV['DEBUG']
+$CFLAGS << ' -Wextra -O0 -ggdb3' #if ENV['DEBUG']
 
 dir_config 'icu'
 $CFLAGS  << ' -I/usr/local/Cellar/icu4c/4.4.1/include'

data/lib/charlock_holmes/version.rb

@@ -1,3 +1,3 @@
 module CharlockHolmes
-  VERSION = "0.6.0"
+  VERSION = "0.6.2"
 end

data/spec/encoding_detector_spec.rb

@@ -112,7 +112,7 @@ describe CharlockHolmes::EncodingDetector do
         assert_equal encoding, guessed[:encoding]
         assert_equal type, guessed[:type]
 
-        if content.respond_to? :force_encoding
+        if content.respond_to?(:force_encoding) && guessed[:type] == :text
           content.force_encoding guessed[:encoding]
           assert content.valid_encoding?
         end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: charlock_holmes
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - Brian Lopez
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-27 00:00:00 -07:00
+date: 2011-08-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency