diff options
Diffstat (limited to 'ext/sdbm')
| -rw-r--r-- | ext/sdbm/init.c | 19 | ||||
| -rw-r--r-- | ext/sdbm/testsdbm.rb | 6 |
2 files changed, 22 insertions, 3 deletions
diff --git a/ext/sdbm/init.c b/ext/sdbm/init.c index f20e3cfa58..f473555840 100644 --- a/ext/sdbm/init.c +++ b/ext/sdbm/init.c @@ -242,6 +242,8 @@ fsdbm_select(argc, argv, obj) } } else { + rb_warn("SDBM#select(index..) is deprecated; use SDBM#values_at"); + for (i=0; i<argc; i++) { rb_ary_push(new, fsdbm_fetch(obj, argv[i], Qnil)); } @@ -251,6 +253,22 @@ fsdbm_select(argc, argv, obj) } static VALUE +fsdbm_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, fsdbm_fetch(obj, argv[i], Qnil)); + } + + return new; +} + +static VALUE fsdbm_delete(obj, keystr) VALUE obj, keystr; { @@ -728,6 +746,7 @@ Init_sdbm() rb_define_method(rb_cDBM, "indexes", fsdbm_indexes, -1); rb_define_method(rb_cDBM, "indices", fsdbm_indexes, -1); rb_define_method(rb_cDBM, "select", fsdbm_select, -1); + rb_define_method(rb_cDBM, "values_at", fsdbm_values_at, -1); rb_define_method(rb_cDBM, "length", fsdbm_length, 0); rb_define_method(rb_cDBM, "size", fsdbm_length, 0); rb_define_method(rb_cDBM, "empty?", fsdbm_empty_p, 0); diff --git a/ext/sdbm/testsdbm.rb b/ext/sdbm/testsdbm.rb index 550b47a008..3577d3606c 100644 --- a/ext/sdbm/testsdbm.rb +++ b/ext/sdbm/testsdbm.rb @@ -51,7 +51,7 @@ class TestSDBM < RUNIT::TestCase end def test_version - STDERR.print SDBM::VERSION + assert(! SDBM.const_defined?(:VERSION)) end def test_s_new_has_no_block @@ -219,11 +219,11 @@ class TestSDBM < RUNIT::TestCase assert_equals(values.reverse, @sdbm.indexes(*keys.reverse)) end - def test_select + def test_values_at keys = %w(foo bar baz) values = %w(FOO BAR BAZ) @sdbm[keys[0]], @sdbm[keys[1]], @sdbm[keys[2]] = values - assert_equals(values.reverse, @sdbm.select(*keys.reverse)) + assert_equals(values.reverse, @sdbm.values_at(*keys.reverse)) end def test_select_with_block |