em-synchrony 1.0.3 → 1.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c9fce19d87bacaaddaf2d367cf360ddc1b84c7b1
+  data.tar.gz: 61be19297e6ee682210f7275ef29085060ade75f
+SHA512:
+  metadata.gz: f963c206f3d8e4fe10bb4c1b67494915b65ae1a2b8a4c2551e51e8ee651c3dae2edc188452de23e92646990c7b1dee45232e8688014592ba7fa162a1b431a236
+  data.tar.gz: b2aac7705b2c345c1f9607443567c10f18edc190a0070193713d89b69e5d5f31f07d3746da0c6091c03472841431064bc7062be955f0d9040e93ff1769235b6b

data/README.md

@@ -1,5 +1,8 @@
 # EM-Synchrony
 
+[![Gem Version](https://badge.fury.io/rb/em-synchrony.png)](http://rubygems.org/gems/em-synchrony)
+[![Analytics](https://ga-beacon.appspot.com/UA-71196-10/em-synchrony/readme)](https://github.com/igrigorik/ga-beacon)
+
 Collection of convenience classes and primitives to help untangle evented code, plus a number of patched EM clients to make them Fiber aware. To learn more, please see: [Untangling Evented Code with Ruby Fibers](http://www.igvita.com/2010/03/22/untangling-evented-code-with-ruby-fibers).
 
  * Fiber aware ConnectionPool with sync/async query support
@@ -171,4 +174,4 @@ result = Widget.all.to_a
 
 # License
 
-The MIT License - Copyright (c) 2011 Ilya Grigorik
+The MIT License - Copyright (c) 2011 Ilya Grigorik

data/em-synchrony.gemspec

@@ -3,11 +3,12 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "em-synchrony"
-  s.version     = "1.0.3"
+  s.version     = "1.0.4"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Ilya Grigorik"]
   s.email       = ["ilya@igvita.com"]
   s.homepage    = "http://github.com/igrigorik/em-synchrony"
+  s.license     = "MIT"
   s.summary     = %q{Fiber aware EventMachine libraries}
   s.description = s.summary
 

data/lib/em-synchrony.rb

@@ -135,5 +135,13 @@ module EventMachine
     def self.gets
       EventMachine::Synchrony::Keyboard.new.gets
     end
+
+    # Interrupt current fiber to give chance to other fibers
+    #
+    def self.interrupt
+      fiber = Fiber.current
+      EM.next_tick { fiber.resume }
+      Fiber.yield
+    end
   end
 end

data/lib/em-synchrony/activerecord.rb

@@ -66,6 +66,47 @@ module EM::Synchrony
       def decrement_open_transactions
         real_connection.open_transactions -= 1
       end
+
+      def current_transaction #:nodoc:
+        @transaction[Fiber.current.object_id] || @closed_transaction
+      end
+
+      def transaction_open?
+        current_transaction.open?
+      end
+
+      def begin_transaction(options = {}) #:nodoc:
+        set_current_transaction(current_transaction.begin(options))
+      end
+
+      def commit_transaction #:nodoc:
+        set_current_transaction(current_transaction.commit)
+      end
+
+      def rollback_transaction #:nodoc:
+        set_current_transaction(current_transaction.rollback)
+      end
+
+      def reset_transaction #:nodoc:
+        @transaction = {}
+        @closed_transaction = ::ActiveRecord::ConnectionAdapters::ClosedTransaction.new(self)
+      end
+
+      # Register a record with the current transaction so that its after_commit and after_rollback callbacks
+      # can be called.
+      def add_transaction_record(record)
+        current_transaction.add_record(record)
+      end
+
+      protected
+
+      def set_current_transaction(t)
+        if t == @closed_transaction
+          @transaction.delete(Fiber.current.object_id)
+        else
+          @transaction[Fiber.current.object_id] = t
+        end
+      end
     end
 
     class ConnectionPool < EM::Synchrony::ConnectionPool
@@ -100,4 +141,4 @@ module EM::Synchrony
       end
     end
   end
-end
+end

data/lib/em-synchrony/amqp.rb

@@ -1,7 +1,7 @@
 begin
   require "amqp"
   require "amq/protocol"
-rescue LoadError => error
+rescue LoadError
   raise "Missing EM-Synchrony dependency: gem install amqp"
 end
 
@@ -22,7 +22,7 @@ module EventMachine
             if fiber == Fiber.current
               return *args
             else
-              fiber.resume *args
+              fiber.resume(*args)
             end
           end
         end
@@ -54,7 +54,7 @@ module EventMachine
             def #{type}(name = 'amq.#{type}', opts = {})
               if exchange = find_exchange(name)
                 extended_opts = Exchange.add_default_options(:#{type}, name, opts, nil)
-                validate_parameters_match!(exchange, extended_opts)
+                validate_parameters_match!(exchange, extended_opts, :exchange)
                 exchange
               else
                 register_exchange(Exchange.new(self, :#{type}, name, opts))

data/lib/em-synchrony/connection_pool.rb

@@ -27,6 +27,17 @@ module EventMachine
           release(f) if not async
         end
       end
+      
+      # Returns current pool utilization.
+      #
+      # @return [Hash] Current utilization.
+      def pool_status
+        {
+          available: @available.size,
+          reserved: @reserved.size,
+          pending: @pending.size
+        }
+      end
 
       private
 

data/lib/em-synchrony/em-hiredis.rb

@@ -6,94 +6,108 @@ end
 
 module EventMachine
   module Hiredis
-
+    
     def self.connect(uri = nil)
       client = setup(uri)
       EM::Synchrony.sync client.connect
       client
     end
-
+    
     class Client
+      def pubsub
+        return @pubsub if @pubsub
+
+        client = PubsubClient.new(@host, @port, @password, @db)
+        EM::Synchrony.sync client.connect
+        @pubsub = client
+      end
+    end
+    
+    class BaseClient
       def self.connect(host = 'localhost', port = 6379)
         conn = new(host, port)
         EM::Synchrony.sync conn.connect
         conn
       end
-
+      
       def connect
+        @auto_reconnect = true
         @connection = EM.connect(@host, @port, Connection, @host, @port)
-
+        
         @connection.on(:closed) do
           if @connected
-            @defs.each { |d| d.fail("Redis disconnected") }
+            @defs.each { |d| d.fail(Error.new("Redis disconnected")) }
             @defs = []
             @deferred_status = nil
             @connected = false
-            unless @closing_connection
-              @reconnecting = true
-              reconnect
+            if @auto_reconnect
+              # Next tick avoids reconnecting after for example EM.stop
+              EM.next_tick { reconnect }
             end
+            emit(:disconnected)
+            EM::Hiredis.logger.info("#{@connection} Disconnected")
           else
-            unless @closing_connection
-              EM.add_timer(1) { reconnect }
+            if @auto_reconnect
+              @reconnect_failed_count += 1
+              @reconnect_timer = EM.add_timer(EM::Hiredis.reconnect_timeout) {
+                @reconnect_timer = nil
+                reconnect
+              }
+              emit(:reconnect_failed, @reconnect_failed_count)
+              EM::Hiredis.logger.info("#{@connection} Reconnect failed")
+              
+              if @reconnect_failed_count >= 4
+                emit(:failed)
+                self.fail(Error.new("Could not connect after 4 attempts"))
+              end
             end
           end
         end
-
+        
         @connection.on(:connected) do
           Fiber.new do
             @connected = true
-
+            @reconnect_failed_count = 0
+            @failed = false
+            
+            select(@db) unless @db == 0
             auth(@password) if @password
-            select(@db) if @db
-
-            @subs.each { |s| method_missing(:subscribe, s) }
-            @psubs.each { |s| method_missing(:psubscribe, s) }
+            
+            @command_queue.each do |df, command, args|
+              @connection.send_command(command, args)
+              @defs.push(df)
+            end
+            @command_queue = []
+            
+            emit(:connected)
+            EM::Hiredis.logger.info("#{@connection} Connected")
             succeed
-
+            
             if @reconnecting
               @reconnecting = false
               emit(:reconnected)
             end
           end.resume
         end
-
+        
         @connection.on(:message) do |reply|
           if RuntimeError === reply
             raise "Replies out of sync: #{reply.inspect}" if @defs.empty?
             deferred = @defs.shift
-            deferred.fail(reply) if deferred
+            error = RedisError.new(reply.message)
+            error.redis_error = reply
+            deferred.fail(error) if deferred
           else
-            if reply && PUBSUB_MESSAGES.include?(reply[0]) # reply can be nil
-              kind, subscription, d1, d2 = *reply
-
-              case kind.to_sym
-              when :message
-                emit(:message, subscription, d1)
-              when :pmessage
-                emit(:pmessage, subscription, d1, d2)
-              end
-            else
-              if @defs.empty?
-                if @monitoring
-                  emit(:monitor, reply)
-                else
-                  raise "Replies out of sync: #{reply.inspect}"
-                end
-              else
-                deferred = @defs.shift
-                deferred.succeed(reply) if deferred
-              end
-            end
+            handle_reply(reply)
           end
         end
-
+        
         @connected = false
         @reconnecting = false
-
+        
         return self
       end
-
+      
       alias :old_method_missing :method_missing
       def method_missing(sym, *args)
         EM::Synchrony.sync old_method_missing(sym, *args)

data/lib/em-synchrony/mechanize.rb

@@ -0,0 +1,27 @@
+require 'mechanize'
+
+module EventMachine
+  module Synchrony
+    class Mechanize < ::Mechanize
+      def initialize(*args, &blk)
+        super
+        @agent.instance_variable_get(:@http).singleton_class.send(:include, DeferedNetHttpPersistentRequest)
+      end
+
+      module DeferedNetHttpPersistentRequest
+        def self.included(base)
+          base.class_eval do
+            alias :request_without_defer :request
+            alias :request :request_with_defer
+          end
+        end
+
+        def request_with_defer(*args, &blk)
+          EM::Synchrony.defer do
+            request_without_defer(*args, &blk)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/em-synchrony/tcpsocket.rb

@@ -85,7 +85,13 @@ module EventMachine
       def read(num_bytes = nil, dest = nil)
         handle_read(:read, num_bytes, dest)
       end
-      alias_method :read_nonblock, :read
+
+      def read_nonblock(maxlen, dest = nil)
+        raise ArgumentError, "maxlen must be > 0" if !maxlen || maxlen <= 0
+        read_bytes = handle_read(:read_nonblock, maxlen, dest)
+        raise EOFError if read_bytes.nil?
+        read_bytes
+      end
 
       def recv(num_bytes, flags = 0)
         raise "Unknown flags in recv(): #{flags}" if flags.nonzero?
@@ -159,11 +165,14 @@ module EventMachine
         end
         
         def try_read_data
-          if @read_type == :read
+          if @read_type == :read || @read_type == :read_nonblock
+            nonblocking = @read_type == :read_nonblock
             unless @remote_closed
               if @read_bytes
                 # read(n) on an open socket, with >= than n buffered data, returns n data
-                if @in_buff.size >= @read_bytes then @in_buff.slice!(0, @read_bytes)
+                if (@in_buff.size >= @read_bytes ||
+                    (nonblocking && @in_buff.size > 0)) then
+                  @in_buff.slice!(0, @read_bytes)
                 # read(n) on an open socket, with < than n buffered data, blocks
                 else :block end
               else

data/spec/amqp_spec.rb

@@ -54,15 +54,13 @@ describe EM::Synchrony::AMQP do
       exchange = EM::Synchrony::AMQP::Exchange.new(channel, :fanout, "test.em-synchrony.exchange")
       exchange.should be_kind_of(EventMachine::Synchrony::AMQP::Exchange)
 
-      direct = channel.direct("test.em-synchrony.direct")
-      fanout = channel.fanout("test.em-synchrony.fanout")
-      topic = channel.topic("test.em-synchrony.topic")
-      headers = channel.headers("test.em-synchrony.headers")
-
-      direct.should be_kind_of(EventMachine::Synchrony::AMQP::Exchange)
-      fanout.should be_kind_of(EventMachine::Synchrony::AMQP::Exchange)
-      topic.should be_kind_of(EventMachine::Synchrony::AMQP::Exchange)
-      headers.should be_kind_of(EventMachine::Synchrony::AMQP::Exchange)
+      [:direct, :fanout, :topic, :headers].each do |type|
+        # Exercise cached exchange code path
+        2.times.map { channel.send(type, "test.em-synchrony.#{type}") }.each do |ex|
+          ex.should be_kind_of(EventMachine::Synchrony::AMQP::Exchange)
+        end
+      end
+
       EM.stop
     end
   end

data/spec/connection_pool_spec.rb

@@ -126,4 +126,49 @@ describe EventMachine::Synchrony::ConnectionPool do
     end
   end
 
-end
+  describe '#pool_status' do
+    it 'should return right initial size' do
+      (1..10).each do |count|
+        pool = EventMachine::Synchrony::ConnectionPool.new(size: count) { }
+        status = pool.pool_status
+        expect(status).to include available: count
+        expect(status).to include reserved: 0
+        expect(status).to include pending: 0
+      end
+    end
+    it 'should return up-to-date statusrmation' do
+      sleep = 0.5
+      count = 5
+      EM.run do
+        pool = EM::Synchrony::ConnectionPool.new(size: count) do
+          -> { EM::Synchrony.sleep(sleep) }
+        end
+        (1..count).each do |used|
+          Fiber.new { pool.call }.resume
+          status = pool.pool_status
+          expect(status).to include available: count - used
+          expect(status).to include reserved: used
+          expect(status).to include pending: 0
+        end
+        (1..count).each do |used|
+          Fiber.new { pool.call }.resume
+          status = pool.pool_status
+          expect(status).to include available: 0
+          expect(status).to include reserved: count
+          expect(status).to include pending: used
+        end
+        Fiber.new {
+          EM::Synchrony.sleep(sleep + 0.1)
+          expect(pool.pool_status).to include pending: 0
+
+          EM::Synchrony.sleep(sleep + 0.1)
+          status = pool.pool_status
+          expect(status).to include available: count
+          expect(status).to include reserved: 0
+          expect(status).to include pending: 0
+          EM.stop
+        }.resume
+      end
+    end
+  end
+end

data/spec/helper/all.rb

@@ -1,9 +1,4 @@
-require 'rubygems'
-require 'rspec'
-require 'pp'
-
-require 'lib/em-synchrony'
-require 'lib/em-synchrony/em-http'
+require 'spec/helper/core'
 require 'lib/em-synchrony/mysql2'
 require 'lib/em-synchrony/em-remcached'
 require 'lib/em-synchrony/em-memcache'

data/spec/helper/core.rb

@@ -0,0 +1,6 @@
+require 'rubygems'
+require 'rspec'
+require 'pp'
+
+require 'lib/em-synchrony'
+require 'lib/em-synchrony/em-http'

data/spec/tcpsocket_spec.rb

@@ -1,4 +1,4 @@
-require "spec/helper/all"
+require "spec/helper/core"
 
 module SendAndClose
   def post_init
@@ -21,15 +21,13 @@ module SendAndKeepOpen
 end
 
 def tcp_test(server_type, ops={}, &block)
-  Proc.new do
-    EventMachine.synchrony do
-      ops = {:stop => true}.merge ops
-      EM::start_server('localhost', 12345, server_type)
-      @socket = EventMachine::Synchrony::TCPSocket.new 'localhost', 12345
-      @socket.close if ops[:close]
-      block.call
-      EM.stop if ops[:stop]
-    end
+  EventMachine.synchrony do
+    ops = {:stop => true}.merge ops
+    EM::start_server('localhost', 12345, server_type)
+    @socket = EventMachine::Synchrony::TCPSocket.new 'localhost', 12345
+    @socket.close if ops[:close]
+    block.call
+    EM.stop if ops[:stop]
   end
 end
 
@@ -231,6 +229,82 @@ describe EventMachine::Synchrony::TCPSocket  do
     end
   end
   
+  context '#read_nonblock' do
+    context 'with a positive length argument' do
+      context 'when the connection is open' do
+        context 'with greater or equal than the requested data buffered' do
+          it 'returns the requested data and no more' do
+            tcp_test(SendAndKeepOpen) do
+              @socket.read_nonblock(2).size.should eq 2
+              @socket.read_nonblock(1).size.should eq 1
+            end
+          end
+        end
+        context 'with less than the requested data buffered' do
+          it 'returns the available data' do
+            tcp_test(SendAndKeepOpen) do
+              @socket.read_nonblock(10).size.should eq 4
+            end
+          end
+        end
+      end
+      context 'when the peer has closed the connection' do
+        context 'with no data buffered' do
+          it 'raises EOFError' do
+            tcp_test(SendAndClose) do
+              @socket.read_nonblock(4).size.should eq 4
+              lambda {
+                @socket.read_nonblock(1)
+              }.should raise_error(EOFError)
+            end
+          end
+        end
+        context 'with less than the requested data buffered' do
+          it 'returns the buffered data' do
+            tcp_test(SendAndClose) do
+              @socket.read_nonblock(50).size.should eq 4
+            end
+          end
+        end
+        context 'with greater or equal than the requested data buffered' do
+          it 'returns the requested data and no more' do
+            tcp_test(SendAndClose) do
+              @socket = EventMachine::Synchrony::TCPSocket.new 'localhost', 12345
+              @socket.read_nonblock(2).size.should eq 2
+            end
+          end
+        end
+      end
+      context 'when we closed the connection' do
+        it 'raises IOError' do
+          tcp_test(SendAndKeepOpen, :close => true) do
+            proc {
+              @socket.read_nonblock(4)
+            }.should raise_error(IOError)
+          end
+        end
+      end
+    end
+    context 'with a negative length argument' do
+      it 'raises ArgumentError' do
+        tcp_test(SendAndKeepOpen) do
+          proc {
+            @socket.read_nonblock(-10)
+          }.should raise_error(ArgumentError)
+        end
+      end
+    end
+    context 'with a zero length argument' do
+      it 'raises ArgumentError' do
+        tcp_test(SendAndKeepOpen) do
+          proc {
+            @socket.read_nonblock(0)
+          }.should raise_error(ArgumentError)
+        end
+      end
+    end
+  end
+
   context '#recv' do
     context 'with a length argument' do
       context 'with a possitive length argument' do

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: em-synchrony
 version: !ruby/object:Gem::Version
-  version: 1.0.3
-  prerelease: 
+  version: 1.0.4
 platform: ruby
 authors:
 - Ilya Grigorik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-21 00:00:00.000000000 Z
+date: 2015-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0.beta.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0.beta.1
 description: Fiber aware EventMachine libraries
@@ -34,8 +31,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - README.md
 - Rakefile
@@ -65,6 +62,7 @@ files:
 - lib/em-synchrony/fiber_iterator.rb
 - lib/em-synchrony/iterator.rb
 - lib/em-synchrony/keyboard.rb
+- lib/em-synchrony/mechanize.rb
 - lib/em-synchrony/mongo.rb
 - lib/em-synchrony/mongoid.rb
 - lib/em-synchrony/mysql2.rb
@@ -78,6 +76,7 @@ files:
 - spec/em-mongo_spec.rb
 - spec/fiber_iterator_spec.rb
 - spec/helper/all.rb
+- spec/helper/core.rb
 - spec/helper/stub-http-server.rb
 - spec/helper/tolerance_matcher.rb
 - spec/hiredis_spec.rb
@@ -97,28 +96,28 @@ files:
 - spec/thread_spec.rb
 - spec/timer_spec.rb
 homepage: http://github.com/igrigorik/em-synchrony
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: em-synchrony
-rubygems_version: 1.8.24
+rubygems_version: 2.4.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Fiber aware EventMachine libraries
 test_files:
 - spec/activerecord_spec.rb
@@ -129,6 +128,7 @@ test_files:
 - spec/em-mongo_spec.rb
 - spec/fiber_iterator_spec.rb
 - spec/helper/all.rb
+- spec/helper/core.rb
 - spec/helper/stub-http-server.rb
 - spec/helper/tolerance_matcher.rb
 - spec/hiredis_spec.rb
@@ -147,4 +147,3 @@ test_files:
 - spec/tcpsocket_spec.rb
 - spec/thread_spec.rb
 - spec/timer_spec.rb
-has_rdoc: