diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/pstore.rb | 11 | ||||
| -rw-r--r-- | lib/yaml/store.rb | 16 | ||||
| -rw-r--r-- | test/yaml/test_yamlstore.rb | 74 |
4 files changed, 103 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Fri Apr 11 16:42:33 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * lib/yaml/store.rb (YAML::load): modified to support empty + database. + Fri Apr 11 08:05:12 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * marshal.c (w_object): add volatile to avoid potential GC bug. a diff --git a/lib/pstore.rb b/lib/pstore.rb index 54d4e7c3a6..a1ad768fbf 100644 --- a/lib/pstore.rb +++ b/lib/pstore.rb @@ -413,8 +413,8 @@ class PStore if data.empty? # This seems to be a newly-created file. table = {} - checksum = EMPTY_MARSHAL_CHECKSUM - size = EMPTY_MARSHAL_DATA.size + checksum = empty_marshal_checksum + size = empty_marshal_data.size else table = load(data) checksum = Digest::MD5.digest(data) @@ -511,6 +511,13 @@ class PStore def load(content) # :nodoc: Marshal::load(content) end + + def empty_marshal_data + EMPTY_MARSHAL_DATA + end + def empty_marshal_checksum + EMPTY_MARSHAL_CHECKSUM + end end # :enddoc: diff --git a/lib/yaml/store.rb b/lib/yaml/store.rb index 4f0384cc5e..e3a8e9fcdd 100644 --- a/lib/yaml/store.rb +++ b/lib/yaml/store.rb @@ -20,10 +20,24 @@ class YAML::Store < PStore end def load(content) - YAML::load(content) + table = YAML::load(content) + if table == false + {} + else + table + end end def marshal_dump_supports_canonical_option? false end + + EMPTY_MARSHAL_DATA = {}.to_yaml + EMPTY_MARSHAL_CHECKSUM = Digest::MD5.digest(EMPTY_MARSHAL_DATA) + def empty_marshal_data + EMPTY_MARSHAL_DATA + end + def empty_marshal_checksum + EMPTY_MARSHAL_CHECKSUM + end end diff --git a/test/yaml/test_yamlstore.rb b/test/yaml/test_yamlstore.rb new file mode 100644 index 0000000000..7a3d90469e --- /dev/null +++ b/test/yaml/test_yamlstore.rb @@ -0,0 +1,74 @@ +require 'test/unit' +require 'yaml/store' + +class YAMLStoreTest < Test::Unit::TestCase + def setup + @yamlstore_file = "yamlstore.tmp.#{Process.pid}" + @yamlstore = YAML::Store.new(@yamlstore_file) + end + + def teardown + File.unlink(@yamlstore_file) rescue nil + end + + def test_opening_new_file_in_readonly_mode_should_result_in_empty_values + @yamlstore.transaction(true) do + assert_nil @yamlstore[:foo] + assert_nil @yamlstore[:bar] + end + end + + def test_opening_new_file_in_readwrite_mode_should_result_in_empty_values + @yamlstore.transaction do + assert_nil @yamlstore[:foo] + assert_nil @yamlstore[:bar] + end + end + + def test_data_should_be_loaded_correctly_when_in_readonly_mode + @yamlstore.transaction do + @yamlstore[:foo] = "bar" + end + @yamlstore.transaction(true) do + assert_equal "bar", @yamlstore[:foo] + end + end + + def test_data_should_be_loaded_correctly_when_in_readwrite_mode + @yamlstore.transaction do + @yamlstore[:foo] = "bar" + end + @yamlstore.transaction do + assert_equal "bar", @yamlstore[:foo] + end + end + + def test_changes_after_commit_are_discarded + @yamlstore.transaction do + @yamlstore[:foo] = "bar" + @yamlstore.commit + @yamlstore[:foo] = "baz" + end + @yamlstore.transaction(true) do + assert_equal "bar", @yamlstore[:foo] + end + end + + def test_changes_are_not_written_on_abort + @yamlstore.transaction do + @yamlstore[:foo] = "bar" + @yamlstore.abort + end + @yamlstore.transaction(true) do + assert_nil @yamlstore[:foo] + end + end + + def test_writing_inside_readonly_transaction_raises_error + assert_raise(PStore::Error) do + @yamlstore.transaction(true) do + @yamlstore[:foo] = "bar" + end + end + end +end |