zmqmachine 0.4.0 → 0.5.0

data/History.txt

@@ -1,3 +1,51 @@
+== 0.5.0 / 2011-03-3
+  * Changed the constructor for the ZM::Reactor class. It now takes
+    an optional third hash argument. One of the keys that it uses
+    is :zeromq_context. This allows a user to create a master 0mq
+    context and share it with multiple reactors. The point of that is
+    to allow the use of the :inproc transport. That transport is
+    somewhat misnamed since it only allows "inprocess" communication
+    between sockets created by the same context. I needed :inproc to
+    work around a 0mq memory leak (still unfixed) and discovered this
+    issue.
+    A second key is :log_transport which is used by the logging
+    facility.
+    In the future, the first two arguments to ZM::Reactor will likely
+    be rolled into the hash argument. That will be a backwards-
+    incompatible change, so I'm hoping folks read these notes and
+    start preparing.
+  * Many fixes to ZM::Timers. Cancellation is more intelligent about
+    matching timers. Inspection of timers also provides better detail
+    about their contents. Lastly, expired timer removal is much clearer
+    in how it functions *and* it is faster by an order of magnitude.
+    (Note: Array#shift is *way faster* than Array#delete_at(0)).
+  * Timer expiration has changed. Originally, timers fired only when
+    the current time was *greater than* its firing time. Now timers
+    fire when the current time is *greater than or equal to* its firing
+    time.
+  * Modified how arguments are passed to the Forwarder and Queue
+    devices.
+  * Devices now default to a ZMQ::LINGER of 0 (drop messages
+    immediately upon socket close) and a ZMQ::HWM of 1 (only allow
+    1 outstanding message between senders and receivers). These
+    parameters can be modified using the new argument hash.
+  * ZM::Address now supports the :inproc transport.
+  * Fixed a memory leak where a message was not released when an
+    internal recv operation returned EAGAIN. The code was leaking an
+    empty ZMQ::Message every time.
+  * Added a facility for logging. When a Reactor is instantiated a
+    user may pass in a transport string that indicates where the
+    reactor may *connect* and publish log messages. Part of the
+    contract is that this transport already has a listener bound
+    to it before the connection is attempted (e.g. for inproc
+    transports). If inproc is used, then the user also needs to 
+    pass in the shared context via :zeromq_context.
+  * Fixed a bug in Socket#send_messages where EAGAIN was not always
+    properly detected and bubbled up to its caller.
+  * Refactored socket deletion. Hopefully it is easier to understand.
+    
+== 0.4.1 / Unreleased
+
 == 0.4.0 / 2010-12-16
   * Replaced SortedSet in Timers with an Array and a custom routine
     for finding the in-order index for an insert. The routine

data/lib/zm/address.rb

@@ -50,7 +50,12 @@ module ZMQMachine
     end
 
     def to_s
-      "#{@transport}://#{@host}:#{@port}"
+      case @transport
+      when :tcp
+        "#{@transport}://#{@host}:#{@port}"
+      else
+        "#{@transport}://#{@host}"
+      end
     end
 
 
@@ -63,22 +68,22 @@ module ZMQMachine
       # should also return nil or some other error indication when parsing fails
       split = string.split(':')
       type = split[0]
-      port = split[2]
-      host = split[1].sub('//', '')
+      port = split[2] # nil for ipc/inproc and non-empty for tcp
+      host = split[1].slice(2, split[1].length) #sub('//', '')
 
-      Address.new host, port, type.to_sym
+      Address.new host, port, type.downcase.to_sym
     end
 
     private
 
     def determine_type type
-      case type
-      when :inprocess
+      case type.to_sym
+      when :inproc
         :inproc
-      when :tcp, :pgm
-        type
+      when :tcp, :pgm, :ipc
+        type.to_sym
       else
-        raise UnknownAddressError, "Unknown address transport type [#{type}]; must be :tcp, :pgm, or :inprocess"
+        raise UnknownAddressError, "Unknown address transport type [#{type}]; must be :tcp, :pgm, or :inproc"
       end
     end
 

data/lib/zm/devices/forwarder.rb

@@ -65,17 +65,20 @@ module ZMQMachine
       class Handler
         attr_accessor :socket_out
 
-        def initialize reactor, address, verbose = false
+        def initialize reactor, address, opts = {}
           @reactor = reactor
           @address = address
-          @verbose = verbose
+          @verbose = opts[:verbose] || false
+          @opts = opts
+          
+          @messages = []
         end
 
         def on_attach socket
           socket.identity = "forwarder.#{Kernel.rand(999_999_999)}"
+          set_options socket
           rc = socket.bind @address
           #FIXME: error handling!
-
           socket.subscribe_all if :sub == socket.kind
         end
 
@@ -84,10 +87,19 @@ module ZMQMachine
         end
 
         def on_readable socket, messages
-          messages.each { |msg| puts "[fwd] [#{msg.copy_out_string}]" } if @verbose
+          messages.each { |msg| @reactor.log(:device, "[fwd] [#{msg.copy_out_string}]") } if @verbose
 
-          socket_out.send_messages messages if @socket_out
+          if @socket_out
+            rc = socket_out.send_messages messages
+            messages.each { |message| message.close }
+          end
+        end
+        
+        def set_options socket
+          socket.raw_socket.setsockopt ZMQ::HWM, (@opts[:hwm] || 1)
+          socket.raw_socket.setsockopt ZMQ::LINGER, (@opts[:linger] || 0)
         end
+        
       end # class Handler
 
 
@@ -96,13 +108,13 @@ module ZMQMachine
       #
       # Forwards all messages received by the +incoming+ address to the +outgoing+ address.
       #
-      def initialize reactor, incoming, outgoing, verbose = false
+      def initialize reactor, incoming, outgoing, opts = {:verbose => false}
         incoming = Address.from_string incoming if incoming.kind_of? String
         outgoing = Address.from_string outgoing if outgoing.kind_of? String
 
         # setup the handlers for processing messages
-        @handler_in = Handler.new reactor, incoming, verbose
-        @handler_out = Handler.new reactor, outgoing, verbose
+        @handler_in = Handler.new reactor, incoming, opts
+        @handler_out = Handler.new reactor, outgoing, opts
 
         # create each socket and pass in the appropriate handler
         @incoming = reactor.sub_socket @handler_in

data/lib/zm/devices/queue.rb

@@ -67,15 +67,17 @@ module ZMQMachine
       class Handler
         attr_accessor :socket_out
 
-        def initialize reactor, address, verbose = false, dir = 0
+        def initialize reactor, address, dir, opts = {}
           @reactor = reactor
           @address = address
-          @verbose = verbose
+          @verbose = opts[:verbose] || false
+          @opts = opts
           @dir = dir
         end
 
         def on_attach socket
           socket.identity = "queue.#{Kernel.rand(999_999_999)}"
+          set_options socket
           rc = socket.bind @address
           #FIXME: error handling!
         end
@@ -85,13 +87,20 @@ module ZMQMachine
         end
 
         def on_readable socket, messages
-          messages.each { |msg| puts "[Q#{@dir}] [#{msg.copy_out_string}]" } if @verbose
+          messages.each { |msg| @reactor.log(:device, "[Q#{@dir}] [#{msg.copy_out_string}]") } if @verbose
 
           if @socket_out
             # FIXME: need to be able to handle EAGAIN/failed send
             rc = socket_out.send_messages messages
+            messages.each { |message| message.close }
           end
         end
+        
+        def set_options socket
+          socket.raw_socket.setsockopt ZMQ::HWM, (@opts[:hwm] || 1)
+          socket.raw_socket.setsockopt ZMQ::LINGER, (@opts[:linger] || 0)
+        end
+        
       end # class Handler
 
 
@@ -100,13 +109,13 @@ module ZMQMachine
       #
       # Routes all messages received by either address to the other address.
       #
-      def initialize reactor, incoming, outgoing, verbose = false
+      def initialize reactor, incoming, outgoing, opts = {}
         incoming = Address.from_string incoming if incoming.kind_of? String
         outgoing = Address.from_string outgoing if outgoing.kind_of? String
 
         # setup the handlers for processing messages
-        @handler_in = Handler.new reactor, incoming, verbose, :in
-        @handler_out = Handler.new reactor, outgoing, verbose, :out
+        @handler_in = Handler.new reactor, incoming, :in, opts
+        @handler_out = Handler.new reactor, outgoing, :out, opts
 
         # create each socket and pass in the appropriate handler
         @incoming = reactor.xrep_socket @handler_in

data/lib/zm/log_client.rb

@@ -0,0 +1,135 @@
+#--
+#
+# Author:: Chuck Remes
+# Homepage::  http://github.com/chuckremes/zmqmachine
+# Date:: 20110306
+#
+#----------------------------------------------------------------------------
+#
+# Copyright (C) 2011 by Chuck Remes. All Rights Reserved.
+# Email: cremes at mac dot com
+#
+# (The MIT License)
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# 'Software'), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+#---------------------------------------------------------------------------
+#
+#
+
+module ZMQMachine
+
+  class LogClient
+    def initialize reactor, transport
+      @reactor = reactor
+      @transport = transport
+      allocate_socket
+      @message_queue = []
+      @timer = nil
+    end
+
+    def shutdown
+      @timer.cancel if @timer
+      @reactor.close_socket @socket
+    end
+
+    def on_attach socket
+      socket.identity = "#{Kernel.rand(999_999_999)}.#{socket.kind}.log_client"
+
+      # socket options *must* be set before we bind/connect otherwise they are ignored
+      set_options socket
+
+      #FIXME error check!
+      rc = socket.connect @transport
+
+      raise "#{self.class}#on_attach, failed to connect to transport endpoint [#{@transport}]" unless rc
+
+      register_for_events socket
+    end
+
+    # Takes an array of ZM::Message instances and writes them out to the socket. If any
+    # socket write fails, the message is saved. We will attempt to write it again in
+    # 10 milliseconds or when another message array is sent, whichever comes first.
+    #
+    # All messages passed here are guaranteed to be written in the *order they were
+    # received*.
+    #
+    def write messages
+      @message_queue << messages
+      write_queue_to_socket
+    end
+
+    # Prints each message when global debugging is enabled.
+    #
+    # Forwards +messages+ on to the :on_read callback given in the constructor.
+    #
+    def on_readable socket, messages
+      @on_read.call messages, socket
+    end
+
+    # Just deregisters from receiving any further write *events*
+    #
+    def on_writable socket
+      @reactor.deregister_writable socket
+    end
+
+
+    private
+
+    def allocate_socket
+      @socket = @reactor.pub_socket self
+    end
+
+    def register_for_events socket
+      @reactor.register_readable socket
+      @reactor.deregister_writable socket
+    end
+
+    def set_options socket
+      socket.raw_socket.setsockopt ZMQ::HWM, 0
+      socket.raw_socket.setsockopt ZMQ::LINGER, 0
+    end
+
+    def write_queue_to_socket
+      until @message_queue.empty?
+        rc = @socket.send_messages @message_queue.at(0)
+
+        if rc # succeeded, so remove the message from the queue
+          messages = @message_queue.shift
+          messages.each { |message| message.close }
+          
+          if @timer
+            @timer.cancel
+            @timer = nil
+          end
+          
+        else
+          
+          # schedule another write attempt in 10 ms; break out of the loop
+          # only set the timer *once*
+          @timer = @reactor.oneshot_timer 10, method(:write_queue_to_socket) unless @timer
+          break
+        end
+      end
+    end
+
+  end # class LogClient
+
+end # module ZMQMachine

data/lib/zm/reactor.rb

@@ -39,10 +39,30 @@ module ZMQMachine
   class Reactor
     attr_reader :name
 
+    # +name+ provides a name for this reactor instance. It's unused
+    # at present but may be used in the future for allowing multiple
+    # reactors to communicate amongst each other.
+    #
     # +poll_interval+ is the number of milliseconds to block while
     # waiting for new 0mq socket events; default is 10
     #
-    def initialize name, poll_interval = 10
+    # +opts+ may contain a key +:zeromq_context+. When this
+    # hash is provided, the value for :zeromq_context should be a
+    # 0mq context as created by ZMQ::Context.new. The purpose of
+    # providing a context to the reactor is so that multiple
+    # reactors can share a single context. Doing so allows for sockets
+    # within each reactor to communicate with each other via an
+    # :inproc transport (:inproc is misnamed, it should be :incontext).
+    # By not supplying this hash, the reactor will create and use
+    # its own 0mq context.
+    #
+    # +opts+ may also include a +:log_transport+ key. This should be
+    # a transport string for an endpoint that a logger client may connect
+    # to for publishing log messages. when this key is defined, the
+    # client is automatically created and connected to the indicated
+    # endpoint.
+    #
+    def initialize name, poll_interval = 10, opts = {}
       @name = name
       @running = false
       @thread = nil
@@ -53,11 +73,16 @@ module ZMQMachine
       @proc_queue_mutex = Mutex.new
 
       # could raise if it fails
-      @context = ZMQ::Context.new 1
+      @context = opts[:zeromq_context] || ZMQ::Context.new
       @poller = ZMQ::Poller.new
       @sockets = []
       @raw_to_socket = {}
       Thread.abort_on_exception = true
+
+      if opts[:log_transport]
+        @logger = LogClient.new self, opts[:log_transport]
+        @logging_enabled = true
+      end
     end
 
     # Returns true when the reactor is running OR while it is in the
@@ -153,9 +178,15 @@ module ZMQMachine
     # Removes the given +sock+ socket from the reactor context. It is deregistered
     # for new events and closed. Any queued messages are silently dropped.
     #
+    # Returns +true+ for a succesful close, +false+ otherwise.
+    #
     def close_socket sock
-      delete_socket sock
+      return false unless sock
+
+      removed = delete_socket sock
       sock.raw_socket.close
+
+      removed
     end
 
     # Creates a REQ socket and attaches +handler_instance+ to the
@@ -351,6 +382,35 @@ module ZMQMachine
       end
     end
 
+    def open_socket_count kind = :all
+      @sockets.inject(0) do |sum, socket|
+        if :all == kind || (socket.kind == kind)
+          sum + 1
+        else
+          sum
+        end
+      end
+    end
+
+    # Publishes log messages to an existing transport passed in to the Reactor
+    # constructor using the :log_transport key.
+    #
+    #  Reactor.new :log_transport => 'inproc://reactor_log'
+    #
+    # +level+ parameter refers to a key to indicate severity level, e.g. :warn,
+    # :debug, level0, level9, etc.
+    #
+    # +message+ is a plain string that will be written out in its entirety.
+    #
+    # When no :log_transport was defined when creating the Reactor, all calls
+    # just discard the messages.
+    #
+    def log level, message
+      if @logging_enabled
+        @logger.write [ZMQ::Message.new(level.to_s), ZMQ::Message.new(message.to_s)]
+      end
+    end
+
 
     private
 
@@ -409,10 +469,12 @@ module ZMQMachine
       @raw_to_socket[sock.raw_socket] = sock
     end
 
+    # Returns true when all steps succeed, false otherwise
+    #
     def delete_socket sock
-      @poller.delete sock.raw_socket
-      @sockets.delete sock
-      @raw_to_socket.delete sock.raw_socket
+      @poller.delete(sock.raw_socket) and
+      @sockets.delete(sock) and
+      @raw_to_socket.delete(sock.raw_socket)
     end
 
 
@@ -427,61 +489,4 @@ module ZMQMachine
   end # class Reactor
 
 
-  # Not implemented. Just a (broken) thought experiment at the moment.
-  #
-  class SyncReactor
-
-    def initialize name
-      @klass_path = ZMQMachine::Sync
-      @poll_interval = 10
-      @active = true
-      super name
-    end
-
-    def run blk = nil, &block
-      blk ||= block
-      @running = true
-
-      @thread = Thread.new do
-        @fiber = Fiber.new { |context| blk.call context }
-        func = Proc.new { |context| @fiber.resume context }
-
-        run_once func
-        while @running do
-          run_once
-        end
-
-        cleanup
-      end
-
-      self
-    end
-
-    def deactivate() @active = false; end
-
-    def active?() @active; end
-
-    def while_active? &blk
-      begin
-        while @active do
-          yield
-        end
-      rescue => e
-        p e
-      end
-
-      @running = false
-    end
-
-
-    private
-
-    def poll
-      @poller.poll @poll_interval
-
-      @poller.writables.each { |sock| sock.resume }
-      @poller.readables.each { |sock| sock.resume }
-    end
-  end # class SyncReactor
-
 end # module ZMQMachine

data/lib/zm/sockets/base.rb

@@ -102,7 +102,11 @@ module ZMQMachine
       # May raise a ZMQ::SocketError.
       #
       def send_message message, multipart = false
-        queued = @raw_socket.send message, ZMQ::NOBLOCK | (multipart ? ZMQ::SNDMORE : 0)
+        begin
+          queued = @raw_socket.send message, ZMQ::NOBLOCK | (multipart ? ZMQ::SNDMORE : 0)
+        rescue ZMQ::ZeroMQError => e
+          queued = false
+        end
         queued
       end
 
@@ -125,12 +129,12 @@ module ZMQMachine
       # May raise a ZMQ::SocketError.
       #
       def send_messages messages
-        rc = false
+        rc = true
         i = 0
         size = messages.size
 
         # loop through all messages but the last
-        while size > 1 && i < size - 1 do
+        while rc && size > 1 && i < size - 1 do
           rc = send_message messages.at(i), true
           i += 1
         end
@@ -140,7 +144,7 @@ module ZMQMachine
 
         # send the last message without the multipart arg to flush
         # the message to the 0mq queue
-        rc = send_message messages.last if size > 0
+        rc = send_message messages.last if rc && size > 0
         rc
       end
 
@@ -204,11 +208,22 @@ module ZMQMachine
         message = ZMQ::Message.new
         begin
           rc = @raw_socket.recv message, ZMQ::NOBLOCK
-          rc = 0 if rc
+          
+          if rc
+            rc = 0 # callers expect 0 for success, not true
+            messages << message
+          else
+            # got EAGAIN most likely
+            message.close
+            message = nil
+            rc = false
+          end
+          
         rescue ZMQ::ZeroMQError => e
+          message.close if message
           rc = e
         end
-        messages << message
+
         rc
       end
 
@@ -218,6 +233,7 @@ module ZMQMachine
           @state = :ready
           @handler.on_readable self, messages
         else
+          # this branch is never called
           @handler.on_readable_error self, rc
         end
       end

data/lib/zm/timers.rb

@@ -96,10 +96,22 @@ module ZMQMachine
     def cancel timer
       i = index timer
 
-      if timer == @timers.at(i)
+      # when #index doesn't find a match, it returns an index 1 past
+      # the end, so check for that
+      if i < @timers.size && timer == @timers.at(i)
         @timers.delete_at(i) ? true : false
       else
-        false
+        # slow branch; necessary since the #index operation works 
+        # solely from the timer.fire_time attribute. There
+        # could be multiple timers scheduled to fire at the
+        # same time so the equivalence test above could fail
+        # on the first index returned, so fallback to this
+        # slower method
+        size = @timers.size
+        @timers.delete_if { |t| t == timer }
+        
+        # true when the array has shrunk, false otherwise
+        @timers.size != size
       end
     end
 
@@ -128,17 +140,17 @@ module ZMQMachine
     def fire_expired
       # all time is expected as milliseconds
       now = Timers.now
-      runnables, periodicals, expired = [], [], []
+      runnables, periodicals, expired_count = [], [], 0
 
       # defer firing the timer until after this loop so we can clean it up first
-      @timers.each_with_index do |timer, index|
+      @timers.each do |timer|
         break unless timer.expired?(now)
         runnables << timer
         periodicals << timer if timer.periodical?
-        expired << index
+        expired_count += 1
       end
 
-      remove expired
+      remove expired_count
       runnables.each { |timer| timer.fire }
       renew periodicals
     end
@@ -204,10 +216,11 @@ module ZMQMachine
       l
     end
 
-    def remove expired
-      # need to reverse so we are deleting the highest indexes first,
-      # otherwise everything shifts down and we delete the wrong timers
-      expired.sort.reverse.each { |index| @timers.delete_at index }
+    def remove expired_count
+      # the timers are ordered, so we can just shift them off the front
+      # of the array; this is *orders of magnitude* faster than #delete_at
+      # with a (reversed) array of indexes
+      expired_count.times { @timers.shift }
     end
 
     def renew timers
@@ -263,14 +276,22 @@ module ZMQMachine
     end
 
     def <=>(other)
-      self.fire_time <=> other.fire_time
+      @fire_time <=> other.fire_time
+    end
+    
+    def ==(other)
+      # need a more specific equivalence test since multiple timers could be
+      # scheduled to go off at exactly the same time
+      @fire_time == other.fire_time &&
+      @timer_proc == other.timer_proc &&
+      periodical? == other.periodical?
     end
 
     # True when the timer should be fired; false otherwise.
     #
     def expired? time
       time ||= Timers.now
-      time > @fire_time
+      time >= @fire_time
     end
 
     # True when this is a periodical timer; false otherwise.
@@ -284,7 +305,11 @@ module ZMQMachine
     end
     
     def to_s
-      "[delay [#{@delay}], periodical? [#{@periodical}], fire_time [#{Time.at(@fire_time/1000)}] fire_delay_s [#{(@fire_time - Timers.now)/1000}]]"
+      ftime = Time.at(@fire_time / 1000)
+      fdelay = @fire_time - Timers.now
+      name = @timer_proc.respond_to?(:name) ? @timer_proc.name : @timer_proc.to_s
+      
+      "[delay [#{@delay}], periodical? [#{@periodical}], fire_time [#{ftime}] fire_delay_ms [#{fdelay}]] proc [#{name}]"
     end
     
     def inspect; to_s; end

data/lib/zmqmachine.rb

@@ -62,11 +62,10 @@ module ZMQMachine
 end  # module ZMQMachine
 
 require 'singleton'
-require 'set'
 require 'ffi-rzmq'
 
 # the order of files is important
-%w(address exceptions timers deferrable reactor message sockets devices).each do |file|
+%w(address exceptions timers deferrable log_client reactor message sockets devices).each do |file|
   require ZMQMachine.libpath(['zm', file])
 end
 

data/spec/reactor_spec.rb

@@ -0,0 +1,25 @@
+$: << "." # added for ruby 1.9.2 compatibilty; it doesn't include the current directory on the load path anymore
+
+require File.join(File.dirname(__FILE__), %w[spec_helper])
+
+module ZM
+  
+  describe Reactor do
+    
+    
+    context "when closing sockets" do
+      let(:reactor) { Reactor.new(:test) }
+      
+      it "should return false when the given socket is nil" do
+        reactor.close_socket(nil).should be_false
+      end
+      
+      it "should return true when the given socket is successfully closed and deleted" do
+        sock = reactor.req_socket(FakeHandler.new)
+        
+        reactor.close_socket(sock).should be_true
+      end
+    end
+  end # describe Reactor
+  
+end # module ZM

data/spec/spec_helper.rb

@@ -2,14 +2,19 @@
 require File.expand_path(
     File.join(File.dirname(__FILE__), %w[.. lib zmqmachine]))
 
-Spec::Runner.configure do |config|
-  # == Mock Framework
-  #
-  # RSpec uses it's own mocking framework by default. If you prefer to
-  # use mocha, flexmock or RR, uncomment the appropriate line:
-  #
-  # config.mock_with :mocha
-  # config.mock_with :flexmock
-  # config.mock_with :rr
-end
+#Rspec.configure do |config|
+#  # == Mock Framework
+#  #
+#  # RSpec uses it's own mocking framework by default. If you prefer to
+#  # use mocha, flexmock or RR, uncomment the appropriate line:
+#  #
+#  # config.mock_with :mocha
+#  # config.mock_with :flexmock
+#  # config.mock_with :rr
+#end
 
+class FakeHandler
+  def on_attach socket
+    
+  end
+end

data/version.txt

@@ -1 +1 @@
-0.4.0
+0.5.0

data/zmqmachine.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zmqmachine}
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chuck Remes"]
@@ -22,7 +22,7 @@ It is possible to extend the 0mq library to "poll" normal file
 descriptors. This isn't on my roadmap but patches are accepted.}
   s.email = %q{cremes@mac.com}
   s.extra_rdoc_files = ["History.txt", "README.rdoc", "version.txt"]
-  s.files = [".bnsignore", "History.txt", "README.rdoc", "Rakefile", "examples/fake_ftp.rb", "examples/one_handed_ping_pong.rb", "examples/ping_pong.rb", "examples/pub_sub.rb", "examples/pubsub_forwarder.rb", "examples/throttled_ping_pong.rb", "lib/zm/address.rb", "lib/zm/deferrable.rb", "lib/zm/devices.rb", "lib/zm/devices/forwarder.rb", "lib/zm/devices/queue.rb", "lib/zm/exceptions.rb", "lib/zm/message.rb", "lib/zm/reactor.rb", "lib/zm/sockets.rb", "lib/zm/sockets/base.rb", "lib/zm/sockets/pair.rb", "lib/zm/sockets/pub.rb", "lib/zm/sockets/rep.rb", "lib/zm/sockets/req.rb", "lib/zm/sockets/sub.rb", "lib/zm/sockets/xrep.rb", "lib/zm/sockets/xreq.rb", "lib/zm/timers.rb", "lib/zmqmachine.rb", "spec/spec_helper.rb", "spec/zmqmachine_spec.rb", "version.txt", "zmqmachine.gemspec"]
+  s.files = [".bnsignore", "History.txt", "README.rdoc", "Rakefile", "examples/fake_ftp.rb", "examples/one_handed_ping_pong.rb", "examples/ping_pong.rb", "examples/pub_sub.rb", "examples/pubsub_forwarder.rb", "examples/throttled_ping_pong.rb", "lib/zm/address.rb", "lib/zm/deferrable.rb", "lib/zm/devices.rb", "lib/zm/devices/forwarder.rb", "lib/zm/devices/queue.rb", "lib/zm/exceptions.rb", "lib/zm/log_client.rb", "lib/zm/message.rb", "lib/zm/reactor.rb", "lib/zm/sockets.rb", "lib/zm/sockets/base.rb", "lib/zm/sockets/pair.rb", "lib/zm/sockets/pub.rb", "lib/zm/sockets/rep.rb", "lib/zm/sockets/req.rb", "lib/zm/sockets/sub.rb", "lib/zm/sockets/xrep.rb", "lib/zm/sockets/xreq.rb", "lib/zm/timers.rb", "lib/zmqmachine.rb", "spec/spec_helper.rb", "spec/reactor_spec.rb", "version.txt", "zmqmachine.gemspec"]
   s.homepage = %q{http://github.com/chuckremes/zmqmachine}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zmqmachine
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 11
+  prerelease: 
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Chuck Remes
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         - 7
@@ -40,6 +42,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 3
         - 5
@@ -87,6 +90,7 @@ files:
 - lib/zm/devices/forwarder.rb
 - lib/zm/devices/queue.rb
 - lib/zm/exceptions.rb
+- lib/zm/log_client.rb
 - lib/zm/message.rb
 - lib/zm/reactor.rb
 - lib/zm/sockets.rb
@@ -101,7 +105,7 @@ files:
 - lib/zm/timers.rb
 - lib/zmqmachine.rb
 - spec/spec_helper.rb
-- spec/zmqmachine_spec.rb
+- spec/reactor_spec.rb
 - version.txt
 - zmqmachine.gemspec
 has_rdoc: true
@@ -119,6 +123,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -127,13 +132,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: zmqmachine
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: ZMQMachine is another Ruby implementation of the reactor pattern but this time using 0mq sockets rather than POSIX sockets.

data/spec/zmqmachine_spec.rb

@@ -1,6 +0,0 @@
-
-require File.join(File.dirname(__FILE__), %w[spec_helper])
-
-describe ZMQMachine do
-end
-