diff options
Diffstat (limited to 'ext/dbm')
| -rw-r--r-- | ext/dbm/dbm.c | 23 | ||||
| -rw-r--r-- | ext/dbm/testdbm.rb | 13 |
2 files changed, 31 insertions, 5 deletions
diff --git a/ext/dbm/dbm.c b/ext/dbm/dbm.c index 6eb7cfcd20..c422394405 100644 --- a/ext/dbm/dbm.c +++ b/ext/dbm/dbm.c @@ -254,6 +254,8 @@ fdbm_select(argc, argv, obj) } } else { + rb_warn("DBM#select(index..) is deprecated; use DBM#values_at"); + for (i=0; i<argc; i++) { rb_ary_push(new, fdbm_fetch(obj, argv[i], Qnil)); } @@ -263,6 +265,22 @@ fdbm_select(argc, argv, obj) } static VALUE +fdbm_values_at(argc, argv, obj) + int argc; + VALUE *argv; + VALUE obj; +{ + VALUE new = rb_ary_new2(argc); + int i; + + for (i=0; i<argc; i++) { + rb_ary_push(new, fdbm_fetch(obj, argv[i], Qnil)); + } + + return new; +} + +static VALUE fdbm_delete(obj, keystr) VALUE obj, keystr; { @@ -731,6 +749,7 @@ Init_dbm() rb_define_method(rb_cDBM, "indexes", fdbm_indexes, -1); rb_define_method(rb_cDBM, "indices", fdbm_indexes, -1); rb_define_method(rb_cDBM, "select", fdbm_select, -1); + rb_define_method(rb_cDBM, "values_at", fdbm_values_at, -1); rb_define_method(rb_cDBM, "length", fdbm_length, 0); rb_define_method(rb_cDBM, "size", fdbm_length, 0); rb_define_method(rb_cDBM, "empty?", fdbm_empty_p, 0); @@ -759,4 +778,8 @@ Init_dbm() rb_define_method(rb_cDBM, "to_a", fdbm_to_a, 0); rb_define_method(rb_cDBM, "to_hash", fdbm_to_hash, 0); + +#ifdef DB_VERSION_STRING + rb_define_const(rb_cDBM, "VERSION", rb_str_new2(DB_VERSION_STRING)); +#endif } diff --git a/ext/dbm/testdbm.rb b/ext/dbm/testdbm.rb index 0be627d346..7ccb3d7b23 100644 --- a/ext/dbm/testdbm.rb +++ b/ext/dbm/testdbm.rb @@ -32,9 +32,12 @@ class TestDBM < RUNIT::TestCase assert_instance_of(DBM, @dbm = DBM.new(@path)) # prepare to make readonly DBM file - DBM.open("tmptest_dbm_rdonly", 0400) {|dbm| + DBM.open("tmptest_dbm_rdonly") {|dbm| dbm['foo'] = 'FOO' } + + File.chmod(0400, *Dir.glob("tmptest_dbm_rdonly.*")) + assert_instance_of(DBM, @dbm_rdonly = DBM.new("tmptest_dbm_rdonly", nil)) end def teardown @@ -83,7 +86,7 @@ class TestDBM < RUNIT::TestCase } begin sleep 1 - assert_exception(Errno::EWOULDBLOCK) { + assert_exception(Errno::EWOULDBLOCK, "NEVER MIND IF YOU USE Berkeley DB3") { begin assert_instance_of(DBM, dbm2 = DBM.open("tmptest_dbm", 0644)) rescue Errno::EAGAIN, Errno::EACCES, Errno::EINVAL @@ -154,7 +157,7 @@ class TestDBM < RUNIT::TestCase def test_s_open_error assert_instance_of(DBM, dbm = DBM.open("tmptest_dbm", 0)) - assert_exception(Errno::EACCES) { + assert_exception(Errno::EACCES, "NEVER MIND IF YOU USE Berkeley DB3") { DBM.open("tmptest_dbm", 0) } dbm.close @@ -245,11 +248,11 @@ class TestDBM < RUNIT::TestCase assert_equals(values.reverse, @dbm.indexes(*keys.reverse)) end - def test_select + def test_values_at keys = %w(foo bar baz) values = %w(FOO BAR BAZ) @dbm[keys[0]], @dbm[keys[1]], @dbm[keys[2]] = values - assert_equals(values.reverse, @dbm.select(*keys.reverse)) + assert_equals(values.reverse, @dbm.values_at(*keys.reverse)) end def test_select_with_block |