resource_pool 0.1.3 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/lib/resource_pool.rb

@@ -1,7 +1,6 @@
 class ResourcePool
   class ResourcePoolError < RuntimeError; end
   class ResourceNotAvailable < ResourcePoolError; end
-  class BadResource < ResourcePoolError; end
   class InvalidCreateProc < ResourcePoolError; end
 
   attr_reader :max_size, :pool, :allocated
@@ -33,8 +32,8 @@ class ResourcePool
     t = Thread.current
     if res = owned_resource(t)
       return yield(res)
-
     end
+
     begin
       unless res = acquire(t)
         raise ResourceNotAvailable if @timeout == 0
@@ -48,17 +47,22 @@ class ResourcePool
         end
       end
       yield res
-    rescue BadResource
-      old_res = res
-      res = nil
-      @delete_proc.call(old_res) if @delete_proc && old_res
-      @allocated.delete(t)
-      raise
     ensure
-      sync{release(t)} if res
+      sync{release(t)} if owned_resource(t)
     end
   end
 
+  # please only call this inside hold block
+  def trash_current!
+    t    = Thread.current
+    conn = owned_resource(t)
+    return unless conn
+
+    @delete_proc.call conn if @delete_proc
+    sync { @allocated.delete(t) }
+    nil
+  end
+
   private
 
   def owned_resource(thread)

data/resource_pool.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{resource_pool}
-  s.version = "0.1.3"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Aaron Qian}]

data/spec/resource_pool_spec.rb

@@ -244,9 +244,14 @@ describe "ResourcePool" do
     end
 
     it "should aquire and release resource" do
+      @pool.should_receive(:owned_resource).
+        with(Thread.current).
+        and_return(nil, @res)
+
       @pool.should_receive(:acquire).
         with(Thread.current).
         and_return(@res)
+
       @pool.should_receive(:release).
         with(Thread.current)
 
@@ -286,19 +291,26 @@ describe "ResourcePool" do
     end
 
     it "should delete bad resource" do
+      @pool.should_receive(:owned_resource).
+        with(Thread.current).
+        and_return(nil, @res, nil)
+
       @pool.should_receive(:acquire).
         and_return(@res)
       @pool.should_not_receive(:release)
       @pool.allocated.should_receive(:delete).
         with(Thread.current)
 
-      lambda {
-        @pool.hold{ |res| raise ResourcePool::BadResource }
-      }.should raise_error(ResourcePool::BadResource)
+      @pool.hold{ |res| @pool.trash_current! }
     end
 
     it "should call delete_proc if avaiable" do
       delete_proc_called = false
+
+      @pool.should_receive(:owned_resource).
+        with(Thread.current).
+        and_return(nil, @res, nil)
+
       @pool.should_receive(:acquire).
         and_return(@res)
       @pool.should_not_receive(:release)
@@ -310,9 +322,7 @@ describe "ResourcePool" do
         delete_proc_called = true
       })
 
-      lambda {
-        @pool.hold{ |res| raise ResourcePool::BadResource }
-      }.should raise_error(ResourcePool::BadResource)
+      @pool.hold{ |res| @pool.trash_current! }
 
       delete_proc_called.should be_true
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resource_pool
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &16231600 !ruby/object:Gem::Requirement
+  requirement: &12906080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *16231600
+  version_requirements: *12906080
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &16230980 !ruby/object:Gem::Requirement
+  requirement: &12897540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *16230980
+  version_requirements: *12897540
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &16230420 !ruby/object:Gem::Requirement
+  requirement: &12896880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *16230420
+  version_requirements: *12896880
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &16229640 !ruby/object:Gem::Requirement
+  requirement: &12895920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16229640
+  version_requirements: *12895920
 description: A gem for generic connection pooling / resource pooling. The code is
   mostly taken from Sequel gem's ThreadedConnectionPool class, and adapted for more
   general use.
@@ -91,7 +91,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3354856420191467092
+      hash: -3324076291152974813
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: