diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | lib/pstore.rb | 7 | ||||
-rw-r--r-- | test/test_pstore.rb | 18 |
3 files changed, 26 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Tue Sep 13 15:02:48 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/pstore.rb (PStore): always open in binary mode even if + default encodings are set. [Bug #5311] [ruby-core:39503] + Tue Sep 13 05:37:15 2011 Yukihiro Matsumoto <matz@ruby-lang.org> * io.c (Init_IO): update BINARY comment. it should not change the diff --git a/lib/pstore.rb b/lib/pstore.rb index 9fb0249f3c..020b028666 100644 --- a/lib/pstore.rb +++ b/lib/pstore.rb @@ -94,10 +94,9 @@ require "thread" # Needless to say, if you're storing valuable data with PStore, then you should # backup the PStore files from time to time. class PStore - binmode = defined?(File::BINARY) ? File::BINARY : 0 - RDWR_ACCESS = File::RDWR | File::CREAT | binmode - RD_ACCESS = File::RDONLY | binmode - WR_ACCESS = File::WRONLY | File::CREAT | File::TRUNC | binmode + RDWR_ACCESS = {mode: IO::RDWR | IO::CREAT | IO::BINARY, encoding: Encoding::ASCII_8BIT}.freeze + RD_ACCESS = {mode: IO::RDONLY | IO::BINARY, encoding: Encoding::ASCII_8BIT}.freeze + WR_ACCESS = {mode: IO::WRONLY | IO::CREAT | IO::TRUNC | IO::BINARY, encoding: Encoding::ASCII_8BIT}.freeze # The error type thrown by all PStore methods. class Error < StandardError diff --git a/test/test_pstore.rb b/test/test_pstore.rb index b5deb9f359..21831903cf 100644 --- a/test/test_pstore.rb +++ b/test/test_pstore.rb @@ -1,5 +1,6 @@ require 'test/unit' require 'pstore' +require_relative 'ruby/envutil' class PStoreTest < Test::Unit::TestCase def setup @@ -110,4 +111,21 @@ class PStoreTest < Test::Unit::TestCase pstore.transaction { pstore.transaction { } } end end + + # Test that PStore's file operations do not blow up when default encodings are set + def test_pstore_files_are_accessed_as_binary_files + bug5311 = '[ruby-core:39503]' + n = 128 + assert_in_out_err(["-rpstore", "-", @pstore_file], <<-SRC, [bug5311], [], bug5311) + @pstore = PStore.new(ARGV[0]) + Encoding.default_internal = 'utf-8' + Encoding.default_external = 'utf-8' + (1..#{n}).each do |i| + @pstore.transaction {@pstore["Key\#{i}"] = "value \#{i}"} + end + @pstore.transaction {@pstore["Bug5311"] = '#{bug5311}'} + puts @pstore.transaction {@pstore["Bug5311"]} + SRC + assert_equal(bug5311, @pstore.transaction {@pstore["Bug5311"]}, bug5311) + end end |