em-synchrony 1.0.0 → 1.0.1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-synchrony
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-27 00:00:00.000000000Z
+date: 2012-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2154266640 !ruby/object:Gem::Requirement
+  requirement: &2152409200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 1.0.0.beta.1
   type: :runtime
   prerelease: false
-  version_requirements: *2154266640
+  version_requirements: *2152409200
 description: Fiber aware EventMachine libraries
 email:
 - ilya@igvita.com
@@ -43,11 +43,12 @@ files:
 - examples/go/consumer-publisher.rb
 - examples/go/go.rb
 - examples/nethttp.rb
+- lib/active_record/connection_adapters/em_mysql2_adapter.rb
 - lib/em-synchrony.rb
-- lib/em-synchrony/active_record/connection_adapters/em_mysql2_adapter.rb
-- lib/em-synchrony/active_record/patches.rb
 - lib/em-synchrony/activerecord.rb
+- lib/em-synchrony/amqp.rb
 - lib/em-synchrony/connection_pool.rb
+- lib/em-synchrony/core_ext.rb
 - lib/em-synchrony/em-hiredis.rb
 - lib/em-synchrony/em-http.rb
 - lib/em-synchrony/em-jack.rb
@@ -65,6 +66,7 @@ files:
 - lib/em-synchrony/tcpsocket.rb
 - lib/em-synchrony/thread.rb
 - spec/activerecord_spec.rb
+- spec/amqp_spec.rb
 - spec/beanstalk_spec.rb
 - spec/connection_pool_spec.rb
 - spec/em-mongo_spec.rb
@@ -79,11 +81,13 @@ files:
 - spec/keyboard_spec.rb
 - spec/memcache_spec.rb
 - spec/mongo_spec.rb
+- spec/multi_spec.rb
 - spec/mysql2_spec.rb
 - spec/redis_spec.rb
 - spec/remcached_spec.rb
 - spec/synchrony_spec.rb
 - spec/tcpsocket_spec.rb
+- spec/thread_spec.rb
 - spec/timer_spec.rb
 homepage: http://github.com/igrigorik/em-synchrony
 licenses: []
@@ -97,9 +101,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1015811308506799380
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -108,12 +109,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: em-synchrony
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Fiber aware EventMachine libraries
 test_files:
 - spec/activerecord_spec.rb
+- spec/amqp_spec.rb
 - spec/beanstalk_spec.rb
 - spec/connection_pool_spec.rb
 - spec/em-mongo_spec.rb
@@ -128,9 +130,12 @@ test_files:
 - spec/keyboard_spec.rb
 - spec/memcache_spec.rb
 - spec/mongo_spec.rb
+- spec/multi_spec.rb
 - spec/mysql2_spec.rb
 - spec/redis_spec.rb
 - spec/remcached_spec.rb
 - spec/synchrony_spec.rb
 - spec/tcpsocket_spec.rb
+- spec/thread_spec.rb
 - spec/timer_spec.rb
+has_rdoc: 

data/lib/em-synchrony/active_record/connection_adapters/em_mysql2_adapter.rb

@@ -1,18 +0,0 @@
-# encoding: utf-8
-
-# AR adapter for using a fibered mysql2 connection with EM
-# This adapter should be used within Thin or Unicorn with the rack-fiber_pool middleware.
-# Just update your database.yml's adapter to be 'em_mysql2'
-
-require 'active_record/connection_adapters/abstract_adapter'
-require 'active_record/connection_adapters/mysql2_adapter'
-
-module ActiveRecord
-  class Base
-    def self.em_mysql2_connection(config)
-      client = Mysql2::EM::Client.new(config.symbolize_keys)
-      options = [config[:host], config[:username], config[:password], config[:database], config[:port], config[:socket], 0]
-      ConnectionAdapters::Mysql2Adapter.new(client, logger, options, config)
-    end
-  end
-end

data/lib/em-synchrony/active_record/patches.rb

@@ -1,132 +0,0 @@
-# Necessary monkeypatching to make AR fiber-friendly.
-
-module ActiveRecord
-  module ConnectionAdapters
-
-    def self.fiber_pools
-      @fiber_pools ||= []
-    end
-    def self.register_fiber_pool(fp)
-      fiber_pools << fp
-    end
-
-    class FiberedMonitor
-      class Queue
-        def initialize
-          @queue = []
-        end
-
-        def wait(timeout)
-          t = timeout || 5
-          fiber = Fiber.current
-          x = EM::Timer.new(t) do
-            @queue.delete(fiber)
-            fiber.resume(false)
-          end
-          @queue << fiber
-          Fiber.yield.tap do
-            x.cancel
-          end
-        end
-
-        def signal
-          fiber = @queue.pop
-          fiber.resume(true) if fiber
-        end
-      end
-
-      def synchronize
-        yield
-      end
-
-      def new_cond
-        Queue.new
-      end
-    end
-
-    # ActiveRecord's connection pool is based on threads.  Since we are working
-    # with EM and a single thread, multiple fiber design, we need to provide
-    # our own connection pool that keys off of Fiber.current so that different
-    # fibers running in the same thread don't try to use the same connection.
-    class ConnectionPool
-      def initialize(spec)
-        @spec = spec
-
-        # The cache of reserved connections mapped to threads
-        @reserved_connections = {}
-
-        # The mutex used to synchronize pool access
-        @connection_mutex = FiberedMonitor.new
-        @queue = @connection_mutex.new_cond
-
-        # default 5 second timeout unless on ruby 1.9
-        @timeout = spec.config[:wait_timeout] || 5
-
-        # default max pool size to 5
-        @size = (spec.config[:pool] && spec.config[:pool].to_i) || 5
-
-        @connections = []
-        @checked_out = []
-        @automatic_reconnect = true
-        @tables = {}
-
-        @columns     = Hash.new do |h, table_name|
-          h[table_name] = with_connection do |conn|
-
-            # Fetch a list of columns
-            conn.columns(table_name, "#{table_name} Columns").tap do |columns|
-
-              # set primary key information
-              columns.each do |column|
-                column.primary = column.name == primary_keys[table_name]
-              end
-            end
-          end
-        end
-
-        @columns_hash = Hash.new do |h, table_name|
-          h[table_name] = Hash[columns[table_name].map { |col|
-            [col.name, col]
-          }]
-        end
-
-        @primary_keys = Hash.new do |h, table_name|
-          h[table_name] = with_connection do |conn|
-            table_exists?(table_name) ? conn.primary_key(table_name) : 'id'
-          end
-        end
-      end
-
-      def clear_stale_cached_connections!
-        cache = @reserved_connections
-        keys = Set.new(cache.keys)
-
-        ActiveRecord::ConnectionAdapters.fiber_pools.each do |pool|
-          pool.busy_fibers.each_pair do |object_id, fiber|
-            keys.delete(object_id)
-          end
-        end
-
-        keys.each do |key|
-          next unless cache.has_key?(key)
-          checkin cache[key]
-          cache.delete(key)
-        end
-      end
-
-      private
-
-      def current_connection_id #:nodoc:
-        Fiber.current.object_id
-      end
-
-      def checkout_and_verify(c)
-        @checked_out << c
-        c.run_callbacks :checkout
-        c.verify!
-        c
-      end
-    end
-
-  end
-end