eightball 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/eightball.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "eightball"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Scruggs"]
-  s.date = "2011-12-06"
+  s.date = "2011-12-16"
   s.description = "force a string to utf8 and be sure of it"
   s.email = "ascruggs@academicworks.com"
   s.extra_rdoc_files = [

data/lib/eightball.rb

@@ -2,12 +2,18 @@ require 'iconv'
 module Eightball
 
 	def eightball
-		string = self.dup
-		string.force_encoding("UTF-8")
-		#http://po-ru.com/diary/fixing-invalid-utf-8-in-ruby-revisited/
-		ic = Iconv.new('UTF-8//IGNORE', 'UTF-8')
-		string = ic.iconv(string + ' ')[0..-2]
-		#drop the BOM
+		string = self.encode(Encoding::UTF_8, :invalid => :replace, :undef => :replace)
+		begin
+    		string.empty?
+  		rescue ArgumentError => e
+	    	if e.message == "invalid byte sequence in UTF-8"
+	      		Thread.current["iconv"] ||= Iconv.new('UTF-8//IGNORE', 'UTF-8')
+	      		string = Thread.current["iconv"].iconv(string)
+	    	else
+	      		raise
+	    	end
+  		end
+  		#drop the BOM
 		string.gsub!("\xEF\xBB\xBF".force_encoding("UTF-8"), '')
 		string
 	end

data/test/test_eightball.rb

@@ -1,7 +1,10 @@
+# encoding: UTF-8
+
 require 'helper'
 
 class TestEightball < Test::Unit::TestCase
-  should "return string when called" do
-    assert "test", "test".eightball
+  should "return utf-8 when utf-8 is called" do
+    assert_equal "ウabcé", "ウabcé".encode("utf-8")
   end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eightball
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-06 00:00:00.000000000 Z
+date: 2011-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70189397507820 !ruby/object:Gem::Requirement
+  requirement: &70267520205040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70189397507820
+  version_requirements: *70267520205040
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70189397507300 !ruby/object:Gem::Requirement
+  requirement: &70267520204460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70189397507300
+  version_requirements: *70267520204460
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70189397506820 !ruby/object:Gem::Requirement
+  requirement: &70267520203900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70189397506820
+  version_requirements: *70267520203900
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70189397506320 !ruby/object:Gem::Requirement
+  requirement: &70267520203140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70189397506320
+  version_requirements: *70267520203140
 description: force a string to utf8 and be sure of it
 email: ascruggs@academicworks.com
 executables: []
@@ -89,7 +89,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1799542009762585437
+      hash: -3931273327073318850
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: