gene_pool 1.2.2 → 1.2.3

data/History.md

@@ -1,6 +1,10 @@
 GenePool Changelog
 =====================
 
+1.2.3 / 2012-02-23
+
+  - Allow setting of options[:close_proc] to nil (Should have just stayed home today).
+
 1.2.2 / 2012-02-23
 
   - Do a respond_to? to check compatibility instead of hacking around with $VERBOSE

data/lib/gene_pool.rb

@@ -23,7 +23,7 @@ class GenePool
     @warn_timeout = options[:warn_timeout] || 5.0
     @idle_timeout = options[:idle_timeout]
     @logger       = options[:logger]
-    @close_proc   = options[:close_proc]   || :close
+    @close_proc   = options[:close_proc]   || (!options.has_key?(:close_proc) && :close)
 
     unless @logger
       @logger = Logger.new(STDERR)

data/test/gene_pool_test.rb

@@ -17,6 +17,7 @@ class DummyConnection
     sleep sleep_time if sleep_time
     @count = count
     @closed = false
+    @other_closed = false
   end
   
   def to_s
@@ -34,6 +35,14 @@ class DummyConnection
   def closed?
     @closed
   end
+
+  def other_close
+    @other_closed = true
+  end
+
+  def other_closed?
+    @other_closed
+  end
 end
     
 
@@ -338,4 +347,60 @@ class GenePoolTest < Test::Unit::TestCase
       assert !conn3.closed?
     end
   end
+
+  context 'close_proc' do
+    should 'default to close if not specified' do
+      @gene_pool = GenePool.new do
+        DummyConnection.new(0, 0)
+      end
+      conn = nil
+      @gene_pool.with_connection { |c| conn = c }
+      @gene_pool.remove_idle(0)
+      assert conn.closed?
+      assert !conn.other_closed?
+    end
+
+    should 'allow symbol to execute a different method from close' do
+      @gene_pool = GenePool.new(:close_proc => :other_close) do
+        DummyConnection.new(0, 0)
+      end
+      conn = nil
+      @gene_pool.with_connection { |c| conn = c }
+      @gene_pool.remove_idle(0)
+      assert !conn.closed?
+      assert conn.other_closed?
+    end
+
+
+    should 'allow nil so it does not execute a close' do
+      @gene_pool = GenePool.new(:close_proc => nil) do
+        DummyConnection.new(0, 0)
+      end
+      conn = nil
+      @gene_pool.with_connection { |c| conn = c }
+      @gene_pool.remove_idle(0)
+      assert !conn.closed?
+      assert !conn.other_closed?
+    end
+
+    should 'allow proc that gets executed on close' do
+      foo = 1
+      close_conn = nil
+      my_close = lambda do |conn|
+        close_conn = conn
+        foo = 2
+      end
+      @gene_pool = GenePool.new(:close_proc => my_close) do
+        DummyConnection.new(0, 0)
+      end
+      conn = nil
+      @gene_pool.with_connection { |c| conn = c }
+      @gene_pool.remove_idle(0)
+      assert !conn.closed?
+      assert !conn.other_closed?
+      assert_same conn, close_conn
+      assert_equal 2, foo
+    end
+
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gene_pool
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -39,7 +39,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1353625208062098188
+      hash: -1970071979661874936
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: