Remove @busy variable, more precise timeout waits

lib/connection_pool.rb

@@ -34,7 +34,6 @@ def initialize(options={})
     @options[:size].times do
       @available << yield
     end
-    @busy = []
   end
 
   def with(&block)
@@ -54,17 +53,14 @@ def method_missing(name, *args)
 
   def checkout
     Thread.current[:"current-#{self.object_id}"] ||= begin
-      conn = @available.timed_pop(@options[:timeout])
-      @busy << conn
-      conn
+      @available.timed_pop(@options[:timeout])
     end
   end
 
   def checkin
     conn = Thread.current[:"current-#{self.object_id}"]
     Thread.current[:"current-#{self.object_id}"] = nil
     return unless conn
-    @busy.delete(conn)
     @available << conn
     nil
   end

lib/connection_pool/timed_queue.rb

@@ -21,8 +21,9 @@ def timed_pop(timeout=0.5)
     @mutex.synchronize do
       loop do
         return @que.shift unless @que.empty?
-        raise Timeout::Error if Time.now > deadline
-        @resource.wait(@mutex, timeout)
+        to_wait = deadline - Time.now
+        raise Timeout::Error if to_wait <= 0
+        @resource.wait(@mutex, to_wait)
       end
     end
   end