connection_pool 0.0.3 → 0.1.0

data/Changes.md

@@ -0,0 +1,5 @@
+0.1.0
+--------
+
+- More precise timeouts and better error message
+- ConnectionPool now subclasses BasicObject so `method_missing` is more effective.

data/README.md

@@ -5,6 +5,12 @@ Generic connection pooling for Ruby.
 
 MongoDB has its own connection pool.  ActiveRecord has its own connection pool.  This is a generic connection pool that can be used with anything, e.g. Redis, Dalli and other Ruby network clients.
 
+Requirements
+--------------
+
+connection_pool requires Ruby 1.9 because it uses BasicObject.
+
+
 Install
 ------------
 
@@ -27,4 +33,4 @@ Then use the pool in your application:
 Author
 --------------
 
-Mike Perham, [@mperham](https://twitter.com/mperham), <http://mikeperham.com>
+Mike Perham, [@mperham](https://twitter.com/mperham), <http://mikeperham.com>

data/lib/connection_pool.rb

@@ -1,4 +1,4 @@
-require 'connection_pool/timed_queue'
+require 'timed_queue'
 
 # Generic connection pool class for e.g. sharing a limited number of network connections
 # among many threads.  Note: Connections are eager created.
@@ -23,18 +23,18 @@ require 'connection_pool/timed_queue'
 # - :size - number of connections to pool, defaults to 5
 # - :timeout - amount of time to wait for a connection if none currently available, defaults to 5 seconds
 #
-class ConnectionPool
+class ConnectionPool < BasicObject
   DEFAULTS = { :size => 5, :timeout => 5 }
 
-  def initialize(options={})
-    raise ArgumentError, 'Connection pool requires a block' unless block_given?
+  def initialize(options={}, &block)
+    ::Kernel.raise ::ArgumentError, 'Connection pool requires a block' unless block
 
-    @available = TimedQueue.new
+    @available = ::TimedQueue.new
+    @oid = @available.object_id
     @options = DEFAULTS.merge(options)
     @options[:size].times do
-      @available << yield
+      @available << block.call
     end
-    @busy = []
   end
 
   def with(&block)
@@ -53,18 +53,15 @@ class ConnectionPool
   private
 
   def checkout
-    Thread.current[:"current-#{self.object_id}"] ||= begin
-      conn = @available.timed_pop(@options[:timeout])
-      @busy << conn
-      conn
+    ::Thread.current[:"current-#{@oid}"] ||= begin
+      @available.timed_pop(@options[:timeout])
     end
   end
 
   def checkin
-    conn = Thread.current[:"current-#{self.object_id}"]
-    Thread.current[:"current-#{self.object_id}"] = nil
+    conn = ::Thread.current[:"current-#{@oid}"]
+    ::Thread.current[:"current-#{@oid}"] = nil
     return unless conn
-    @busy.delete(conn)
     @available << conn
     nil
   end

data/lib/connection_pool/version.rb

@@ -1,3 +1,3 @@
-module ConnectionPool
-  VERSION = "0.0.3"
+class ConnectionPool
+  VERSION = "0.1.0"
 end

data/lib/{connection_pool/timed_queue.rb → timed_queue.rb}

@@ -21,8 +21,9 @@ class TimedQueue
     @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, "Waited #{timeout} sec" if to_wait <= 0
+        @resource.wait(@mutex, to_wait)
       end
     end
   end

metadata

@@ -2,7 +2,7 @@
 name: connection_pool
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Mike Perham
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-12 00:00:00 -07:00
-default_executable: 
+date: 2011-09-19 00:00:00 Z
 dependencies: []
 
 description: Generic connection pool for Ruby
@@ -25,17 +24,17 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- Changes.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - connection_pool.gemspec
 - lib/connection_pool.rb
-- lib/connection_pool/timed_queue.rb
 - lib/connection_pool/version.rb
+- lib/timed_queue.rb
 - test/helper.rb
 - test/test_connection_pool.rb
-has_rdoc: true
 homepage: ""
 licenses: []
 
@@ -59,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Generic connection pool for Ruby