em-zmq-tp10 0.1.13 → 0.1.15

data/lib/em/protocols/zmq2/dealer.rb

@@ -20,15 +20,33 @@ module EventMachine
       class PreDealer < Socket
         # @private
         def choose_peer(even_if_busy = false)
-          peers = even_if_busy ? @peers : @free_peers
+          if even_if_busy
+            peers = @peers
+            all_peers = nil
+          else
+            peers = @free_peers
+            all_peers = @peers
+          end
+
           i = peers.size
           while i > 0
-            ident, connect = peers.shift
-            if even_if_busy || connect.not_too_busy?
-              peers[ident] = connect # use the fact, that hash is ordered in Ruby 1.9
-              return connect  unless connect.error?
+            while i > 0
+              ident, connect = peers.shift
+              if all_peers
+                all_peers.delete(ident)
+                all_peers[ident] = connect
+              else
+                peers[ident] = connect
+              end
+              if even_if_busy || connect.not_too_busy?
+                @free_peers[ident] = connect # use the fact, that hash is ordered in Ruby 1.9
+                return connect  unless connect.error?
+              end
+              i -= 1
             end
-            i -= 1
+            i = all_peers ? all_peers.size - peers.size : 0
+            peers = all_peers
+            all_peers = nil
           end
         end
 

data/lib/em/protocols/zmq2/req.rb

@@ -308,7 +308,7 @@ module EventMachine
           callback ||= block
           if Proc === callback
             deferrable.callback(&callback)
-          else
+          elsif callback
             deferrable.callback{|reply, _data| callback.call(reply, _data)}
           end
           if request_id = super(message, wrapped)

data/lib/em/protocols/zmq2/version.rb

@@ -1,7 +1,7 @@
 module EventMachine
   module Protocols
     module Zmq2
-      VERSION = '0.1.13'
+      VERSION = '0.1.15'
     end
   end
 end

metadata

@@ -1,25 +1,24 @@
 --- !ruby/object:Gem::Specification
 name: em-zmq-tp10
 version: !ruby/object:Gem::Version
-  version: 0.1.13
   prerelease: 
+  version: 0.1.15
 platform: ruby
 authors:
 - Sokolov Yura 'funny-falcon'
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-14 00:00:00.000000000 Z
+date: 2013-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: eventmachine
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -27,15 +26,15 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: eventmachine
 - !ruby/object:Gem::Dependency
-  name: ffi-rzmq
+  type: :development
   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
@@ -43,6 +42,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: ffi-rzmq
 description: Implementation of ZMQ2.x transport protocol - ZMTP1.0
 email:
 - funny.falcon@gmail.com