sbdb 0.0.9 → 0.0.10

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.10

data/lib/sbdb/db.rb

@@ -63,6 +63,14 @@ module SBDB
 			txn && t.bdb_object
 		end
 
+		# Arguments:
+		# * file
+		# * name
+		# * type
+		# * flags
+		# * mode
+		# * env
+		# or: **file**, **opts**. *opts* must be a *::Hash* with keys like above, excluded *file*.
 		def initialize file, *args
 			opts = ::Hash === args.last ? args.pop : {}
 			opts = {:name => args[0], :type => args[1], :flags => args[2], :mode => args[3], :env => args[4]}.update opts
@@ -70,27 +78,28 @@ module SBDB
 			@home, @db = opts[:env], opts[:env] ? opts[:env].bdb_object.db : Bdb::Db.new
 			opts[:type] = TYPES.index(self.class) || UNKNOWN
 			@db.re_len = opts[:re_len]  if opts[:re_len]
-			txn = opts[:txn]
+			@txn = nil
+			txn = opts[:txn]  # First is the global txn, second only for open.
 			begin
 				@db.open txn && txn.bdb_object, file, opts[:name], opts[:type], opts[:flags] || 0, opts[:mode] || 0
-			rescue Object
+			rescue Object => exc
 				close
-				raise $!
+				raise exc
 			end
 		end
 
 		def each key = nil, val = nil, &exe
-			cursor{|c|c.each key, val, &exe}
+			cursor {|c| c.each key, val, &exe }
 		end
 
 		def reverse key = nil, val = nil, &exe
-			cursor{|c|c.reverse key, val, &exe}
+			cursor {|c| c.reverse key, val, &exe }
 		end
 
-		def to_hash k = nil, v = nil
-			h = {}
-			each( key, val, h.method(:[]=))
-			h
+		def to_hash key = nil, val = nil
+			ht = {}
+			each key, val, &ht.method( :[]=)
+			ht
 		end
 
 		def truncate txn = nil

data/lib/sbdb/environment.rb

@@ -106,12 +106,10 @@ module SBDB
 		# If you use this, never use close. It's possible somebody else use it too.
 		# The Databases, which are opened, will close, if the Environment will close.
 		def [] file, *ps, &exe
-			ps.push ::Hash.new  unless ::Hash === ps.last
-			ps.last[:env] = self
-			name, flg, type =
-					String === ps[0] ? ps[0] : ps.last[:name],
-					Fixnum === ps[1] ? ps[1] : ps.last[:flags],
-					Fixnum === ps[2] ? ps[2] : ps.last[:type]
+			opts = ::Hash === ps.last ? ps.pop : {}
+			opts[:env] = self
+			name, type, flg = ps[0] || opts[:name], ps[1] || opts[:type], ps[2] || opts[:flags]
+			ps.push opts
 			@dbs[ [file, name, flg | CREATE]] ||= (type || SBDB::Unknown).new file, *ps, &exe
 		end
 	end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 9
-  version: 0.0.9
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - Denis Knauf
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-29 00:00:00 +02:00
+date: 2011-08-01 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: dk-bdb
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -54,11 +55,12 @@ homepage: http://github.com/DenisKnauf/bdb
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -66,6 +68,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -75,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Simple Ruby Berkeley DB