diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-25 07:04:38 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-25 07:04:38 +0000 |
commit | b4876f5e0422e020d617b77145a492c5bc327f08 (patch) | |
tree | 53a232de142804533aa235f9a34b6add1c829a88 | |
parent | d05217109fb5e909bbd7849bcc799b6404c7c8b0 (diff) | |
download | ruby-b4876f5e0422e020d617b77145a492c5bc327f08.tar.gz |
* lib/csv.rb (CSV::foreach, CSV#initialize): directly use encoding
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30354 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | lib/csv.rb | 8 | ||||
-rwxr-xr-x | test/csv/test_encodings.rb | 7 |
3 files changed, 9 insertions, 10 deletions
@@ -1,4 +1,6 @@ -Sat Dec 25 15:58:55 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sat Dec 25 16:04:34 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/csv.rb (CSV::foreach, CSV#initialize): directly use encoding * lib/csv.rb, test/csv: should not assume $, invariant. diff --git a/lib/csv.rb b/lib/csv.rb index 1ad019a269..266810cb93 100644 --- a/lib/csv.rb +++ b/lib/csv.rb @@ -1203,10 +1203,7 @@ class CSV # but transcode it to UTF-8 before CSV parses it. # def self.foreach(path, options = Hash.new, &block) - encoding = options.delete(:encoding) - mode = "rb" - mode << ":#{encoding}" if encoding - open(path, mode, options) do |csv| + open(path, 'rb', options) do |csv| csv.each(&block) end end @@ -1564,7 +1561,8 @@ class CSV # create the IO object we will read from @io = data.is_a?(String) ? StringIO.new(data) : data # honor the IO encoding if we can, otherwise default to ASCII-8BIT - @encoding = raw_encoding || Encoding.default_internal || + @encoding = options.delete(:internal_encoding) || options.delete(:encoding) || + raw_encoding || Encoding.default_internal || Encoding.default_external # # prepare for building safe regular expressions in the target encoding, diff --git a/test/csv/test_encodings.rb b/test/csv/test_encodings.rb index 6681470097..0f2ec127c5 100755 --- a/test/csv/test_encodings.rb +++ b/test/csv/test_encodings.rb @@ -154,10 +154,9 @@ class TestCSV::Encodings < TestCSV def test_foreach_allows_you_to_set_encodings encode_for_tests([%w[abc def]]) do |data| # read and write in encoding - File.open(@temp_csv_path, "wb:#{data.encoding.name}") { |f| f << data } - CSV.foreach(@temp_csv_path, encoding: data.encoding.name) do |row| - assert( row.all? { |f| f.encoding == data.encoding }, - "Wrong data encoding." ) + File.open(@temp_csv_path, "wb", encoding: data.encoding) { |f| f << data } + CSV.foreach(@temp_csv_path, encoding: data.encoding) do |row| + row.each {|f| assert_equal(f.encoding, data.encoding)} end # read and write with transcoding |