oklahoma_mixer 0.1.0 → 0.2.0

data/test/test_helper.rb

@@ -29,17 +29,16 @@ module TestHelper
                "#{self.class.to_s.sub(/\ATest/, '').downcase}.#{ext}" )
   end
 
-  def hdb(*args)
-    db = OKMixer::HashDatabase.new(db_path("tch"), *args)
-    if block_given?
-      begin
-        yield db
-      ensure
-        db.close
-      end
-    else
-      db
-    end
+  def hdb(*args, &block)
+    OKMixer.open(db_path("tch"), *args, &block)
+  end
+
+  def bdb(*args, &block)
+    OKMixer.open(db_path("tcb"), *args, &block)
+  end
+
+  def fdb(*args, &block)
+    OKMixer.open(db_path("tcf"), *args, &block)
   end
   
   def remove_db_files

data/test/top_level_interface_test.rb

@@ -15,6 +15,18 @@ class TestTopLevelInterface < Test::Unit::TestCase
     end
   end
   
+  def test_open_of_a_tcb_extension_file_creates_a_b_tree_database
+    OKMixer.open(db_path("tcb")) do |db|
+      assert_instance_of(OKMixer::BTreeDatabase, db)
+    end
+  end
+  
+  def test_open_of_a_tcf_extension_file_creates_a_fixed_length_database
+    OKMixer.open(db_path("tcf")) do |db|
+      assert_instance_of(OKMixer::FixedLengthDatabase, db)
+    end
+  end
+  
   def test_open_of_an_unrecognized_extension_fails_with_an_error
     assert_raise(ArgumentError) do
       OKMixer.open("unrecognized")

data/test/tuning_test.rb

@@ -1,13 +1,12 @@
 require "test_helper"
+require "shared_tuning"
 
 class TestTuning < Test::Unit::TestCase
   def teardown
     remove_db_files
   end
   
-  def test_a_mutex_can_be_activated_as_the_database_is_created
-    assert_option_calls([:setmutex], :mutex => true)
-  end
+  include SharedTuning
   
   def test_a_bucket_array_size_can_be_set_with_other_tuning_defaults
     size = rand(1_000) + 1
@@ -41,8 +40,7 @@ class TestTuning < Test::Unit::TestCase
   end
   
   def test_options_is_a_string_of_characters_mapped_to_enums_and_ored_together
-    opts = { "l" => OKMixer::HashDatabase::C::OPTS[:HDBTLARGE],
-             "b" => OKMixer::HashDatabase::C::OPTS[:HDBTBZIP] }
+    opts = {"l" => lib::OPTS[:HDBTLARGE], "b" => lib::OPTS[:HDBTBZIP]}
     assert_option_calls( [ :tune, 0, -1, -1,
                            opts.values.inject(0) { |o, v| o | v } ],
                          :opts => opts.keys.join )
@@ -67,8 +65,8 @@ class TestTuning < Test::Unit::TestCase
   end
   
   def test_optimize_allows_the_adjustment_of_tune_options_for_an_open_database
-    hdb do |db|
-      args = capture_args(OKMixer::HashDatabase::C, :optimize) do
+    db do |db|
+      args = capture_args(lib, :optimize) do
         db.optimize(:apow => "42", :opts => "ld")
       end
       assert_instance_of(FFI::Pointer, args[0])
@@ -85,89 +83,15 @@ class TestTuning < Test::Unit::TestCase
     assert_option_calls([:setcache, 42], :rcnum => "42")
   end
   
