From 17e2cdf0fe587a8bef9954251de868e678a1fa06 Mon Sep 17 00:00:00 2001 From: Guillaume Cottenceau Date: Sun, 5 Sep 2010 23:11:58 +0200 Subject: [PATCH 1/1] ruby 1.9 array stringification has changed, I need to use iconv the proper way now --- lib/booh/booh-lib.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/booh/booh-lib.rb b/lib/booh/booh-lib.rb index 0f034cd..cbead63 100644 --- a/lib/booh/booh-lib.rb +++ b/lib/booh/booh-lib.rb @@ -55,7 +55,7 @@ module Booh def utf8(string) begin - return Iconv::iconv("UTF-8", $CURRENT_CHARSET, string).to_s + return Iconv.conv("UTF-8", $CURRENT_CHARSET, string) rescue return "???" end @@ -63,7 +63,7 @@ module Booh def utf8cut(string, maxlen) begin - return Iconv::iconv("UTF-8", $CURRENT_CHARSET, string[0..maxlen-1]).to_s + return Iconv.conv("UTF-8", $CURRENT_CHARSET, string[0..maxlen-1]) rescue Iconv::InvalidCharacter return utf8cut(string, maxlen-1) rescue @@ -92,12 +92,12 @@ module Booh end def from_utf8(string) - return Iconv::iconv($CURRENT_CHARSET, "UTF-8", string).to_s + return Iconv.conv($CURRENT_CHARSET, "UTF-8", string) end def from_utf8_safe(string) begin - return Iconv::iconv($CURRENT_CHARSET, "UTF-8", string).to_s + return Iconv.conv($CURRENT_CHARSET, "UTF-8", string) rescue Iconv::IllegalSequence return '' end -- 2.30.4