modified Database.open/Database.new to optionally accept a block á la File.open

Block will ensure db is closed

Signed-off-by: Luis Lavena <luislavena@gmail.com>

Author: gerrit

lib/sqlite3/database.rb

@@ -12,14 +12,12 @@ module SQLite3
   #
   #   require 'sqlite3'
   #
-  #   db = SQLite3::Database.new( "data.db" )
-  #
-  #   db.execute( "select * from table" ) do |row|
-  #     p row
+  #   SQLite3::Database.new( "data.db" ) do |db|
+  #     db.execute( "select * from table" ) do |row|
+  #       p row
+  #     end
   #   end
   #
-  #   db.close
-  #
   # It wraps the lower-level methods provides by the selected driver, and
   # includes the Pragmas module for access to various pragma convenience
   # methods.
@@ -69,7 +67,7 @@ def quote( string )
     #
     # By default, the new database will return result rows as arrays
     # (#results_as_hash) and has type translation disabled (#type_translation=).
-    def initialize( file_name, options={} )
+    def initialize( file_name, options={} ) # :yields: db
       utf16 = options.fetch(:utf16, false)
       load_driver( options[:driver] )
 
@@ -83,6 +81,14 @@ def initialize( file_name, options={} )
       @type_translation = options.fetch(:type_translation,false)
       @translator = nil
       @transaction_active = false
+      
+      if block_given?
+        begin
+          yield self
+        ensure
+          self.close
+        end
+      end
     end
 
     # Return +true+ if the string is a valid (ie, parsable) SQL statement, and

test/test_database.rb

@@ -11,6 +11,18 @@ def test_new
     assert !db.results_as_hash
     assert !db.type_translation
   end
+  
+  def test_new_with_block
+    driver = Driver.new
+    driver.expects(:open).once.with('foo.db', false).returns([0, 'cookie'])
+    Driver.stubs(:new).returns(driver)
+    returned_db = SQLite3::Database.new( "foo.db", :driver => Driver ) do |db|
+      assert !db.closed?
+      assert !db.results_as_hash
+      assert !db.type_translation
+    end
+    assert returned_db.closed?
+  end
 
   def test_open
     driver = Driver.new
@@ -22,6 +34,18 @@ def test_open
     assert !db.type_translation
   end
 
+  def test_open_with_block
+    driver = Driver.new
+    driver.expects(:open).once.with('foo.db', false).returns([0, 'cookie'])
+    Driver.stubs(:new).returns(driver)
+    returned_db = SQLite3::Database.open( "foo.db", :driver => Driver ) do |db|
+      assert !db.closed?
+      assert !db.results_as_hash
+      assert !db.type_translation
+    end
+    assert returned_db.closed?
+  end
+  
   def test_with_type_translation
     db = SQLite3::Database.open( "foo.db", :driver => Driver,
       :type_translation => true )