em_mysql2_connection_pool 0.0.2 → 0.0.3

data/lib/em_mysql2_connection_pool.rb

@@ -2,32 +2,63 @@ require 'mysql2'
 require 'mysql2/em'
 
 class EmMysql2ConnectionPool
+  
+  class Query
+    def initialize(sql, opts, deferrable)
+      @sql, @opts, @deferrable = sql, opts, deferrable
+    end
+    
+    def sql(connection)
+      @sql.respond_to?(:call) ? @sql.call(connection) : @sql
+    end
+    
+    def execute(connection, &block)
+      @busy = true
+      q = connection.query sql(connection), @opts
+      q.callback{ |result| succeed result, connection.affected_rows, &block }
+      q.errback{  |error|  fail    error, &block }
+      return q
+    end
+    
+    def succeed(result, affected_rows, &block)
+      @deferrable.succeed result, affected_rows
+    ensure
+      @busy and block.call
+      @busy = false
+    end
+    def fail(error, &block)
+      @deferrable.fail error
+    ensure
+      @busy and block.call
+      @busy = false
+    end
+    
+  end
+  
   def initialize(conf)
     @pool_size   = conf[:size] || 10
     @query_queue = EM::Queue.new
     start_queue conf
   end
-
+  
   def worker
     proc{ |connection|
       @query_queue.pop do |query|
-        sql = query[:sql].is_a?(Proc) ? query[:sql].call(connection) : query[:sql]
-        
-        connection.query(sql, query[:opts]).callback do |result|
-          query[:callback].call result if query[:callback]
-          worker.call connection
-        end
+        query.execute(connection){ worker.call connection }
       end
     }
   end
-
+  
   def start_queue(conf)
     @pool_size.times do
       worker.call Mysql2::EM::Client.new conf
     end
   end
-
-  def query(sql, opts={}, &block)
-    @query_queue.push :sql => sql, :opts => opts, :callback => block
+  
+  def query(sql, opts={})
+    deferrable = EM::DefaultDeferrable.new
+    deferrable.callback{ |result,affected_rows| yield result, affected_rows } if block_given?
+    @query_queue.push Query.new(sql, opts, deferrable)
+    deferrable
   end
-end
+end

data/lib/em_mysql2_connection_pool/version.rb

@@ -1,3 +1,3 @@
 module EmMysql2ConnectionPool
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: em_mysql2_connection_pool
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
+  prerelease: 
+  version: 0.0.3
 platform: ruby
 authors: 
 - Niko Dittmann
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-28 00:00:00 +01:00
+date: 2011-03-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,8 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -38,8 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -51,8 +43,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
         version: "2"
   type: :development
   version_requirements: *id003
@@ -81,21 +71,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: em_mysql2_connection_pool
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: a simple connection pool for Mysql2::EM connections