em-zmq-tp10 0.1.10 → 0.1.11

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

@@ -7,16 +7,16 @@ module EventMachine
       # to react when message could not be send
       #
       # @example
-      # class MyDealer < EM::Protocols::Zmq2::PreDealer
-      #   def receive_message(message)
-      #     puts "Message received: #{message.inspect}"
+      #   class MyDealer < EM::Protocols::Zmq2::PreDealer
+      #     def receive_message(message)
+      #       puts "Message received: #{message.inspect}"
+      #     end
+      #   end
+      #   dealer = MyDealer.new
+      #   dealer.connect('tcp://127.0.0.1:8000')
+      #   if !dealer.send_message(['asdf','fdas'])
+      #     puts "Could not send message (no free peers)"
       #   end
-      # end
-      # dealer = MyDealer.new
-      # dealer.connect('tcp://127.0.0.1:8000')
-      # if !dealer.send_message(['asdf','fdas'])
-      #   puts "Could not send message (no free peers)"
-      # end
       class PreDealer < Socket
         # @private
         def choose_peer(even_if_busy = false)
@@ -59,16 +59,16 @@ module EventMachine
       # The only visible change from PreDealer is less frequent +send_message+ false return.
       #
       # @example
-      # class MyDealer < EM::Protocols::Zmq2::Dealer
-      #   def receive_message(message)
-      #     puts "Message received: #{message.inspect}"
+      #   class MyDealer < EM::Protocols::Zmq2::Dealer
+      #     def receive_message(message)
+      #       puts "Message received: #{message.inspect}"
+      #     end
+      #   end
+      #   dealer = MyDealer.new
+      #   dealer.connect('tcp://127.0.0.1:8000')
+      #   if !dealer.send_message(['asdf','fdas'])
+      #     puts "No free peers and outgoing queue is full"
       #   end
-      # end
-      # dealer = MyDealer.new
-      # dealer.connect('tcp://127.0.0.1:8000')
-      # if !dealer.send_message(['asdf','fdas'])
-      #   puts "No free peers and outgoing queue is full"
-      # end
       class Dealer < PreDealer
         # :stopdoc:
         def initialize(opts = {})
@@ -109,14 +109,14 @@ module EventMachine
       # on every incoming message (instead of #receive_message)
       #
       # @example
-      # dealer = EM::Protocols::Zmq2::DealerCb.new do |message|
-      #   puts "Receive message #{message.inspect}"
-      # end
-      # dealer.connect('ipc://rep')
-      # dealer.send_message(['hello','world'])
+      #   dealer = EM::Protocols::Zmq2::DealerCb.new do |message|
+      #     puts "Receive message #{message.inspect}"
+      #   end
+      #   dealer.connect('ipc://rep')
+      #   dealer.send_message(['hello','world'])
       class DealerCb < Dealer
         # Accepts callback as second parameter or block
-        # :callsec:
+        # :call-seq:
         #   new(opts) do |message|   end
         #   new(opts, proc{|message| })
         def initialize(opts = {}, cb = nil, &block)

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

@@ -13,7 +13,7 @@ module EventMachine
       # @example
       #   class MyReq < EM::Protocols::Zmq2::PreReq
       #     def receive_reply(message, data, request_id)
-      #       puts "received message #{message} and stored data #{data}
+      #       puts "received message #{message} and stored data #{data}"
       #     end
       #   end
       #
@@ -233,7 +233,7 @@ module EventMachine
             when :drop_first
               hwm = @hwm - (request ? 1 : 0)
               while @requests.size > hwm
-                k, message = @requests.shift
+                _, message = @requests.shift
                 cancel_message(message)
               end
               @requests[request.first] = request.dup  if request
@@ -307,9 +307,9 @@ module EventMachine
           wrapped = Wrapped.new(data, deferrable)
           callback ||= block
           if Proc === callback
-            deferrable.callback &callback
+            deferrable.callback(&callback)
           else
-            deferrable.callback{|reply, data| callback.call(reply, data)}
+            deferrable.callback{|reply, _data| callback.call(reply, _data)}
           end
           if request_id = super(message, wrapped)
             deferrable.errback{ cancel_request(request_id) }

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

@@ -124,9 +124,13 @@ module EM
           @connections.clear
           @conn_addresses.clear
           @reconnect_timers.each{|_, timer| EM.cancel_timer(timer)}
-          @after_writting = cb || block
-          flush_all_queue  if @after_writting
-          @peers.values.each{|c| c.close_connection(!!@after_writting)}
+          unless @peers.empty?
+            @after_writting = cb || block
+            flush_all_queue  if @after_writting
+            @peers.values.each{|c| c.close_connection(!!@after_writting)}
+          else
+            EM.next_tick @after_writting
+          end
           @bindings.each{|c|
             unless String === c
               EM.stop_server c

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

@@ -1,7 +1,7 @@
 module EventMachine
   module Protocols
     module Zmq2
-      VERSION = '0.1.10'
+      VERSION = '0.1.11'
     end
   end
 end

data/tests/test_inproc.rb

@@ -29,7 +29,7 @@ describe 'InProc' do
     2.times.map{|i| IPDealer.new(identity: "sink.#{i}") }
   end
 
-  def run_test
+  def run_this_test
     EM.run {
       connected.callback do
         fan.peers['sink.0'].wont_be_nil
@@ -53,7 +53,7 @@ describe 'InProc' do
   it "should send messages to several connected socket" do
     sinks.each{|sink| sink.connect 'inproc://fan'}
     fan.bind 'inproc://fan'
-    run_test
+    run_this_test
   end
 
   it "should send messages to several binded sockets" do
@@ -62,7 +62,7 @@ describe 'InProc' do
       sink.bind bind_point
       fan.connect bind_point
     }
-    run_test
+    run_this_test
   end
 
   it "should send messages to inproc and tcp" do
@@ -70,7 +70,7 @@ describe 'InProc' do
     fan.connect 'tcp://127.0.0.1:9876'
     sinks[1].bind 'inproc://sink.1'
     fan.connect 'inproc://sink.1'
-    run_test
+    run_this_test
   end
 
   if RUBY_PLATFORM !~ /window/
@@ -79,7 +79,7 @@ describe 'InProc' do
       fan.connect 'ipc://falcon'
       sinks[1].bind 'inproc://sink.1'
       fan.connect 'inproc://sink.1'
-      run_test
+      run_this_test
     end
   end
 

metadata

@@ -1,25 +1,24 @@
 --- !ruby/object:Gem::Specification
 name: em-zmq-tp10
 version: !ruby/object:Gem::Version
-  version: 0.1.10
   prerelease: 
+  version: 0.1.11
 platform: ruby
 authors:
 - Sokolov Yura 'funny-falcon'
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-02 00:00:00.000000000 Z
+date: 2012-09-05 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
@@ -106,3 +106,4 @@ summary: Implementation of ZMQ2.1 transport protocol and main socket types using
   for managing TCP/UNIX connections, doing nonblocking writes and calling callback
   on incoming messages.
 test_files: []
+has_rdoc: