rufus-tokyo 0.1.1 → 0.1.2

data/CHANGELOG.txt

@@ -2,6 +2,11 @@
 = rufus-tokyo CHANGELOG.txt
 
 
+== rufus-tokyo - 0.1.2    released 2009/01/23
+
+- todo : implemented Cabinet#keys and #values
+
+
 == rufus-tokyo - 0.1.1    released 2009/01/23
 
 - bug  : fixed dependency, it's ffi not ruby-ffi

data/lib/rufus/tokyo.rb

@@ -34,7 +34,7 @@ require 'ffi'
 module Rufus
 module Tokyo
 
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 
   module Func #:nodoc#
     extend FFI::Library
@@ -240,15 +240,29 @@ module Tokyo
     end
 
     #
-    # The classical Ruby each (unlocks the power of the Enumerable mixin)
+    # Returns an array with all the keys in the databse
     #
-    def each
-
-      Rufus::Tokyo::Func.tcadbiterinit(@db) # concurrent access ??
-
+    def keys
+      a = []
+      Rufus::Tokyo::Func.tcadbiterinit(@db)
       while (k = (Rufus::Tokyo::Func.tcadbiternext2(@db) rescue nil))
-        yield(k, self[k])
+        a << k
       end
+      a
+    end
+
+    #
+    # Returns an array with all the values in the database (heavy...)
+    #
+    def values
+      collect { |k, v| v }
+    end
+
+    #
+    # The classical Ruby each (unlocks the power of the Enumerable mixin)
+    #
+    def each
+      keys.each { |k| yield(k, self[k]) }
     end
   end
 end

data/test/cabinet_0_test.rb

@@ -14,10 +14,16 @@ require 'rufus/tokyo'
 
 class CabinetZero < Test::Unit::TestCase
 
-  #def setup
-  #end
-  #def teardown
-  #end
+  def setup
+    @db = Rufus::Tokyo::Cabinet.new('test_data.tch')
+    @db.clear
+  end
+  def teardown
+    @db.close
+  end
+  def db
+    @db
+  end
 
   def test_lib
 
@@ -26,7 +32,6 @@ class CabinetZero < Test::Unit::TestCase
 
   def test_basic_workflow
 
-    db = Rufus::Tokyo::Cabinet.new('test_data.tch')
     db['pillow'] = 'Shonagon'
 
     assert_equal 1, db.size
@@ -34,22 +39,28 @@ class CabinetZero < Test::Unit::TestCase
 
     assert_equal 'Shonagon', db.delete('pillow')
     assert_equal 0, db.size
-
-    assert db.close
   end
 
   def test_clear
 
     db = Rufus::Tokyo::Cabinet.new('test_data.tch')
+    db.clear
 
     40.times { |i| db[i.to_s] = i.to_s }
     assert_equal 40, db.size
+  end
+
+  def test_keys_and_values
 
+    db = Rufus::Tokyo::Cabinet.new('test_data.tch')
     db.clear
 
-    assert_equal 0, db.size
+    keys = %w{ alpha bravo charly delta echo foxtrott }
+
+    keys.each_with_index { |k, i| db[k] = i.to_s }
 
-    assert db.close
+    assert_equal keys, db.keys
+    assert_equal %w{ 0 1 2 3 4 5 }, db.values
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rufus-tokyo
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - John Mettraux