connection_pool 0.1.0 → 0.9.0

data/Changes.md

@@ -1,3 +1,9 @@
+0.9.0
+--------
+
+- Move method\_missing magic into ConnectionPool::Wrapper (djanowski)
+- Remove BasicObject superclass (djanowski)
+
 0.1.0
 --------
 

data/Gemfile

@@ -3,4 +3,5 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in connection_pool.gemspec
 gemspec
 
-gem 'minitest'
+gem 'rake'
+gem 'minitest'

data/lib/connection_pool.rb

@@ -1,3 +1,4 @@
+require 'connection_pool/version'
 require 'timed_queue'
 
 # Generic connection pool class for e.g. sharing a limited number of network connections
@@ -11,59 +12,72 @@ require 'timed_queue'
 #      redis.lpop('my-list') if redis.llen('my-list') > 0
 #    end
 #
-# Example usage replacing a global connection (slower):
+# Example usage replacing an existing connection (slower):
 #
-#    REDIS = ConnectionPool.new { Redis.new }
+#    $redis = ConnectionPool.wrap { Redis.new }
 #
 #    def do_work
-#      REDIS.lpop('my-list') if REDIS.llen('my-list') > 0
+#      $redis.lpop('my-list') if $redis.llen('my-list') > 0
 #    end
 #
 # Accepts the following options:
 # - :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 < BasicObject
+class ConnectionPool
   DEFAULTS = { :size => 5, :timeout => 5 }
 
+  def self.wrap(options, &block)
+    Wrapper.new(options, &block)
+  end
+
   def initialize(options={}, &block)
-    ::Kernel.raise ::ArgumentError, 'Connection pool requires a block' unless block
+    raise ArgumentError, 'Connection pool requires a block' unless block
 
-    @available = ::TimedQueue.new
-    @oid = @available.object_id
-    @options = DEFAULTS.merge(options)
-    @options[:size].times do
-      @available << block.call
-    end
+    options = DEFAULTS.merge(options)
+
+    @size = options[:size]
+    @timeout = options[:timeout]
+
+    @available = ::TimedQueue.new(@size, &block)
+    @key = :"current-#{@available.object_id}"
   end
 
-  def with(&block)
+  def with
     yield checkout
   ensure
     checkin
   end
   alias_method :with_connection, :with
 
-  def method_missing(name, *args)
-    checkout.send(name, *args)
-  ensure
-    checkin
-  end
-
-  private
-
   def checkout
-    ::Thread.current[:"current-#{@oid}"] ||= begin
-      @available.timed_pop(@options[:timeout])
-    end
+    ::Thread.current[@key] ||= @available.timed_pop(@timeout)
   end
 
   def checkin
-    conn = ::Thread.current[:"current-#{@oid}"]
-    ::Thread.current[:"current-#{@oid}"] = nil
+    conn = ::Thread.current[@key]
+    ::Thread.current[@key] = nil
     return unless conn
     @available << conn
     nil
   end
 
+  class Wrapper
+    def initialize(options = {}, &block)
+      @pool = ::ConnectionPool.new(options, &block)
+    end
+
+    def with
+      yield @pool.checkout
+    ensure
+      @pool.checkin
+    end
+    alias_method :with_connection, :with
+
+    def method_missing(name, *args, &block)
+      @pool.with do |connection|
+        connection.send(name, *args, &block)
+      end
+    end
+  end
 end

data/lib/connection_pool/version.rb

@@ -1,3 +1,3 @@
-class ConnectionPool
-  VERSION = "0.1.0"
+class ConnectionPool < BasicObject
+  VERSION = "0.9.0"
 end

data/lib/timed_queue.rb

@@ -2,8 +2,8 @@ require 'thread'
 require 'timeout'
 
 class TimedQueue
-  def initialize
-    @que = []
+  def initialize(size = 0)
+    @que = Array.new(size) { yield }
     @mutex = Mutex.new
     @resource = ConditionVariable.new
   end

data/test/helper.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'minitest/pride'
 require 'minitest/autorun'
 
 require 'connection_pool'

data/test/test_connection_pool.rb

@@ -15,6 +15,11 @@ class TestConnectionPool < MiniTest::Unit::TestCase
     def fast
       @x += 1
     end
+    def do_something_with_block
+      @x += yield
+      sleep 0.05
+      @x
+    end
   end
 
   def test_basic_multithreaded_usage
@@ -27,12 +32,12 @@ class TestConnectionPool < MiniTest::Unit::TestCase
         end
       end
     end
-    
+
     a = Time.now
     result = threads.map(&:value)
     b = Time.now
     assert_operator((b - a), :>, 0.125)
-    assert_equal(result, [1,2,3].cycle(5).sort)
+    assert_equal([1,2,3].cycle(5).sort, result.sort)
   end
 
   def test_timeout
@@ -45,7 +50,7 @@ class TestConnectionPool < MiniTest::Unit::TestCase
     end
     sleep 0.05
     assert_raises Timeout::Error do
-      pool.do_something
+      pool.with { |net| net.do_something }
     end
 
     sleep 0.05
@@ -55,9 +60,11 @@ class TestConnectionPool < MiniTest::Unit::TestCase
   end
 
   def test_passthru
-    pool = ConnectionPool.new(:timeout => 0.1, :size => 1) { NetworkConnection.new }
+    pool = ConnectionPool.wrap(:timeout => 0.1, :size => 1) { NetworkConnection.new }
     assert_equal 1, pool.do_something
     assert_equal 2, pool.do_something
+    assert_equal 5, pool.do_something_with_block { 3 }
+    assert_equal 6, pool.with { |net| net.fast }
   end
 
   def test_return_value

metadata

@@ -1,28 +1,23 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: connection_pool
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.9.0
   prerelease: 
-  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-19 00:00:00 Z
+date: 2012-03-14 00:00:00.000000000 Z
 dependencies: []
-
 description: Generic connection pool for Ruby
-email: 
+email:
 - mperham@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Changes.md
 - Gemfile
@@ -35,33 +30,30 @@ files:
 - lib/timed_queue.rb
 - test/helper.rb
 - test/test_connection_pool.rb
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Generic connection pool for Ruby
-test_files: 
+test_files:
 - test/helper.rb
 - test/test_connection_pool.rb