leveldb-ruby 0.1 → 0.2

data/README

@@ -15,3 +15,14 @@ And then run this:
   db.get "it"
 
 Only a very few operations are supported right now:
+
+  DB.new    # creates or loads as necessary
+  DB.create # dies if it already exists
+  DB.load   # dies unless it alread exists
+
+  DB#get    # alias: DB#[]
+  DB#put    # alias: DB#[]=
+  DB#delete
+
+  DB#each
+  ... and all the enumerable methods

data/ext/leveldb/leveldb.cc

@@ -1,7 +1,7 @@
 #include <ruby.h>
 
 #include "leveldb/db.h"
-#include "leveldb/write_batch.h"
+#include "leveldb/slice.h"
 
 static VALUE m_leveldb;
 static VALUE c_db;
@@ -56,19 +56,22 @@ static VALUE db_close(VALUE self) {
   return Qtrue;
 }
 
+#define RUBY_STRING_TO_SLICE(x) leveldb::Slice(RSTRING_PTR(x), RSTRING_LEN(x))
+#define SLICE_TO_RUBY_STRING(x) rb_str_new(x.data(), x.size())
+#define STRING_TO_RUBY_STRING(x) rb_str_new(x.data(), x.size())
 static VALUE db_get(VALUE self, VALUE v_key) {
   Check_Type(v_key, T_STRING);
 
   bound_db* db;
   Data_Get_Struct(self, bound_db, db);
 
-  std::string key = std::string((char*)RSTRING_PTR(v_key));
+  leveldb::Slice key = RUBY_STRING_TO_SLICE(v_key);
   std::string value;
   leveldb::Status status = db->db->Get(leveldb::ReadOptions(), key, &value);
   if(status.IsNotFound()) return Qnil;
 
   RAISE_ON_ERROR(status);
-  return rb_str_new2(value.c_str());
+  return STRING_TO_RUBY_STRING(value);
 }
 
 static VALUE db_delete(VALUE self, VALUE v_key) {
@@ -77,7 +80,7 @@ static VALUE db_delete(VALUE self, VALUE v_key) {
   bound_db* db;
   Data_Get_Struct(self, bound_db, db);
 
-  std::string key = std::string((char*)RSTRING_PTR(v_key));
+  leveldb::Slice key = RUBY_STRING_TO_SLICE(v_key);
   std::string value;
   leveldb::Status status = db->db->Get(leveldb::ReadOptions(), key, &value);
 
@@ -86,7 +89,7 @@ static VALUE db_delete(VALUE self, VALUE v_key) {
   status = db->db->Delete(leveldb::WriteOptions(), key);
   RAISE_ON_ERROR(status);
 
-  return rb_str_new2(value.c_str());
+  return STRING_TO_RUBY_STRING(value);
 }
 
 static VALUE db_exists(VALUE self, VALUE v_key) {
@@ -95,7 +98,7 @@ static VALUE db_exists(VALUE self, VALUE v_key) {
   bound_db* db;
   Data_Get_Struct(self, bound_db, db);
 
-  std::string key = std::string((char*)RSTRING_PTR(v_key));
+  leveldb::Slice key = RUBY_STRING_TO_SLICE(v_key);
   std::string value;
   leveldb::Status status = db->db->Get(leveldb::ReadOptions(), key, &value);
 
@@ -110,9 +113,8 @@ static VALUE db_put(VALUE self, VALUE v_key, VALUE v_value) {
   bound_db* db;
   Data_Get_Struct(self, bound_db, db);
 
-  std::string key = std::string((char*)RSTRING_PTR(v_key));
-  std::string value = std::string((char*)RSTRING_PTR(v_value));
-
+  leveldb::Slice key = RUBY_STRING_TO_SLICE(v_key);
+  leveldb::Slice value = RUBY_STRING_TO_SLICE(v_value);
   leveldb::Status status = db->db->Put(leveldb::WriteOptions(), key, value);
 
   RAISE_ON_ERROR(status);
@@ -140,8 +142,8 @@ static VALUE db_each(VALUE self) {
   leveldb::Iterator* it = db->db->NewIterator(leveldb::ReadOptions());
 
   for (it->SeekToFirst(); it->Valid(); it->Next()) {
-    VALUE key = rb_str_new2(it->key().ToString().c_str());
-    VALUE value = rb_str_new2(it->value().ToString().c_str());
+    VALUE key = SLICE_TO_RUBY_STRING(it->key());
+    VALUE value = SLICE_TO_RUBY_STRING(it->value());
     VALUE ary = rb_ary_new2(2);
     rb_ary_push(ary, key);
     rb_ary_push(ary, value);

metadata

@@ -1,183 +1,167 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: leveldb-ruby
-version: !ruby/object:Gem::Version 
-  hash: 9
+version: !ruby/object:Gem::Version
+  version: '0.2'
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  version: "0.1"
 platform: ruby
-authors: 
+authors:
 - William Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-16 22:35:18 -07:00
+date: 2011-06-17 15:04:29.000000000 -07:00
 default_executable: 
 dependencies: []
-
 description: LevelDB-Ruby is a Ruby binding to LevelDB.
 email: wmorgan-leveldb-ruby-gemspec@masanjin.net
 executables: []
-
-extensions: 
+extensions:
 - ext/leveldb/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
 - ext/leveldb/leveldb.cc
-files: 
+files:
 - README
 - ext/leveldb/extconf.rb
 - lib/leveldb.rb
 - ext/leveldb/leveldb.cc
 - leveldb/Makefile
-- leveldb/port/win/stdint.h
-- leveldb/port/port_osx.h
-- leveldb/port/port_android.h
-- leveldb/port/sha1_test.cc
-- leveldb/port/port_chromium.h
-- leveldb/port/port_chromium.cc
-- leveldb/port/port_posix.h
-- leveldb/port/sha1_portable.cc
-- leveldb/port/port_example.h
-- leveldb/port/port_posix.cc
-- leveldb/port/port.h
-- leveldb/port/sha1_portable.h
-- leveldb/port/port_android.cc
-- leveldb/port/port_osx.cc
-- leveldb/db/dbformat.cc
-- leveldb/db/db_test.cc
-- leveldb/db/write_batch_internal.h
-- leveldb/db/db_impl.h
-- leveldb/db/log_writer.cc
-- leveldb/db/write_batch.cc
+- leveldb/db/builder.cc
+- leveldb/db/builder.h
 - leveldb/db/corruption_test.cc
-- leveldb/db/db_impl.cc
-- leveldb/db/filename.h
-- leveldb/db/skiplist.h
-- leveldb/db/table_cache.cc
-- leveldb/db/log_test.cc
-- leveldb/db/log_reader.h
 - leveldb/db/db_bench.cc
-- leveldb/db/repair.cc
+- leveldb/db/db_impl.cc
+- leveldb/db/db_impl.h
 - leveldb/db/db_iter.cc
-- leveldb/db/write_batch_test.cc
-- leveldb/db/version_set.h
-- leveldb/db/memtable.cc
-- leveldb/db/version_set.cc
+- leveldb/db/db_iter.h
+- leveldb/db/db_test.cc
+- leveldb/db/dbformat.cc
+- leveldb/db/dbformat.h
+- leveldb/db/dbformat_test.cc
+- leveldb/db/filename.cc
+- leveldb/db/filename.h
 - leveldb/db/filename_test.cc
-- leveldb/db/snapshot.h
-- leveldb/db/log_reader.cc
 - leveldb/db/log_format.h
-- leveldb/db/version_edit.cc
-- leveldb/db/table_cache.h
-- leveldb/db/builder.h
-- leveldb/db/dbformat.h
-- leveldb/db/db_iter.h
+- leveldb/db/log_reader.cc
+- leveldb/db/log_reader.h
+- leveldb/db/log_test.cc
+- leveldb/db/log_writer.cc
+- leveldb/db/log_writer.h
+- leveldb/db/memtable.cc
 - leveldb/db/memtable.h
-- leveldb/db/version_edit_test.cc
-- leveldb/db/dbformat_test.cc
-- leveldb/db/builder.cc
+- leveldb/db/repair.cc
+- leveldb/db/skiplist.h
 - leveldb/db/skiplist_test.cc
-- leveldb/db/log_writer.h
+- leveldb/db/snapshot.h
+- leveldb/db/table_cache.cc
+- leveldb/db/table_cache.h
+- leveldb/db/version_edit.cc
 - leveldb/db/version_edit.h
-- leveldb/db/filename.cc
+- leveldb/db/version_edit_test.cc
+- leveldb/db/version_set.cc
+- leveldb/db/version_set.h
+- leveldb/db/write_batch.cc
+- leveldb/db/write_batch_internal.h
+- leveldb/db/write_batch_test.cc
+- leveldb/include/leveldb/cache.h
 - leveldb/include/leveldb/comparator.h
-- leveldb/include/leveldb/table.h
-- leveldb/include/leveldb/slice.h
+- leveldb/include/leveldb/db.h
+- leveldb/include/leveldb/env.h
 - leveldb/include/leveldb/iterator.h
+- leveldb/include/leveldb/options.h
+- leveldb/include/leveldb/slice.h
+- leveldb/include/leveldb/status.h
+- leveldb/include/leveldb/table.h
 - leveldb/include/leveldb/table_builder.h
-- leveldb/include/leveldb/env.h
-- leveldb/include/leveldb/db.h
-- leveldb/include/leveldb/cache.h
 - leveldb/include/leveldb/write_batch.h
-- leveldb/include/leveldb/status.h
-- leveldb/include/leveldb/options.h
+- leveldb/port/port.h
+- leveldb/port/port_android.cc
+- leveldb/port/port_android.h
+- leveldb/port/port_chromium.cc
+- leveldb/port/port_chromium.h
+- leveldb/port/port_example.h
+- leveldb/port/port_osx.cc
+- leveldb/port/port_osx.h
+- leveldb/port/port_posix.cc
+- leveldb/port/port_posix.h
+- leveldb/port/sha1_portable.cc
+- leveldb/port/sha1_portable.h
+- leveldb/port/sha1_test.cc
+- leveldb/port/win/stdint.h
+- leveldb/table/block.cc
 - leveldb/table/block.h
+- leveldb/table/block_builder.cc
+- leveldb/table/block_builder.h
 - leveldb/table/format.cc
-- leveldb/table/table_test.cc
+- leveldb/table/format.h
+- leveldb/table/iterator.cc
 - leveldb/table/iterator_wrapper.h
+- leveldb/table/merger.cc
 - leveldb/table/merger.h
-- leveldb/table/iterator.cc
-- leveldb/table/two_level_iterator.h
-- leveldb/table/two_level_iterator.cc
-- leveldb/table/format.h
 - leveldb/table/table.cc
-- leveldb/table/merger.cc
-- leveldb/table/block_builder.h
-- leveldb/table/block.cc
-- leveldb/table/block_builder.cc
 - leveldb/table/table_builder.cc
-- leveldb/util/comparator.cc
-- leveldb/util/histogram.cc
-- leveldb/util/hash.h
-- leveldb/util/crc32c.cc
-- leveldb/util/histogram.h
-- leveldb/util/testutil.h
+- leveldb/table/table_test.cc
+- leveldb/table/two_level_iterator.cc
+- leveldb/table/two_level_iterator.h
+- leveldb/util/arena.cc
 - leveldb/util/arena.h
-- leveldb/util/cache_test.cc
 - leveldb/util/arena_test.cc
-- leveldb/util/crc32c_test.cc
-- leveldb/util/env.cc
-- leveldb/util/coding_test.cc
-- leveldb/util/testharness.cc
+- leveldb/util/cache.cc
+- leveldb/util/cache_test.cc
+- leveldb/util/coding.cc
 - leveldb/util/coding.h
-- leveldb/util/mutexlock.h
-- leveldb/util/logging.cc
-- leveldb/util/testutil.cc
-- leveldb/util/hash.cc
+- leveldb/util/coding_test.cc
+- leveldb/util/comparator.cc
+- leveldb/util/crc32c.cc
 - leveldb/util/crc32c.h
-- leveldb/util/testharness.h
-- leveldb/util/env_test.cc
+- leveldb/util/crc32c_test.cc
+- leveldb/util/env.cc
+- leveldb/util/env_chromium.cc
 - leveldb/util/env_posix.cc
-- leveldb/util/arena.cc
+- leveldb/util/env_test.cc
+- leveldb/util/hash.cc
+- leveldb/util/hash.h
+- leveldb/util/histogram.cc
+- leveldb/util/histogram.h
+- leveldb/util/logging.cc
+- leveldb/util/logging.h
+- leveldb/util/mutexlock.h
 - leveldb/util/options.cc
 - leveldb/util/random.h
-- leveldb/util/logging.h
-- leveldb/util/coding.cc
 - leveldb/util/status.cc
-- leveldb/util/cache.cc
-- leveldb/util/env_chromium.cc
+- leveldb/util/testharness.cc
+- leveldb/util/testharness.h
+- leveldb/util/testutil.cc
+- leveldb/util/testutil.h
 has_rdoc: true
 homepage: http://github.com/wmorgan/leveldb-ruby
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - -c
 - utf8
 - --main
 - README
 - --title
 - LevelDB
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: a Ruby binding to LevelDB
 test_files: []
-