sbdb 0.0.10.1 → 0.0.11

data/README.md

@@ -23,21 +23,22 @@ First, open environment and database
 
 	require 'sbdb'
 	Dir.mkdir 'newenv'  rescue Errno::EEXIST
-	env = SBDB::Env.new 'newenv', SBDB::CREATE
-	db = env.open SBDB::Btree, 'newdb.db', :flags => SBDB::CREATE
+	env = SBDB::Env.new 'newenv', SBDB::CREATE | SBDB::Env::INIT_TRANSACTION
+	db = env.btree 'newdb.db', :flags => SBDB::CREATE
 
 It works nearly like a Ruby-Hash:
 
 	db['key'] = 'value'
-	db['key']		# => 'value'
-	db.to_hash		# => {'key'=>'value'}
-	db.map {|k, v| [k, v].join ' => '}		# => ["key => value"]
-	db.count		# => 1
+	db['key']   # => 'value'
+	db.to_hash  # => {'key'=>'value'}
+	db.map {|k, v| "k => v" } # => ["key => value"]
+	db.count    # => 1
+	db.each {|k,v| puts "#{k}: #{v}" }
 
-SBDB::DB#each uses a SBDB::Cursor:
+`SBDB::DB#each` uses a `SBDB::Cursor`:
 
 	cursor = db.cursor
-	cursor.each {|k,v| puts "#{k}: ${v}" }
+	cursor.each {|k,v| puts "#{k}: #{v}" }
 
 **Don't forget to close everything, you've opened!**
 
@@ -47,10 +48,14 @@ SBDB::DB#each uses a SBDB::Cursor:
 
 But you can use a *lambda* to ensure to close everything:
 
-	SBDB::Env.new( 'newenv', SBDB::CREATE) do |env|
+	SBDB::Env.new( 'newenv', SBDB::CREATE | SBDB::Env::INIT_TRANSACTION) do |env|
 		env.open SBDB::Btree, 'newdb.db', :flags => SBDB::CREATE do |db|
 			db.to_hash
 		end
 	end
 
-SBDB::DB#to_hash creates a cursor and close it later.
+`SBDB::DB#to_hash` creates a cursor and close it later.
+
+Tip:
+
+	Signal.trap 'EXIT', env.method( :close)

data/VERSION

@@ -1 +1 @@
-0.0.10.1
+0.0.11

data/lib/sbdb.rb

@@ -1,4 +1,5 @@
 require 'bdb'
+require 'ref'
 require 'sbdb/environment'
 require 'sbdb/db'
 require 'sbdb/cursor'

data/lib/sbdb/db.rb

@@ -60,7 +60,11 @@ module SBDB
 
 		def _txn txn
 			txn ||= @txn
-			txn && t.bdb_object
+			txn && txn.bdb_object
+		end
+
+		def transaction flg = nil, &exe
+			block_given? ? home.transaction( flg, &exe) : home.transaction( flg)
 		end
 
 		# Arguments:

data/lib/sbdb/environment.rb

@@ -61,7 +61,7 @@ module SBDB
 		def initialize *args
 			opts = ::Hash === args.last ? args.pop : {}
 			opts = {:dir => args[0], :flags => args[1], :mode => args[2]}.update opts
-			@dbs, @env = WeakHash.new, Bdb::Env.new( 0)
+			@dbs, @env = Ref::WeakValueMap.new, Bdb::Env.new( 0)
 			@env.log_config opts[:log_config], 1  if opts[:log_config]
 			@env.lg_bsize = opts[:lg_bsize]  if opts[:lg_bsize]
 			@env.lg_max = opts[:lg_max]  if opts[:lg_max]

metadata

@@ -5,9 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 10
-  - 1
-  version: 0.0.10.1
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: 
 - Denis Knauf
@@ -31,6 +30,19 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: ref
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
 description: Simple Ruby Berkeley DB wrapper library for bdb.
 email: Denis.Knauf@gmail.com
 executables: []
@@ -49,7 +61,6 @@ files:
 - lib/sbdb/db.rb
 - lib/sbdb/environment.rb
 - lib/sbdb/transaction.rb
-- lib/sbdb/weakhash.rb
 - LICENSE
 has_rdoc: true
 homepage: http://github.com/ruby-bdb/sbdb

data/lib/sbdb/weakhash.rb

@@ -1,61 +0,0 @@
-module SBDB
-
-# See http://eigenclass.org/hiki/deferred-finalizers-in-Ruby
-# Not threadsafe.
-
-class WeakHash
-	attr_reader :cache
-	def initialize cache = ::Hash.new
-		@cache = cache
-		@key_map = {}
-		@rev_cache = ::Hash.new{|h,k| h[k] = {}}
-		@reclaim_value = lambda do |value_id| 
-			if @rev_cache.has_key? value_id
-				@rev_cache[value_id].each_key{|key| @cache.delete key}
-				@rev_cache.delete value_id
-			end
-		end
-		@reclaim_key = lambda do |key_id|
-			@cache.delete @key_map.delete(key_id)  if @key_map.has_key? key_id
-		end
-	end
-
-	def []= key, value
-		case key
-		when Fixnum, Symbol, true, false
-			key2 = key
-		else
-			key2 = key.dup
-		end
-		@rev_cache[value.object_id][key2] = true
-		@cache[key2] = value.object_id
-		@key_map[key.object_id] = key2
-
-		ObjectSpace.define_finalizer(value, @reclaim_value)
-		ObjectSpace.define_finalizer(key, @reclaim_key)
-		value
-	end
-
-	def [] key
-		value_id = @cache[key]
-		return ObjectSpace._id2ref( value_id)  unless value_id.nil?
-		nil
-	rescue RangeError
-		nil
-	end
-
-	def each &e
-		@cache.each do |k, vid|
-			unless vid.nil?
-				obj = begin
-						ObjectSpace._id2ref vid
-					rescue RangeError
-						next
-					end
-				yield k, obj
-			end
-		end
-	end
-end
-
-end