with_connection 0.1.19 → 0.1.20

data/VERSION

@@ -1 +1 @@
-0.1.19
+0.1.20

data/lib/with_connection/connection_pool.rb

@@ -16,9 +16,17 @@ module WithConnection
       !! @reserved_connections[current_connection_id]
     end
 
-    def with_connection_with_debug(&block)
+    def with_connection(key=nil, read_write=nil)
+      connection_id = current_connection_id
+      fresh_connection = true unless @reserved_connections[connection_id]
+      yield connection
+    ensure
+      release_connection(connection_id) if fresh_connection
+    end
+
+    def with_connection_with_debug(key=nil, read_write=nil, &block)
       @using_with_connection = true
-      with_connection_without_debug(&block).tap { @using_with_connection = false }
+      with_connection_without_debug(key, read_write, &block).tap { @using_with_connection = false }
     end
     alias_method_chain :with_connection, :debug
 

data/lib/with_connection/ranged_connection_pool.rb

@@ -8,17 +8,18 @@ module WithConnection
       @key_algo = key_algo
     end
 
-    def with_connection(key=nil, &block)
-      local_current[:with_connection_ranged_connection_pool] = pool_for_key(key)
-      local_current[:with_connection_ranged_connection_pool].with_connection(&block)
+    def with_connection(key=nil, read_write=nil, &block)
+      local_current[:with_connection_ranged_connection_pool] = pool_for_key(key, read_write)
+      local_current[:with_connection_ranged_connection_pool].with_connection(key, read_write, &block)
+    ensure
+      local_current[:with_connection_ranged_connection_pool] = nil
     end
 
     def connection
-      local_current[:with_connection_ranged_connection_pool] ||= @default_pool
-      local_current[:with_connection_ranged_connection_pool].connection
+      local_current[:with_connection_ranged_connection_pool].try(:connection) || @default_pool.connection
     end
 
-    def pool_for_key(key)
+    def pool_for_key(key, read_write)
       key = self.key_algo.call(key) if key
       key.nil? ?
       @default_pool : 

data/with_connection.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "with_connection"
-  s.version = "0.1.19"
+  s.version = "0.1.20"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Doug Youch"]
-  s.date = "2013-06-22"
+  s.date = "2013-06-24"
   s.description = "Uses active record connection pool logic with the fiber_patch"
   s.email = "doug@sessionm.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: with_connection
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-22 00:00:00.000000000 Z
+date: 2013-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -115,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4347250007370076659
+      hash: -2152765510823986754
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: