fiber_connection_pool 0.2.4 → 0.2.5

data/README.md

@@ -169,7 +169,7 @@ pool = FiberConnectionPool.new(:size => 5){ MyFancyConnection.new }
 # add a request to save data for each successful call on a connection
 # will save the return value inside a hash on the key ':affected_rows'
 # and make it available for the fiber that made the call
-pool.save_data(:affected_rows) do |connection|
+pool.save_data(:affected_rows) do |connection, method, args|
   connection.affected_rows
 end
 ```
@@ -191,7 +191,7 @@ right after you made the query that generated it. But you could:
 
 ``` ruby
 # save only the first run
-pool.save_data(:affected_rows) do |connection|
+pool.save_data(:affected_rows) do |connection, method, args|
   pool.gathered_data[:affected_rows] || connection.affected_rows
 end
 ```

data/lib/fiber_connection_pool.rb

@@ -2,7 +2,7 @@ require 'fiber'
 require_relative 'fiber_connection_pool/exceptions'
 
 class FiberConnectionPool
-  VERSION = '0.2.4'
+  VERSION = '0.2.5'
 
   RESERVED_TTL_SECS = 30 # reserved cleanup trigger
   SAVED_DATA_TTL_SECS = 30 # saved_data cleanup trigger
@@ -44,27 +44,22 @@ class FiberConnectionPool
   # call to -any- method on the connection.
   # The connection and the method name are passed to the block.
   #
-  # The returned value will be saved in pool.saved_data[Fiber.current][key],
+  # The returned value will be saved in pool.gathered_data[key],
   # and will be kept as long as the fiber stays alive.
   #
   # Ex:
   #
   #   # (...right after pool's creation...)
-  #   pool.save_data(:hey_or_hoo) do |conn, method|
+  #   pool.save_data(:hey_or_hoo) do |conn, method, args|
   #     return 'hey' if method == 'query'
   #     'hoo'
   #   end
   #
   #   # (...from a reactor fiber...)
-  #   myfiber = Fiber.current
   #   pool.query('select anything from anywhere')
-  #   puts pool.saved_data[myfiber][:hey_or_hoo]
+  #   puts pool.gathered_data[:hey_or_hoo]
   #     => 'hey'
   #
-  #   # (...eventually fiber dies...)
-  #   puts pool.saved_data[myfiber].inspect
-  #     => nil
-  #
   def save_data(key, &block)
     @save_data_requests[key] = block
   end
@@ -100,7 +95,7 @@ class FiberConnectionPool
   # Avoid method_missing stack for 'query'
   #
   def query(sql, *args)
-    execute('query') do |conn|
+    execute('query', args) do |conn|
       conn.query sql, *args
     end
   end
@@ -152,7 +147,7 @@ class FiberConnectionPool
   #
   # After running the block, save requested data and release the connection.
   #
-  def execute(method)
+  def execute(method, args)
     f = Fiber.current
     begin
       # get a connection and use it
@@ -160,7 +155,7 @@ class FiberConnectionPool
       retval = yield conn
 
       # save anything requested
-      process_save_data(f, conn, method)
+      process_save_data(f, conn, method, args)
 
       # successful run, release
       release(f)
@@ -181,10 +176,10 @@ class FiberConnectionPool
   # and save the data for the given fiber.
   # Also perform cleanup if TTL is past
   #
-  def process_save_data(fiber, conn, method)
+  def process_save_data(fiber, conn, method, args)
     @save_data_requests.each do |key,block|
       @saved_data[fiber] ||= {}
-      @saved_data[fiber][key] = block.call(conn, method)
+      @saved_data[fiber][key] = block.call(conn, method, args)
     end
     # try cleanup
     save_data_cleanup if (Time.now - @last_data_cleanup) >= SAVED_DATA_TTL_SECS
@@ -227,7 +222,7 @@ class FiberConnectionPool
   # waiting for IO, allowing the reactor run other fibers)
   #
   def method_missing(method, *args, &blk)
-    execute(method) do |conn|
+    execute(method, args) do |conn|
       conn.send(method, *args, &blk)
     end
   end

data/test/fiber_connection_pool_test.rb

@@ -242,8 +242,17 @@ class TestFiberConnectionPool < Minitest::Test
     pool = FiberConnectionPool.new(:size => 2) { ::EMSynchronyConnection.new(:delay => 0.05) }
 
     # ask to save some data
-    pool.save_data(:connection_id) { |conn| conn.object_id }
-    pool.save_data(:fiber_id) { |conn| Fiber.current.object_id }
+    pool.save_data(:connection_id) do |conn, method, args| 
+      assert_equal :do_something, method
+      assert_equal info, args.first # args is an array with the args given to the method
+      conn.object_id 
+    end
+    
+    pool.save_data(:fiber_id) do |conn, method, args| 
+      assert_equal :do_something, method
+      assert_equal info, args.first
+      Fiber.current.object_id 
+    end
 
     fibers = Array.new(4) do
       Fiber.new do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fiber_connection_pool
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-23 00:00:00.000000000 Z
+date: 2013-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest