squirm 0.0.3 → 0.0.4

data/lib/squirm/core.rb

@@ -34,7 +34,8 @@ module Squirm
     # Executes the query and passes the result to the block you specify.
     def exec(*args, &block)
       if current = Thread.current[:squirm_connection]
-        current.exec(*args, &block)
+        conn = current.respond_to?(:raw_connection) ? current.raw_connection : current
+        conn.exec(*args, &block)
       else
         use {|conn| conn.exec(*args, &block)}
       end
@@ -70,16 +71,18 @@ module Squirm
       block_given? ? transaction {yield; rollback} : (raise Rollback)
     end
 
-    # Checks out a connection and uses it for all database access inside the
-    # block.
-    def use
-      conn = @pool.checkout
+    # Uses a connection for all database access inside the given block. If no
+    # connection is given, then one will be checked out from the pool for use
+    # inside the block, and then checked back in when the method returns.
+    def use(conn = nil)
+      conn_given = !!conn
+      conn = conn_given ? conn : @pool.checkout
       begin
         Thread.current[:squirm_connection] = conn
         yield conn.respond_to?(:raw_connection) ? conn.raw_connection : conn
       ensure
         Thread.current[:squirm_connection] = nil
-        @pool.checkin conn
+        @pool.checkin conn unless conn_given
       end
     end
 

data/lib/squirm/version.rb

@@ -1,3 +1,3 @@
 module Squirm
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squirm
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70214491275780 !ruby/object:Gem::Requirement
+  requirement: &70112879161580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70214491275780
+  version_requirements: *70112879161580
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &70214494717880 !ruby/object:Gem::Requirement
+  requirement: &70112879182280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 0.11.0
   type: :runtime
   prerelease: false
-  version_requirements: *70214494717880
+  version_requirements: *70112879182280
 description: ! '"Squirm is an anti-ORM for database-loving programmers"'
 email:
 - norman@njclarke.com