charlock_holmes 0.6.9 → 0.6.9.1

data/Gemfile.lock

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

data/README.md

@@ -77,12 +77,35 @@ The first parameter is the content to transcode, the second is the source encodi
 
 ## Installing
 
-If the traditional `gem install charlock_holmes` doesn't work, you may need to specify the path to your installation of ICU using the `--with-icu-dir` option during the gem install.
+If the traditional `gem install charlock_holmes` doesn't work, you may need to specify the path to
+your installation of ICU using the `--with-icu-dir` option during the gem install or by configuring Bundler to
+pass those arguments to Gem:
 
-At the time of writing, Homebrew for OSX installs ICU (icu4c is the package name) as a keg-only install so you'll have to specify the location during the gem install:
+Configure Bundler to always use the correct arguments when installing:
 
-`gem install charlock_holmes -- --with-icu-dir=/usr/local/Cellar/icu4c/4.4.1`
+    bundle config build.charlock_holmes --with-icu-dir=/path/to/installed/icu4c
 
-If you're using Bundler and need to specify a custom path(s), you can do so with the `bundle config` command:
+Using Gem to install directly without Bundler:
 
-`bundle config build.charlock_holmes --with-icu-dir=/usr/local/Cellar/icu4c/4.4.1`
+    gem install charlock_holmes -- --with-icu-dir=/path/to/installed/icu4c
+
+
+### Homebrew
+
+If you're installing on Mac OS X then using [Homebrew](http://mxcl.github.com/homebrew/) is
+the easiest way to install ICU.
+
+However, be warned; it is a Keg-Only (see [homedir issue #167](https://github.com/mxcl/homebrew/issues/167)
+for more info) install meaning RubyGems won't find it when installing without specifying `--with-icu-dir`
+
+To install ICU with Homebrew:
+
+    brew install icu4c
+
+Configure Bundler to always use the correct arguments when installing:
+
+    bundle config build.charlock_holmes --with-icu-dir=/usr/local/opt/icu4c
+
+Using Gem to install directly without Bundler:
+
+    gem install charlock_holmes -- --with-icu-dir=/usr/local/opt/icu4c

data/ext/charlock_holmes/converter.c

@@ -15,6 +15,10 @@ static VALUE rb_converter_convert(VALUE self, VALUE rb_txt, VALUE rb_src_enc, VA
 	int32_t out_len;
 	UErrorCode status = U_ZERO_ERROR;
 
+	Check_Type(rb_txt, T_STRING);
+	Check_Type(rb_src_enc, T_STRING);
+	Check_Type(rb_dst_enc, T_STRING);
+
 	src_txt = RSTRING_PTR(rb_txt);
 	src_len = RSTRING_LEN(rb_txt);
 	src_enc = RSTRING_PTR(rb_src_enc);

data/lib/charlock_holmes/string.rb

@@ -26,7 +26,7 @@ class String
     # Returns: self
     def detect_encoding!(hint_enc=nil)
       if detected = self.detect_encoding(hint_enc)
-        self.force_encoding detected[:encoding]
+        self.force_encoding(detected[:encoding]) if detected[:encoding]
       end
       self
     end

data/lib/charlock_holmes/version.rb

@@ -1,3 +1,3 @@
 module CharlockHolmes
-  VERSION = "0.6.9"
+  VERSION = "0.6.9.1"
 end

data/spec/converter_spec.rb

@@ -26,4 +26,22 @@ describe CharlockHolmes::Converter do
     assert input.bytesize == output.bytesize
     assert input == output
   end
+
+  test 'all params must be strings' do
+    assert_raises TypeError do
+      CharlockHolmes::Converter.convert nil, 'UTF-8', 'UTF-16'
+    end
+
+    assert_raises TypeError do
+      CharlockHolmes::Converter.convert 'lol', nil, 'UTF-16'
+    end
+
+    assert_raises TypeError do
+      CharlockHolmes::Converter.convert 'lol', 'UTF-8', nil
+    end
+
+    assert_nothing_raised do
+      CharlockHolmes::Converter.convert 'lol', 'UTF-8', 'UTF-16'
+    end
+  end
 end

metadata

@@ -1,72 +1,80 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: charlock_holmes
-version: !ruby/object:Gem::Version
-  version: 0.6.9
+version: !ruby/object:Gem::Version 
+  hash: 89
   prerelease: 
+  segments: 
+  - 0
+  - 6
+  - 9
+  - 1
+  version: 0.6.9.1
 platform: ruby
-authors:
+authors: 
 - Brian Lopez
-- Vicent Martí
+- "Vicent Mart\xC3\xAD"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-10 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-01-31 00:00:00 -08:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.7.5
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 0
+        - 7
+        - 5
         version: 0.7.5
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.0
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
         version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: chardet
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: chardet
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: 
 email: seniorlopez@gmail.com
 executables: []
-extensions:
+
+extensions: 
 - ext/charlock_holmes/extconf.rb
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
 - Gemfile
@@ -98,32 +106,41 @@ files:
 - spec/fixtures/repl2.cljs
 - spec/spec_helper.rb
 - spec/string_method_spec.rb
+has_rdoc: true
 homepage: http://github.com/brianmario/charlock_holmes
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --charset=UTF-8
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_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"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Character encoding detection, brought to you by ICU
-test_files:
+test_files: 
 - spec/converter_spec.rb
 - spec/encoding_detector_spec.rb
 - spec/fixtures/AnsiGraph.psm1