diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | lib/csv.rb | 24 |
2 files changed, 24 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Sat Dec 27 01:52:39 2008 James Edward Gray II <jeg2@ruby-lang.org> + + * lib/csv.rb: Using a more robust transcoding scheme to produce + ASCII compatible inspect() messages. [ruby-dev:37591] + Mon Dec 22 16:32:21 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * pack.c (pack_pack): encoding of packed string only from 'm', diff --git a/lib/csv.rb b/lib/csv.rb index 6fb5da4d79..fd83fdc354 100644 --- a/lib/csv.rb +++ b/lib/csv.rb @@ -199,7 +199,7 @@ require "stringio" # class CSV # The version of the installed library. - VERSION = "2.4.4".freeze + VERSION = "2.4.5".freeze # # A CSV::Row is part Array and part Hash. It retains an order for the fields @@ -487,7 +487,7 @@ class CSV end alias_method :to_s, :to_csv - # A summary of fields, by header, in an ASCII-8BIT String. + # A summary of fields, by header, in an ASCII compatible String. def inspect str = ["#<", self.class.to_s] each do |header, field| @@ -495,7 +495,14 @@ class CSV ":" << field.inspect end str << ">" - str.map { |s| s.encode("ASCII-8BIT") }.join + begin + str.join + rescue # any encoding error + str.map do |s| + e = Encoding::Converter.asciicompat_encoding(s.encoding) + e ? s.encode(e) : s.force_encoding("ASCII-8BIT") + end.join + end end end @@ -1899,7 +1906,7 @@ class CSV # # Returns a simplified description of the key FasterCSV attributes in an - # ASCII-8BIT String. + # ASCII compatible String. # def inspect str = ["<#", self.class.to_s, " io_type:"] @@ -1926,7 +1933,14 @@ class CSV str << " headers:" << headers.inspect end str << ">" - str.map { |s| s.encode("ASCII-8BIT") }.join + begin + str.join + rescue # any encoding error + str.map do |s| + e = Encoding::Converter.asciicompat_encoding(s.encoding) + e ? s.encode(e) : s.force_encoding("ASCII-8BIT") + end.join + end end private |