zmqmachine 0.5.2 → 0.6.0

data/History.txt

@@ -1,3 +1,12 @@
+== 0.6.0 / 2011-10-04
+  * Compatibility with ffi-rzmq 0.9.0 and added some conditional
+    logic to support 0mq 2.1.x and 3.x APIs.
+  
+  * Removed all exceptions and replaced them with return codes.
+
+  * Added :exception_handler key to Reactor#new so exceptions can
+    be managed by user code.
+
 == 0.5.2 / 2011-07-21
   * Added PUSH and PULL socket types. Never needed them until now.
   * Added a +context+ reader to the Reactor class.

data/README.rdoc

@@ -29,9 +29,9 @@ descriptors. This isn't on my roadmap but patches are accepted.
 
 * Some classes are just skeletons.
 
-* Recommended for JRuby since it is the only existing runtime that uses
+* Recommended for JRuby or Rubinius since they are the only existing runtimes that use
   native threads without a GIL. MRI 1.9.x is okay but may have
-  threading problems.
+  threading problems. This hasn't been tested with MacRuby.
 
 == SYNOPSIS:
 
@@ -41,12 +41,12 @@ Read and execute the examples in the examples directory.
 
 Requires the 0mq library
 
-* 0mq 2.0.10 or 2.1 and later
+* 0mq 2.1.x, 3.0 and later
 
 Depends on 2 external gems.
 
-* ffi-rzmq (>= 0.7.0)
-* ffi (>= 1.0.0)
+* ffi-rzmq (>= 0.9.0)
+* ffi (>= 1.0.0) [MRI only]
 
 == INSTALL:
 

data/examples/pubsub_forwarder.rb

@@ -66,9 +66,13 @@ class SubscriberHandler
     @received_count += 1
     sleep 0.01 if @sleep
   end
+
+  def on_readable_error socket, rc
+    STDERR.puts "got error, rc [#{rc}], errno [#{ZMQ::Util.errno}], descr [#{ZMQ::Util.error_string}]"
+  end
 end
 
-sleep_time = 5
+sleep_time = 10
 
 
 # Run the forwarder device in a separate context. *Could* be run from

data/lib/zm/address.rb

@@ -36,8 +36,13 @@
 
 module ZMQMachine
 
-  #FIXME: needs to handle ipc and inproc transports better, e.g.
-  # there is no port component to either one.
+  # A simple wrapper for creating transport strings for the 0mq
+  # library to use for bind and connect calls.
+  #
+  # It is recommended to use Address.create instead of calling #new
+  # directly on the class. Using this factory method allows user code
+  # to avoid creating a begin/rescue/end structure and dealing with
+  # exceptions. Failed creation will return a nil value.
   #
   class Address
     attr_reader :host, :port, :transport
@@ -57,21 +62,34 @@ module ZMQMachine
         "#{@transport}://#{@host}"
       end
     end
+    
+    # Recommended to use this class method as a factory versus calling
+    # #new directly. Returns an Address object upon successful creation
+    # and nil if creation fails.
+    #
+    def self.create host, port, type = :tcp
+      address = nil
+      begin
+        address = Address.new host, port, type
+      rescue UnknownAddressError
+        address = nil
+      end
+      
+      address
+    end
 
 
     # Converts strings with the format "type://host:port" into
     # an Address instance.
     #
     def self.from_string string
-      #FIXME: needs error checking and ability to handle inproc/ipc types
-      #
       # should also return nil or some other error indication when parsing fails
       split = string.split(':')
       type = split[0]
       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.downcase.to_sym
+      Address.create host, port, type.downcase.to_sym
     end
 
     private

data/lib/zm/devices/forwarder.rb

@@ -70,16 +70,16 @@ module ZMQMachine
           @address = address
           @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
+          error_check(rc)
           #FIXME: error handling!
-          socket.subscribe_all if :sub == socket.kind
+          error_check(socket.subscribe_all) if :sub == socket.kind
         end
 
         def on_writable socket
@@ -91,15 +91,42 @@ module ZMQMachine
 
           if @socket_out
             rc = socket_out.send_messages messages
+            error_check(rc)
             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)
+
+        def on_readable_error socket, return_code
+          STDERR.puts "#{self.class}#on_readable_error, rc [#{return_code}], errno [#{ZMQ::Util.errno}], descr [#{ZMQ::Util.error_string}]"
+        end
+
+        if LibZMQ.version2?
+
+          def set_options socket
+            error_check(socket.raw_socket.setsockopt(ZMQ::HWM, (@opts[:hwm] || 1)))
+            error_check(socket.raw_socket.setsockopt(ZMQ::LINGER, (@opts[:linger] || 0)))
+          end
+
+        elsif LibZMQ.version3?
+
+          def set_options socket
+            error_check(socket.raw_socket.setsockopt(ZMQ::SNDHWM, (@opts[:hwm] || 1)))
+            error_check(socket.raw_socket.setsockopt(ZMQ::RCVHWM, (@opts[:hwm] || 1)))
+            error_check(socket.raw_socket.setsockopt(ZMQ::LINGER, (@opts[:linger] || 0)))
+          end
+
+        end
+
+        def error_check rc
+          if ZMQ::Util.resultcode_ok?(rc)
+            false
+          else
+            STDERR.puts "Operation failed, errno [#{ZMQ::Util.errno}] description [#{ZMQ::Util.error_string}]"
+            caller(1).each { |callstack| STDERR.puts(callstack) }
+            true
+          end
         end
-        
+
       end # class Handler
 
 

data/lib/zm/devices/queue.rb

@@ -76,9 +76,9 @@ module ZMQMachine
         end
 
         def on_attach socket
-          socket.identity = "queue.#{Kernel.rand(999_999_999)}"
           set_options socket
           rc = socket.bind @address
+          error_check(rc)
           #FIXME: error handling!
         end
 
@@ -95,12 +95,34 @@ module ZMQMachine
             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)
+
+        if LibZMQ.version2?
+
+          def set_options socket
+            error_check(socket.raw_socket.setsockopt(ZMQ::HWM, (@opts[:hwm] || 1)))
+            error_check(socket.raw_socket.setsockopt(ZMQ::LINGER, (@opts[:linger] || 0)))
+          end
+
+        elsif LibZMQ.version3?
+
+          def set_options socket
+            error_check(socket.raw_socket.setsockopt(ZMQ::SNDHWM, (@opts[:hwm] || 1)))
+            error_check(socket.raw_socket.setsockopt(ZMQ::RCVHWM, (@opts[:hwm] || 1)))
+            error_check(socket.raw_socket.setsockopt(ZMQ::LINGER, (@opts[:linger] || 0)))
+          end
+
         end
-        
+
+        def error_check rc
+          if ZMQ::Util.resultcode_ok?(rc)
+            false
+          else
+            STDERR.puts "Operation failed, errno [#{ZMQ::Util.errno}] description [#{ZMQ::Util.error_string}]"
+            caller(1).each { |callstack| STDERR.puts(callstack) }
+            true
+          end
+        end
+
       end # class Handler
 
 

data/lib/zm/exceptions.rb

@@ -36,6 +36,10 @@
 
 module ZMQMachine
   
+  class ConnectionError < StandardError; end
+
+  class SetsockoptError < StandardError; end
+
   class TimeoutError < StandardError; end
   
   class UnknownAddressError < StandardError; end

data/lib/zm/log_client.rb

@@ -59,7 +59,7 @@ module ZMQMachine
       #FIXME error check!
       rc = socket.connect @transport
 
-      raise "#{self.class}#on_attach, failed to connect to transport endpoint [#{@transport}]" unless rc
+      raise ConnectionError.new("#{self.class}#on_attach, failed to connect to transport endpoint [#{@transport}]") unless ZMQ::Util.resultcode_ok?(rc)
 
       register_for_events socket
     end
@@ -78,7 +78,7 @@ module ZMQMachine
       @message_queue << [ZMQ::Message.new(level.to_s), ZMQ::Message.new(timestamp), ZMQ::Message.new(message.to_s)]
       write_queue_to_socket
     end
-    
+
     def puts string
       write 'untagged', string
     end
@@ -109,26 +109,38 @@ module ZMQMachine
       @reactor.deregister_writable socket
     end
 
-    def set_options socket
-      socket.raw_socket.setsockopt ZMQ::HWM, 0
-      socket.raw_socket.setsockopt ZMQ::LINGER, 0
+    if LibZMQ.version2?
+
+      def set_options socket
+        socket.raw_socket.setsockopt ZMQ::HWM, 0
+        socket.raw_socket.setsockopt ZMQ::LINGER, 0
+      end
+
+    elsif LibZMQ.version3?
+
+      def set_options socket
+        socket.raw_socket.setsockopt ZMQ::SNDHWM, 0
+        socket.raw_socket.setsockopt ZMQ::RCVHWM, 0
+        socket.raw_socket.setsockopt ZMQ::LINGER, 0
+      end
+
     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
+        if ZMQ::Util.resultcode_ok?(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

data/lib/zm/reactor.rb

@@ -37,7 +37,7 @@
 module ZMQMachine
 
   class Reactor
-    attr_reader :name, :context, :logger
+    attr_reader :name, :context, :logger, :exception_handler
 
     # +name+ provides a name for this reactor instance. It's unused
     # at present but may be used in the future for allowing multiple
@@ -62,6 +62,9 @@ module ZMQMachine
     # client is automatically created and connected to the indicated
     # endpoint.
     #
+    # Lastly, +opts+ may include a +exception_handler+ key. The exception
+    # handler should respond to #call and take a single argument.
+    #
     def initialize name, poll_interval = 10, opts = {}
       @name = name
       @running = false
@@ -72,7 +75,7 @@ module ZMQMachine
       @proc_queue = []
       @proc_queue_mutex = Mutex.new
 
-      # could raise if it fails
+      # could raise if it fails to allocate a Context
       @context = if opts[:zeromq_context]
         @shared_context = true
         opts[:zeromq_context]
@@ -90,6 +93,10 @@ module ZMQMachine
         @logger = LogClient.new self, opts[:log_transport]
         @logging_enabled = true
       end
+
+      if opts[:exception_handler]
+        @exception_handler = opts[:exception_handler]
+      end
     end
 
     def shared_context?
@@ -211,9 +218,7 @@ module ZMQMachine
     # All handlers must implement the #on_attach method.
     #
     def req_socket handler_instance
-      sock = ZMQMachine::Socket::Req.new @context, handler_instance
-      save_socket sock
-      sock
+      create_socket handler_instance, ZMQMachine::Socket::Req
     end
 
     # Creates a REP socket and attaches +handler_instance+ to the
@@ -227,9 +232,7 @@ module ZMQMachine
     # All handlers must implement the #on_attach method.
     #
     def rep_socket handler_instance
-      sock = ZMQMachine::Socket::Rep.new @context, handler_instance
-      save_socket sock
-      sock
+      create_socket handler_instance, ZMQMachine::Socket::Rep
     end
 
     # Creates a XREQ socket and attaches +handler_instance+ to the
@@ -244,9 +247,7 @@ module ZMQMachine
     # All handlers must implement the #on_attach method.
     #
     def xreq_socket handler_instance
-      sock = ZMQMachine::Socket::XReq.new @context, handler_instance
-      save_socket sock
-      sock
+      create_socket handler_instance, ZMQMachine::Socket::XReq
     end
 
     # Creates a XREP socket and attaches +handler_instance+ to the
@@ -261,9 +262,7 @@ module ZMQMachine
     # All handlers must implement the #on_attach method.
     #
     def xrep_socket handler_instance
-      sock = ZMQMachine::Socket::XRep.new @context, handler_instance
-      save_socket sock
-      sock
+      create_socket handler_instance, ZMQMachine::Socket::XRep
     end
 
     # Creates a PAIR socket and attaches +handler_instance+ to the
@@ -279,9 +278,7 @@ module ZMQMachine
     # All handlers must implement the #on_attach method.
     #
     def pair_socket handler_instance
-      sock = ZMQMachine::Socket::Pair.new @context, handler_instance
-      save_socket sock
-      sock
+      create_socket handler_instance, ZMQMachine::Socket::Pair
     end
 
     # Creates a PUB socket and attaches +handler_instance+ to the
@@ -296,9 +293,7 @@ module ZMQMachine
     # All handlers must implement the #on_attach method.
     #
     def pub_socket handler_instance
-      sock = ZMQMachine::Socket::Pub.new @context, handler_instance
-      save_socket sock
-      sock
+      create_socket handler_instance, ZMQMachine::Socket::Pub
     end
 
     # Creates a SUB socket and attaches +handler_instance+ to the
@@ -313,9 +308,7 @@ module ZMQMachine
     # All handlers must implement the #on_attach method.
     #
     def sub_socket handler_instance
-      sock = ZMQMachine::Socket::Sub.new @context, handler_instance
-      save_socket sock
-      sock
+      create_socket handler_instance, ZMQMachine::Socket::Sub
     end
 
     # Creates a PUSH socket and attaches +handler_instance+ to the
@@ -330,9 +323,7 @@ module ZMQMachine
     # All handlers must implement the #on_attach method.
     #
     def push_socket handler_instance
-      sock = ZMQMachine::Socket::Push.new @context, handler_instance
-      save_socket sock
-      sock
+      create_socket handler_instance, ZMQMachine::Socket::Push
     end
 
     # Creates a PULL socket and attaches +handler_instance+ to the
@@ -347,9 +338,7 @@ module ZMQMachine
     # All handlers must implement the #on_attach method.
     #
     def pull_socket handler_instance
-      sock = ZMQMachine::Socket::Pull.new @context, handler_instance
-      save_socket sock
-      sock
+      create_socket handler_instance, ZMQMachine::Socket::Pull
     end
 
     # Registers the +sock+ for POLLOUT events that will cause the
@@ -475,16 +464,24 @@ module ZMQMachine
     private
 
     def run_once
-      run_procs
-      run_timers
-      poll
+      begin
+        run_procs
+        run_timers
+        poll
+      rescue => e
+        if @exception_handler
+          @exception_handler.call(e)
+        else
+          raise
+        end
+      end
     end
 
     # Close each open socket and terminate the reactor context; this will
     # release the native memory backing each of these objects
     def cleanup
       @proc_queue_mutex.synchronize { @proc_queue.clear }
-      
+
       # work on a dup since #close_socket deletes from @sockets
       @sockets.dup.each { |sock| close_socket sock }
       @context.terminate unless shared_context?
@@ -510,6 +507,8 @@ module ZMQMachine
     end
 
     def poll
+      rc = 0
+
       if (@proc_queue.empty? && @sockets.empty?) || @poller.size.zero?
         # when there are no sockets registered, @poller.poll would return immediately;
         # the same is true when sockets are registered but *not* for any events;
@@ -518,11 +517,28 @@ module ZMQMachine
         # to run (e.g. via next_tick)
         sleep(@poll_interval / 1000.0)
       else
-        @poller.poll @poll_interval
+        rc = @poller.poll @poll_interval
+      end
+
+      if ZMQ::Util.resultcode_ok?(rc)
+        @poller.readables.each { |sock| @raw_to_socket[sock].resume_read }
+        @poller.writables.each { |sock| @raw_to_socket[sock].resume_write }
       end
 
-      @poller.readables.each { |sock| @raw_to_socket[sock].resume_read }
-      @poller.writables.each { |sock| @raw_to_socket[sock].resume_write }
+      rc
+    end
+
+    def create_socket handler_instance, kind
+      sock = nil
+
+      begin
+        sock = kind.new @context, handler_instance
+        save_socket sock
+      rescue ZMQ::ContextError => e
+        sock = nil
+      end
+
+      sock
     end
 
     def save_socket sock
@@ -546,7 +562,7 @@ module ZMQMachine
     # library does this for us.
     #
     def determine_interval interval
-      # set a lower bound of 1000 usec so we don't burn up the CPU
+      # set a lower bound of 1 millisec so we don't burn up the CPU
       interval <= 0 ? 1.0 : interval.to_i
     end
 

data/lib/zm/sockets/base.rb

@@ -42,6 +42,17 @@ module ZMQMachine
       attr_reader :raw_socket, :kind
       attr_reader :poll_options
 
+      def self.create context, handler
+        socket = nil
+        begin
+          socket = new context, handler
+        rescue => e
+          socket = nil
+        end
+
+        socket
+      end
+
       def initialize context, handler
         @context = context
         @bindings = []
@@ -49,10 +60,11 @@ module ZMQMachine
 
         @handler = handler
         @raw_socket = allocate_socket @context
-        
+
         # default ZMQ::LINGER to 1 millisecond so closing a socket
         # doesn't block forever
-        @raw_socket.setsockopt ZMQ::LINGER, 1
+        rc = @raw_socket.setsockopt ZMQ::LINGER, 1
+        raise SetsockoptError.new("Setting LINGER on socket failed at line #{caller(0)}") unless ZMQ::Util.resultcode_ok?(rc)
         attach @handler
       end
 
@@ -74,118 +86,82 @@ module ZMQMachine
       # endpoint.
       #
       def bind address
-        begin
-          @bindings << address
-          @raw_socket.bind address.to_s
-          true
-        rescue ZMQ::ZeroMQError
-          @bindings.pop
-          false
-        end
+        @bindings << address
+        rc = @raw_socket.bind address.to_s
+        @bindings.pop unless ZMQ::Util.resultcode_ok?(rc)
+        rc
       end
 
       # Connect this 0mq socket to the 0mq socket bound to the endpoint
       # described by the +address+.
       #
       def connect address
-        begin
-          @connections << address
-          @raw_socket.connect address.to_s
-          true
-        rescue ZMQ::ZeroMQError
-          @connections.pop
-          false
-        end
+        @connections << address
+        rc = @raw_socket.connect address.to_s
+        @connections.pop unless ZMQ::Util.resultcode_ok?(rc)
+        rc
       end
 
       # Called to send a ZMQ::Message that was populated with data.
       #
-      # Returns true on success, false otherwise.
-      #
-      # May raise a ZMQ::SocketError.
+      # Returns 0+ on success, -1 for failure. Use ZMQ::Util.resultcode_ok? and
+      # ZMQ::Util.errno to check for errors.
       #
       def send_message message, multipart = false
-        begin
-          queued = @raw_socket.send message, ZMQ::NOBLOCK | (multipart ? ZMQ::SNDMORE : 0)
-        rescue ZMQ::ZeroMQError => e
-          queued = false
-        end
-        queued
+        flag = multipart ? (ZMQ::SNDMORE | ZMQ::Util.nonblocking_flag) : ZMQ::Util.nonblocking_flag
+        @raw_socket.send(message, flag)
       end
 
       # Convenience method to send a string on the socket. It handles
       # the creation of a ZMQ::Message and populates it appropriately.
       #
-      # Returns true on success, false otherwise.
-      #
-      # May raise a ZMQ::SocketError.
+      # Returns 0+ for success, -1 for failure. Check ZMQ::Util.errno for
+      # details on the error.
       #
       def send_message_string message, multipart = false
-        queued = @raw_socket.send_string message, ZMQ::NOBLOCK | (multipart ? ZMQ::SNDMORE : 0)
-        queued
+        @raw_socket.send_string message, ZMQ::Util.nonblocking_flag | (multipart ? ZMQ::SNDMORE : 0)
       end
 
       # Convenience method for sending a multi-part message. The
-      # +messages+ argument must respond to :size, :at and :last (like
-      # an Array).
-      #
-      # May raise a ZMQ::SocketError.
+      # +messages+ argument must implement Enumerable.
       #
       def send_messages messages
-        rc = true
-        i = 0
-        size = messages.size
-
-        # loop through all messages but the last
-        while rc && size > 1 && i < size - 1 do
-          rc = send_message messages.at(i), true
-          i += 1
-        end
-        
-        # FIXME: bug; if any of the message parts fail (rc != 0) we don't see that here; the
-        # #send_message function should capture exceptions and turn them into integers for bubbling
-
-        # send the last message without the multipart arg to flush
-        # the message to the 0mq queue
-        rc = send_message messages.last if rc && size > 0
-        rc
+        @raw_socket.sendmsgs messages
       end
 
-      # Retrieve the IDENTITY value assigned to this socket.
-      #
-      def identity() @raw_socket.identity; end
+      if LibZMQ.version2? || LibZMQ.version3?
 
-      # Assign a custom IDENTITY value to this socket. Limit is
-      # 255 bytes and must be greater than 0 bytes.
-      #
-      def identity=(value) @raw_socket.identity = value; end
+        # Retrieve the IDENTITY value assigned to this socket.
+        #
+        def identity() @raw_socket.identity; end
+
+        # Assign a custom IDENTITY value to this socket. Limit is
+        # 255 bytes and must be greater than 0 bytes.
+        #
+        def identity=(value) @raw_socket.identity = value; end
+
+      end # version check
 
       # Used by the reactor. Never called by user code.
       #
-      # FIXME: need to rework all of this +rc+ stuff. The underlying lib returns
-      # nil when a NOBLOCK socket gets EAGAIN. It returns true when a message
-      # was successfully dequeued. The use of rc here is really ugly and wrong.
-      #
       def resume_read
         rc = 0
-        
-        # loop and deliver all messages until the socket returns EAGAIN
-        while 0 == rc
+        more = true
+
+        while ZMQ::Util.resultcode_ok?(rc) && more
           parts = []
-          rc = read_message_part parts
-          #puts "resume_read: rc1 [#{rc}], more_parts? [#{@raw_socket.more_parts?}]"
+          rc = @raw_socket.recvmsgs parts, ZMQ::Util.nonblocking_flag
 
-          while 0 == rc && @raw_socket.more_parts?
-            #puts "get next part"
-            rc = read_message_part parts
-            #puts "resume_read: rc2 [#{rc}]"
+          if ZMQ::Util.resultcode_ok?(rc)
+            deliver(parts, rc)
+          else
+            # verify errno corresponds to EAGAIN
+            if eagain?
+              more = false
+            elsif valid_socket_error?
+              deliver([], rc)
+            end
           end
-          #puts "no more parts, ready to deliver"
-
-          # only deliver the messages when rc is 0; otherwise, we
-          # may have gotten EAGAIN and no message was read;
-          # don't deliver empty messages
-          deliver parts, rc if 0 == rc
         end
       end
 
@@ -202,32 +178,8 @@ module ZMQMachine
 
       private
 
-      def read_message_part parts
-        message = ZMQ::Message.new
-        begin
-          rc = @raw_socket.recv message, ZMQ::NOBLOCK
-          
-          if rc
-            rc = 0 # callers expect 0 for success, not true
-            parts << message
-          else
-            # got EAGAIN most likely
-            message.close
-            message = nil
-            rc = false
-          end
-          
-        rescue ZMQ::ZeroMQError => e
-          message.close if message
-          rc = e
-        end
-
-        rc
-      end
-
       def deliver parts, rc
-        #puts "deliver: rc [#{rc}], parts #{parts.inspect}"
-        if 0 == rc
+        if ZMQ::Util.resultcode_ok?(rc)
           @handler.on_readable self, parts
         else
           # this branch is never called
@@ -235,6 +187,21 @@ module ZMQMachine
         end
       end
 
+      def eagain?
+        ZMQ::EAGAIN == ZMQ::Util.errno
+      end
+
+      def valid_socket_error?
+        errno = ZMQ::Util.errno
+
+        ZMQ::ENOTSUP  == errno ||
+        ZMQ::EFSM     == errno ||
+        ZMQ::ETERM    == errno ||
+        ZMQ::ENOTSOCK == errno ||
+        ZMQ::EINTR    == errno ||
+        ZMQ::EFAULT   == errno
+      end
+
     end # module Base
 
   end # module Socket

data/lib/zm/sockets/pair.rb

@@ -42,7 +42,7 @@ module ZMQMachine
       include ZMQMachine::Socket::Base
 
       def initialize context, handler
-        @poll_options = ZMQ::POLLIN | ZMQ::POLLOUT
+        @poll_options = ZMQ::POLLIN
         @kind = :pair
 
         super

data/lib/zm/sockets/push.rb

@@ -42,7 +42,7 @@ module ZMQMachine
       include ZMQMachine::Socket::Base
 
       def initialize context, handler
-        @poll_options = ZMQ::POLLOUT
+        @poll_options = 0
         @kind = :push
 
         super

data/lib/zm/sockets/rep.rb

@@ -46,7 +46,6 @@ module ZMQMachine
         @kind = :reply
 
         super
-        @state = :ready
       end
 
       # Attach a handler to the REP socket.
@@ -66,25 +65,9 @@ module ZMQMachine
         super
       end
 
-      # +timeout+ is measured in milliseconds; default is 0 (never timeout)
-      def send_message message
-        unless waiting_for_request?
-          rc = super
-          @state = :waiting_for_request
-        else
-          rc = -1
-        end
-
-        rc
-      end
-
 
       private
 
-      def waiting_for_request?
-        :waiting_for_request == @state
-      end
-
       def allocate_socket context
         sock = ZMQ::Socket.new context.pointer, ZMQ::REP
         sock

data/lib/zm/sockets/req.rb

@@ -42,11 +42,10 @@ module ZMQMachine
       include ZMQMachine::Socket::Base
 
       def initialize context, handler
-        @poll_options = ZMQ::POLLOUT
+        @poll_options = 0
         @kind = :request
 
         super
-        @state = :ready
       end
 
       # Attach a handler to the REQ socket.
@@ -66,25 +65,9 @@ module ZMQMachine
         super
       end
 
-      # +timeout+ is measured in milliseconds; default is 0 (never timeout)
-      def send_message message
-        unless waiting_for_reply?
-          rc = super
-          @state = :waiting_for_reply
-        else
-          rc = -1
-        end
-
-        rc
-      end
-
 
       private
 
-      def waiting_for_reply?
-        :waiting_for_reply == @state
-      end
-
       def allocate_socket context
         sock = ZMQ::Socket.new context.pointer, ZMQ::REQ
         sock

data/lib/zm/sockets/sub.rb

@@ -68,7 +68,7 @@ module ZMQMachine
       end
 
       def subscribe topic
-        @raw_socket.setsockopt ZMQ::SUBSCRIBE, topic
+        @raw_socket.setsockopt(ZMQ::SUBSCRIBE, topic)
       end
 
       def subscribe_all

data/lib/zm/sockets/xrep.rb

@@ -42,7 +42,7 @@ module ZMQMachine
       include ZMQMachine::Socket::Base
 
       def initialize context, handler
-        @poll_options = ZMQ::POLLIN | ZMQ::POLLOUT
+        @poll_options = ZMQ::POLLIN
         @kind = :xreply
 
         super

data/lib/zm/sockets/xreq.rb

@@ -42,7 +42,7 @@ module ZMQMachine
       include ZMQMachine::Socket::Base
 
       def initialize context, handler
-        @poll_options = ZMQ::POLLIN | ZMQ::POLLOUT
+        @poll_options = ZMQ::POLLIN
         @kind = :xrequest
 
         super

data/version.txt

@@ -1 +1 @@
-0.5.2
+0.6.0

data/zmqmachine.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zmqmachine}
-  s.version = "0.5.2"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chuck Remes"]

metadata

@@ -1,11 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: zmqmachine
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.5.2
+  prerelease: false
+  segments: 
+  - 0
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
-  - Chuck Remes
+- Chuck Remes
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -13,28 +17,36 @@ cert_chain: []
 date: 2011-07-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: ffi-rzmq
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 0.7.0
-    type: :runtime
-    version_requirements: *id001
-  - !ruby/object:Gem::Dependency 
-    name: bones
-    prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 3.5.4
-    type: :development
-    version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: ffi-rzmq
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 7
+        - 0
+        version: 0.7.0
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: bones
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 5
+        - 4
+        version: 3.5.4
+  type: :development
+  version_requirements: *id002
 description: |-
   ZMQMachine is another Ruby implementation of the reactor pattern but this
   time using 0mq sockets rather than POSIX sockets.
@@ -55,72 +67,76 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-  - History.txt
-  - README.rdoc
-  - version.txt
+- History.txt
+- README.rdoc
+- version.txt
 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/sockets/push.rb
-  - lib/zm/sockets/pull.rb
-  - lib/zm/timers.rb
-  - lib/zmqmachine.rb
-  - spec/spec_helper.rb
-  - spec/reactor_spec.rb
-  - version.txt
-  - zmqmachine.gemspec
+- .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/sockets/push.rb
+- lib/zm/sockets/pull.rb
+- lib/zm/timers.rb
+- lib/zmqmachine.rb
+- spec/spec_helper.rb
+- spec/reactor_spec.rb
+- version.txt
+- zmqmachine.gemspec
 has_rdoc: true
 homepage: http://github.com/chuckremes/zmqmachine
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-  - --main
-  - README.rdoc
+- --main
+- README.rdoc
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: zmqmachine
-rubygems_version: 1.5.1
+rubygems_version: 1.3.7
 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.