-  def test_a_size_can_be_set_for_extra_mapped_memory
-    size = rand(1_000) + 1
-    assert_option_calls([:setxmsiz, size], :xmsiz => size)
-  end
-  
-  def test_extra_mapped_memory_size_is_converted_to_an_int
-    assert_option_calls([:setxmsiz, 42], :xmsiz => "42")
-  end
-  
-  def test_a_step_unit_can_be_set_for_auto_defragmentation
-    unit = rand(1_000) + 1
-    assert_option_calls([:setdfunit, unit], :dfunit => unit)
-  end
-  
-  def test_auto_defragmentation_step_unit_is_converted_to_an_int
-    assert_option_calls([:setdfunit, 42], :dfunit => "42")
-  end
-  
-  def test_nested_transactions_can_be_ignored
-    hdb(:nested_transactions => :ignore) do |db|
-      result = db.transaction {
-        db.transaction {  # ignored
-          41
-        } + 1             # ignored
-      }
-      assert_equal(42, result)
-    end
-  end
-  
-  def test_nested_transactions_can_be_set_to_fail_with_an_error
-    [:fail, :raise].each do |setting|
-      hdb(:nested_transactions => setting) do |db|
-        db.transaction do
-          assert_raise(OKMixer::Error::TransactionError) do
-            db.transaction {  }  # nested fails with error
-          end
-        end
-      end
-    end
-  end
-  
-  def test_a_mode_string_can_be_passed
-    assert_raise(OKMixer::Error::CabinetError) do  # file not found
-      hdb("r")
-    end
-  end
-  
-  def test_the_mode_can_be_passed_as_as_option
-    assert_raise(OKMixer::Error::CabinetError) do  # file not found
-      hdb(:mode => "r")
-    end
-  end
-  
-  def test_an_option_mode_overrides_the_mode_argument_and_triggers_a_warning
-    warning = capture_stderr do
-      hdb("r", :mode => "wc") do
-        # just open and close
-      end
-    end
-    assert( !warning.empty?,
-            "A warning was not issued for an option mode with a mode argument" )
-  end
-  
-  def test_an_unknown_mode_triggers_a_warning
-    warning = capture_stderr do
-      hdb("wcu") do
-        # just open and close
-      end
-    end
-    assert(!warning.empty?, "A warning was not issued for an unknown mode")
-  end
-  
   #######
   private
   #######
   
-  def assert_option_calls(c_call, options)
-    args = capture_args(OKMixer::HashDatabase::C, c_call[0]) do
-      hdb(options) do
-        # just open and close
-      end
-    end
-    assert_instance_of(FFI::Pointer, args[0])
-    assert_equal(c_call[1..-1], args[1..-1])
+  def lib
+    OKMixer::HashDatabase::C
+  end
+  
+  def db(*args, &block)
+    hdb(*args, &block)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: oklahoma_mixer
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - James Edward Gray II
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-01 00:00:00 -06:00
+date: 2010-01-09 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,17 +52,34 @@ extra_rdoc_files:
 files: 
 - lib/oklahoma_mixer/array_list/c.rb
 - lib/oklahoma_mixer/array_list.rb
+- lib/oklahoma_mixer/b_tree_database/c.rb
+- lib/oklahoma_mixer/b_tree_database.rb
+- lib/oklahoma_mixer/cursor/c.rb
+- lib/oklahoma_mixer/cursor.rb
 - lib/oklahoma_mixer/error.rb
 - lib/oklahoma_mixer/extensible_string/c.rb
 - lib/oklahoma_mixer/extensible_string.rb
+- lib/oklahoma_mixer/fixed_length_database/c.rb
+- lib/oklahoma_mixer/fixed_length_database.rb
 - lib/oklahoma_mixer/hash_database/c.rb
 - lib/oklahoma_mixer/hash_database.rb
 - lib/oklahoma_mixer/utilities.rb
 - lib/oklahoma_mixer.rb
+- test/b_tree_binary_data_test.rb
+- test/b_tree_tuning_test.rb
 - test/binary_data_test.rb
+- test/cursor_based_iteration_test.rb
+- test/duplicate_storage_test.rb
 - test/file_system_test.rb
+- test/fixed_length_tuning_test.rb
+- test/getting_and_setting_by_id_test.rb
 - test/getting_and_setting_keys_test.rb
 - test/iteration_test.rb
+- test/key_range_test.rb
+- test/order_test.rb
+- test/shared_binary_data.rb
+- test/shared_iteration.rb
+- test/shared_tuning.rb
 - test/test_helper.rb
 - test/top_level_interface_test.rb
 - test/transactions_test.rb
@@ -106,10 +123,18 @@ signing_key:
 specification_version: 3
 summary: An full featured and robust FFI interface to Tokyo Cabinet.
 test_files: 
+- test/b_tree_binary_data_test.rb
+- test/b_tree_tuning_test.rb
 - test/binary_data_test.rb
+- test/cursor_based_iteration_test.rb
+- test/duplicate_storage_test.rb
 - test/file_system_test.rb
+- test/fixed_length_tuning_test.rb
+- test/getting_and_setting_by_id_test.rb
 - test/getting_and_setting_keys_test.rb
 - test/iteration_test.rb
+- test/key_range_test.rb
+- test/order_test.rb
 - test/top_level_interface_test.rb
 - test/transactions_test.rb
 - test/tuning_test.rb