fiber_connection_pool 0.2.3 → 0.2.4

data/.gitignore

@@ -18,3 +18,4 @@ _yardoc
 doc/
 
 Gemfile.lock
+*.orig

data/.travis.yml

@@ -3,4 +3,3 @@ script: rake
 rvm:
   - 1.9.3
   - 2.0.0
-  - rbx-19mode

data/README.md

@@ -99,6 +99,8 @@ We use it extensively with MySQL connections with Goliath servers by using `Mysq
 from [em-synchrony](https://github.com/igrigorik/em-synchrony).
 And for Celluloid by using a patched version of [ruby-mysql](https://github.com/rubencaro/ruby-mysql).
 By >=0.2 there is no MySQL-specific code, so it can be used with any kind of connection that can be fibered.
+Take a look at the `examples` folder to see it can be used seamlessly with MySQL and MongoDB.
+You could do it the same way with CouchDB, etc. , or anything you would put on a pool inside a fiber reactor.
 
 Reacting to connection failure
 ------------------
@@ -129,7 +131,7 @@ rescue BadQueryMadeMeWorse  # rescue and treat only classes on 'treated_exceptio
     puts "Replacing #{connection.inspect} with a new one!"
     MyFancyConnection.new
   end
-  
+
 rescue Exception => ex  # do not treat the rest of exceptions
 
   log ex.to_s  # -> 'You have a typo on your sql...'
@@ -142,14 +144,14 @@ you execute a block of code over it. It must return a connection instance, and i
 in place of the failed one. It can be the same instance after being fixed, or maybe a new one.
 The call to `with_failed_connection` must be made from the very same
 fiber that raised the exception. The failed connection will be kept out of the pool,
-and reserved for treatment, only if the exception is one of the given in `treated_exceptions`. 
-Otherwise `with_failed_connection` will raise `NoReservedConnection`. 
+and reserved for treatment, only if the exception is one of the given in `treated_exceptions`.
+Otherwise `with_failed_connection` will raise `NoReservedConnection`.
 
 Also the reference to the failed connection will be lost after any method execution from that
-fiber. So you must call `with_failed_connection` before any other method that may acquire a new 
+fiber. So you must call `with_failed_connection` before any other method that may acquire a new
 instance from the pool.
 
-Any reference to a failed connection is released when the fiber is dead, but as you must access 
+Any reference to a failed connection is released when the fiber is dead, but as you must access
 it from the fiber itself, worry should not.
 
 Save data
@@ -204,7 +206,8 @@ Supported Platforms
 -------------------
 
 Used in production environments on Ruby 1.9.3 and 2.0.0.
-Tested against Ruby 1.9.3, 2.0.0, and rbx-19mode ([See details..](http://travis-ci.org/rubencaro/fiber_connection_pool)).
+Tested against Ruby 1.9.3 and 2.0.0 ([See details..](http://travis-ci.org/rubencaro/fiber_connection_pool)).
+It should work on any platform implementing fibers. There's no further magic involved.
 
 More to come !
 -------------------

data/examples/em_ws_mongo/Gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+gem 'websocket-eventmachine-server'
+gem 'em-synchrony'
+gem 'mongo'
+gem 'fiber_connection_pool'
+gem 'mongo-em-patch', :github => 'rubencaro/mongo-em-patch'

data/examples/em_ws_mongo/main.rb

@@ -0,0 +1,37 @@
+require 'websocket-eventmachine-server'
+require 'fiber_connection_pool'
+require 'mongo'
+require 'em-synchrony'
+require 'mongo-em-patch'
+require 'fiber'
+
+EM.synchrony do
+
+  @pool = FiberConnectionPool.new(:size => 5) do
+             Mongo::Connection.new.db('bogusdb')
+           end
+
+  WebSocket::EventMachine::Server.start(:host => "0.0.0.0", :port => 3000) do |ws|
+
+    ws.onopen do
+      puts "Client connected"
+    end
+
+    ws.onmessage do |msg, type|
+      puts "Received message: #{msg}"
+      print '.'
+      Fiber.new do
+        res = @pool.collection('bogus').find( :$where => "sleep(2000)" ).count
+        msg = "Done #{Thread.current.to_s}, #{Fiber.current.to_s} res:#{res.inspect}"
+        puts msg
+        ws.send msg, :type => type
+      end.resume
+    end
+
+    ws.onclose do
+      puts "Client disconnected"
+    end
+
+  end
+
+end

data/examples/goliath_server_mongo/Gemfile

@@ -3,3 +3,4 @@ gem 'goliath'
 gem 'em-synchrony'
 gem 'mongo'
 gem 'fiber_connection_pool'
+gem 'mongo-em-patch', :github => 'rubencaro/mongo-em-patch'

data/examples/goliath_server_mongo/config/main.rb

@@ -1,9 +1,7 @@
 require 'fiber_connection_pool'
 require 'mongo'
 require 'em-synchrony'
-#require 'em-synchrony/mongo'
-
-require './mongo-em-patch.rb'
+require 'mongo-em-patch'
 
 config['db'] = FiberConnectionPool.new(:size => 5) do
                  Mongo::Connection.new.db('bogusdb')

data/examples/reel_server_mongo/Gemfile

@@ -5,4 +5,3 @@ gem 'celluloid-io', github: 'celluloid/celluloid-io', branch: 'master'
 gem 'reel', github: 'celluloid/reel', branch: 'master'
 gem 'mongo'
 gem 'fiber_connection_pool'
-gem 'em-synchrony'

data/examples/reel_server_mongo/main.rb

@@ -4,61 +4,39 @@ require 'fiber'
 require 'fiber_connection_pool'
 require 'celluloid/autostart'
 
+require './mongo-patch.rb'
+
 class Dispatcher
   include Celluloid::IO
 
   def initialize(opts = {})
     @db_pool_size = opts[:db_pool_size] || 5
     @pool = FiberConnectionPool.new(:size => @db_pool_size) do
-      Mongo::MongoClient.new.db('bogusdb')
+      Mongo::Connection.new.db('bogusdb')
     end
     puts "DB Pool of size #{@db_pool_size} ready..."
   end
 
   def dispatch(request)
     print '.'
-    id = @pool.collection("bogus").find({ :$where => 'sleep(2000)' }).count
-    puts "Done #{Thread.current.to_s}, #{Fiber.current.to_s}"
+    res = @pool.collection('bogus').find( :$where => "sleep(2000)" ).count
+    puts "Done #{Thread.current.to_s}, #{Fiber.current.to_s} res:#{res.inspect}"
     request.respond :ok, "hello, world! #{Time.now.strftime('%T')}"
   end
 end
 
 
-class DispatcherPool
-
-  def initialize(opts = {})
-    @size = opts[:size] || 1
-    @dispatchers = []
-    @size.times{ |i| @dispatchers << "dispatcher_#{i}".to_sym }
-    @dispatchers.each{ |d| Dispatcher.supervise_as d }
-    @next_dispatcher = 0
-    puts "Pool of #{@size} dispatchers ready."
-  end
-
-  def dispatch(request)
-    d = @next_dispatcher
-    @next_dispatcher += 1
-    @next_dispatcher = 0 if @next_dispatcher >= @dispatchers.count
-    Celluloid::Actor[@dispatchers[d]].dispatch(request)
-  rescue => ex
-    puts "Someone died: #{ex}"
-    request.respond :internal_server_error, "Someone died"
-  end
-
-end
-
-
 class MyServer < Reel::Server
 
   def initialize(host = "127.0.0.1", port = 3000)
     super(host, port, &method(:on_connection))
-    @dispatcher = DispatcherPool.new
+    Dispatcher.supervise_as :dispatcher
     puts "Listening on #{host}:#{port}..."
   end
 
   def on_connection(connection)
     while request = connection.request
-      @dispatcher.dispatch(request)
+      Celluloid::Actor[:dispatcher].dispatch(request)
     end
   end
 

data/examples/reel_server_mongo/mongo-patch.rb

@@ -0,0 +1,63 @@
+require 'fiber'
+require 'celluloid'
+
+class MongoTimeoutHandler
+  def self.timeout(op_timeout, ex_class, &block)
+    f = Fiber.current
+    timer = Celluloid::Actor.current.after(op_timeout) { f.resume(nil) }
+    res = block.call
+    timer.cancel
+    res
+  end
+end
+
+class Mongo::MongoClient
+  Timeout = MongoTimeoutHandler
+end
+
+class Mongo::Node
+  Timeout = MongoTimeoutHandler
+end
+
+class Mongo::TCPSocket
+  Timeout = MongoTimeoutHandler
+end
+
+class Mongo::SSLSocket
+  Timeout = MongoTimeoutHandler
+end
+
+class Mongo::TCPSocket
+
+  def initialize(host, port, op_timeout=nil, connect_timeout=nil, opts={})
+    @op_timeout      = op_timeout || 30
+    @connect_timeout = connect_timeout || 30
+    @pid             = Process.pid
+
+    # TODO: Prefer ipv6 if server is ipv6 enabled
+    @address = Socket.getaddrinfo(host, nil, Socket::AF_INET).first[3]
+    @port    = port
+
+    @socket = nil
+    connect
+  end
+
+  def connect
+    MongoTimeoutHandler.timeout(@connect_timeout, Mongo::ConnectionTimeoutError) do
+      @socket = Celluloid::IO::TCPSocket.new(@address, @port)
+    end
+  end
+
+  def send(data)
+    raise SocketError, 'Not connected yet' if not @socket
+    @socket.write(data)
+  end
+
+  def read(maxlen, buffer)
+    raise SocketError, 'Not connected yet' if not @socket
+    MongoTimeoutHandler.timeout(@op_timeout, Mongo::OperationTimeout) do
+      @socket.read(maxlen, buffer)
+    end
+  end
+
+end

data/examples/ws.html

@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <script>
+      var ws;
+      function debug(string) {
+        var element = document.getElementById("debug");
+        var p = document.createElement("p");
+        p.appendChild(document.createTextNode(string));
+        element.appendChild(p);
+      };
+      function close_connection(){
+        ws.close();
+        debug("closed");
+      };
+      function open_connection(){
+        ws = new WebSocket("ws://localhost:3000");
+        ws.onmessage = function(evt) { debug("Received: " + evt.data); };
+        ws.onclose = function(event) {
+          debug("Closed - code: " + event.code + ", reason: " + event.reason + ", wasClean: " + event.wasClean);
+        };
+        ws.onopen = function() {
+          debug("connected...");
+        };
+      };
+      function send_msg(){
+        ws.send('hello server');
+        debug("message sent...");
+      };
+    </script>
+  </head>
+  <body>
+    <button onclick="open_connection();">Open</button>
+    <button onclick="close_connection();">Close</button>
+    <button onclick="send_msg();">Send Msg</button>
+    <div id="debug"></div>
+  </body>
+</html>

data/lib/fiber_connection_pool.rb

@@ -2,7 +2,7 @@ require 'fiber'
 require_relative 'fiber_connection_pool/exceptions'
 
 class FiberConnectionPool
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 
   RESERVED_TTL_SECS = 30 # reserved cleanup trigger
   SAVED_DATA_TTL_SECS = 30 # saved_data cleanup trigger
@@ -99,9 +99,9 @@ class FiberConnectionPool
 
   # Avoid method_missing stack for 'query'
   #
-  def query(sql)
+  def query(sql, *args)
     execute('query') do |conn|
-      conn.query sql
+      conn.query sql, *args
     end
   end
 

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: fiber_connection_pool
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
+  prerelease: 
 platform: ruby
 authors:
 - Ruben Caro
@@ -9,40 +10,43 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-14 00:00:00.000000000 Z
+date: 2013-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: |-
-  Fiber-based generic connection pool for Ruby, allowing
-                    non-blocking IO behaviour on the same thread
-                    as provided by EventMachine or Celluloid.
+description: ! "Fiber-based generic connection pool for Ruby, allowing\n                  non-blocking
+  IO behaviour on the same thread\n                  as provided by EventMachine or
+  Celluloid."
 email:
 - ruben.caro@lanuez.org
 executables: []
@@ -56,20 +60,23 @@ files:
 - README.md
 - Rakefile
 - examples/.placeholder
-- examples/goliath_server/Gemfile
-- examples/goliath_server/config/main.rb
-- examples/goliath_server/main.rb
+- examples/em_ws_mongo/Gemfile
+- examples/em_ws_mongo/main.rb
 - examples/goliath_server_em_mongo/Gemfile
 - examples/goliath_server_em_mongo/config/main.rb
 - examples/goliath_server_em_mongo/main.rb
 - examples/goliath_server_mongo/Gemfile
 - examples/goliath_server_mongo/config/main.rb
 - examples/goliath_server_mongo/main.rb
-- examples/goliath_server_mongo/mongo-em-patch.rb
-- examples/reel_server/Gemfile
-- examples/reel_server/main.rb
+- examples/goliath_server_mysql/Gemfile
+- examples/goliath_server_mysql/config/main.rb
+- examples/goliath_server_mysql/main.rb
 - examples/reel_server_mongo/Gemfile
 - examples/reel_server_mongo/main.rb
+- examples/reel_server_mongo/mongo-patch.rb
+- examples/reel_server_mysql/Gemfile
+- examples/reel_server_mysql/main.rb
+- examples/ws.html
 - fiber_connection_pool.gemspec
 - lib/fiber_connection_pool.rb
 - lib/fiber_connection_pool/exceptions.rb
@@ -78,26 +85,27 @@ files:
 homepage: https://github.com/rubencaro/fiber_connection_pool
 licenses:
 - GPLv3
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Fiber-based generic connection pool for Ruby
 test_files:
 - test/fiber_connection_pool_test.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 340c349ed71fd516c16b2ec7ff01b6de4fb65072
-  data.tar.gz: 31d1a2a20a195afa721c39ee2c8a65171fc0f8a2
-SHA512:
-  metadata.gz: 23daf95d4cb681737c91c94172503be106ea0f518ab26f140025c840367fc92abcc922089a46cc3e5c6844f87458da0a03e4f4dc0835d9defadbf3e987e2a8db
-  data.tar.gz: 269f02b50cda24eb6a0e23e683ee74060d4c57de74ed1e3827349c01872df0e89e802211c256fb152714e7ccb6a50dbedc67a237c9e154dfb5b6326ec848a0be

data/examples/goliath_server_mongo/mongo-em-patch.rb

@@ -1,85 +0,0 @@
-require 'fiber'
-
-class EventMachine::Synchrony::MongoTimeoutHandler
-  def self.timeout(op_timeout, ex_class, &block)
-    f = Fiber.current
-    timer = EM::Timer.new(op_timeout) { f.resume(nil) }
-    res = block.call
-    timer.cancel
-    res
-  end
-end
-
-class Mongo::Connection
-  Mutex = ::EventMachine::Synchrony::Thread::Mutex
-end
-
-class Mongo::MongoClient
-  ConditionVariable = ::EventMachine::Synchrony::Thread::ConditionVariable
-  Timeout = ::EventMachine::Synchrony::MongoTimeoutHandler
-end
-
-class Mongo::Pool
-  ConditionVariable = ::EventMachine::Synchrony::Thread::ConditionVariable
-  Mutex = ::EventMachine::Synchrony::Thread::Mutex
-end
-
-class Mongo::Node
-  Mutex = ::EventMachine::Synchrony::Thread::Mutex
-  Timeout = ::EventMachine::Synchrony::MongoTimeoutHandler
-end
-
-class Mongo::TCPSocket
-  Timeout = ::EventMachine::Synchrony::MongoTimeoutHandler
-end
-
-class Mongo::SSLSocket
-  Timeout = ::EventMachine::Synchrony::MongoTimeoutHandler
-end
-
-class Mongo::MongoReplicaSetClient
-  Mutex = ::EventMachine::Synchrony::Thread::Mutex
-end
-
-class Mongo::MongoShardedClient
-  Mutex = ::EventMachine::Synchrony::Thread::Mutex
-end
-
-class Mongo::PoolManager
-  Mutex = ::EventMachine::Synchrony::Thread::Mutex
-end
-
-class Mongo::TCPSocket
-
-  def initialize(host, port, op_timeout=nil, connect_timeout=nil, opts={})
-    @op_timeout      = op_timeout || 30
-    @connect_timeout = connect_timeout || 30
-    @pid             = Process.pid
-
-    # TODO: Prefer ipv6 if server is ipv6 enabled
-    @address = Socket.getaddrinfo(host, nil, Socket::AF_INET).first[3]
-    @port    = port
-
-    @socket = nil
-    connect
-  end
-
-  def connect
-    ::EventMachine::Synchrony::MongoTimeoutHandler.timeout(@connect_timeout, Mongo::ConnectionTimeoutError) do
-      @socket = EM::Synchrony::TCPSocket.new(@address, @port)
-    end
-  end
-
-  def send(data)
-    raise SocketError, 'Not connected yet' if not @socket
-    @socket.write(data)
-  end
-
-  def read(maxlen, buffer)
-    raise SocketError, 'Not connected yet' if not @socket
-    ::EventMachine::Synchrony::MongoTimeoutHandler.timeout(@op_timeout, Mongo::OperationTimeout) do
-      @socket.read(maxlen, buffer)
-    end
-  end
-
-end