jdbc-helper 0.3.0 → 0.3.2

data/lib/jdbc-helper/connector.rb

@@ -1,6 +1,19 @@
 # encoding: UTF-8
 # Junegunn Choi (junegunn.c@gmail.com)
 
+module JDBCHelper
+	class Connector
+	private
+		def self.ensure_close conn
+			begin
+				yield conn
+			ensure
+				conn.close rescue nil
+			end
+		end
+	end#Connector
+end#JDBCHelper
+
 require 'jdbc-helper/connector/oracle_connector'
 require 'jdbc-helper/connector/mysql_connector'
 

data/lib/jdbc-helper/connector/mysql_connector.rb

@@ -3,7 +3,7 @@
 
 module JDBCHelper
 # Shortcut connector for MySQL
-class MySQLConnector
+class MySQLConnector < Connector
 	include Constants
 	include Constants::Connector
 
@@ -16,19 +16,21 @@ class MySQLConnector
 	# @return [JDBCHelper::Connection]
 	def self.connect(host, user, password, db,
 					 timeout = DEFAULT_LOGIN_TIMEOUT, 
-					 extra_params = DEFAULT_PARAMETERS[:mysql])
+					 extra_params = DEFAULT_PARAMETERS[:mysql], &block)
 
 		if extra_params && extra_params.is_a?(Hash) == false
 			raise ArgumentError.new('extra_params must be a hash')
 		end
 
-		Connection.new(
+		conn = Connection.new(
 			(extra_params || {}).merge(
 				:driver   => JDBC_DRIVER[:mysql],
 				:url      => "jdbc:mysql://#{host}/#{db}",
 				:user     => user,
 				:password => password,
 				:timeout  => timeout))
+
+		block_given? ? ensure_close(conn, &block) : conn
 	end
 end#MySQLConnector
 end#JDBCHelper

data/lib/jdbc-helper/connector/oracle_connector.rb

@@ -3,7 +3,7 @@
 
 module JDBCHelper
 # Shortcut connector for Oracle
-module OracleConnector
+class OracleConnector < Connector
 	include Constants
 	include Constants::Connector
 
@@ -13,13 +13,15 @@ module OracleConnector
 	# @param [String] service_name
 	# @param [Fixnum] timeout
 	# @return [JDBCHelper::Connection]
-	def self.connect(host, user, password, service_name, timeout = DEFAULT_LOGIN_TIMEOUT)
-		Connection.new(
+	def self.connect(host, user, password, service_name, timeout = DEFAULT_LOGIN_TIMEOUT, &block)
+		conn = Connection.new(
 			:driver   => JDBC_DRIVER[:oracle],
 			:url      => "jdbc:oracle:thin:@#{host}/#{service_name}",
 			:user     => user,
 			:password => password,
 			:timeout  => timeout)
+
+		block_given? ? ensure_close(conn, &block) : conn
 	end
 
 	# @param [String] host
@@ -28,13 +30,15 @@ module OracleConnector
 	# @param [String] sid
 	# @param [Fixnum] timeout
 	# @return [JDBCHelper::Connection]
-	def self.connect_by_sid(host, user, password, sid, timeout = DEFAULT_LOGIN_TIMEOUT)
-		Connection.new(
+	def self.connect_by_sid(host, user, password, sid, timeout = DEFAULT_LOGIN_TIMEOUT, &block)
+		conn = Connection.new(
 			:driver   => JDBC_DRIVER[:oracle],
 			:url      => "jdbc:oracle:thin:@#{host}:#{sid}",
 			:user     => user,
 			:password => password,
 			:timeout  => timeout)
+
+		block_given? ? ensure_close(conn, &block) : conn
 	end
 end#OracleConnector
 end#JDBCHelper

data/test/database.yml

@@ -8,6 +8,6 @@ mysql:
 oracle:
     driver: oracle.jdbc.driver.OracleDriver
     url: jdbc:oracle:thin:@localhost/test
-    user: user
-    password: password
+    user: testuser
+    password: testpassword
 

data/test/test_connectors.rb

@@ -19,6 +19,15 @@ class TestConnectors < Test::Unit::TestCase
 				assert conn.closed? == false
 				conn.close
 				assert conn.closed?
+
+				@conn = nil
+				ret = JDBCHelper::MySQLConnector.connect(host, conn_info['user'], conn_info['password'], db) do |conn|
+					assert conn.closed? == false
+					@conn = conn
+					1
+				end
+				assert @conn.closed?
+				assert_equal 1, ret
 			elsif conn_info['driver'] =~ /oracle/
 				host = conn_info['url'].match(%r{@(.*?)/})[1]
 				svc = conn_info['url'].match(%r{/([^/?]*?)(\?.*)?$})[1]
@@ -27,6 +36,15 @@ class TestConnectors < Test::Unit::TestCase
 				assert conn.closed? == false
 				conn.close
 				assert conn.closed?
+
+				@conn = nil
+				ret = JDBCHelper::OracleConnector.connect(host, conn_info['user'], conn_info['password'], svc) do |conn|
+					assert conn.closed? == false
+					@conn = conn
+					1
+				end
+				assert @conn.closed?
+				assert_equal 1, ret
 			end
 		end
 	end

data/test/test_performance.rb

@@ -7,7 +7,7 @@ class TestPerformance < Test::Unit::TestCase
 	def setup
 		@table = 'tmp_jdbc_helper'
 		@range = 'aaa'..'aaz'
-		@count = 10000 # Increase this for performance measurement
+		@count = 100#00 # Increase this for performance measurement
 	end
 
 	def teardown

metadata

@@ -2,7 +2,7 @@
 name: jdbc-helper
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors: 
   - Junegunn Choi
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-21 00:00:00 +09:00
+date: 2011-05-25 00:00:00 +09:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency