ffi-rzmq 1.0.3 → 2.0.4

data/examples/{v2api/reqrep_poll.rb → reqrep_poll.rb}

@@ -1,6 +1,5 @@
 
-require File.join(File.dirname(__FILE__), '..', '..', 'lib', 'ffi-rzmq')
-
+require File.join(File.dirname(__FILE__), '..', 'lib', 'ffi-rzmq')
 
 def assert(rc)
   raise "Last API call failed at #{caller(1)}" unless rc >= 0
@@ -38,7 +37,7 @@ until @done do
     payload = "#{ '3' * 1024 }"
 
     puts "sending payload nonblocking"
-    assert(s1.send_string(payload, ZMQ::NonBlocking))
+    assert(s1.send_string(payload, ZMQ::DONTWAIT))
     @unsent = false
   end
 
@@ -46,7 +45,7 @@ until @done do
   if Time.now - start_time > 1
     poller.readables.each do |sock|
       received_msg = ''
-      assert(sock.recv_string(received_msg, ZMQ::NonBlocking))
+      assert(sock.recv_string(received_msg, ZMQ::DONTWAIT))
 
       puts "message received [#{received_msg}]"
       @done = true

data/examples/{v2api/request_response.rb → request_response.rb}

@@ -1,6 +1,5 @@
 
-require File.join(File.dirname(__FILE__), '..', '..', 'lib', 'ffi-rzmq')
-
+require File.join(File.dirname(__FILE__), '..', 'lib', 'ffi-rzmq')
 
 def assert(rc)
   raise "Last API call failed at #{caller(1)}" unless rc >= 0

data/examples/{v3api/sub.rb → sub.rb}

@@ -1,11 +1,10 @@
 
-require File.join(File.dirname(__FILE__), '..', '..', 'lib', 'ffi-rzmq')
+require File.join(File.dirname(__FILE__), '..', 'lib', 'ffi-rzmq')
 
 #if ARGV.length != 3
 #  puts "usage: ruby local_throughtput.rb <bind-to> <message-size> <message-count>"
 #  Process.exit
 #end
-p ZMQ::Util.version
 
 def assert(rc)
   raise "Last API call failed at #{caller(1)}" unless rc >= 0

data/examples/{v3api/throughput_measurement.rb → throughput_measurement.rb}

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'lib', 'ffi-rzmq')
+require File.join(File.dirname(__FILE__), '..', 'lib', 'ffi-rzmq')
 require 'thread'
 
 # Within a single process, we start up five threads. Main thread has a PUB (publisher)

data/examples/{v3api/xreqxrep_poll.rb → xreqxrep_poll.rb}

@@ -1,6 +1,5 @@
 
-require File.join(File.dirname(__FILE__), '..', '..', 'lib', 'ffi-rzmq')
-
+require File.join(File.dirname(__FILE__), '..', 'lib', 'ffi-rzmq')
 
 def assert(rc)
   raise "Last API call failed at #{caller(1)}" unless rc >= 0
@@ -43,7 +42,7 @@ until @done do
 
     5.times do |i|
       payload = "#{ i.to_s * 40 }"
-      assert(s1.send_string(payload, ZMQ::NonBlocking))
+      assert(s1.send_string(payload, ZMQ::DONTWAIT))
     end
     @unsent = false
   end
@@ -54,12 +53,12 @@ until @done do
 
       if sock.identity =~ /xrep/
         routing_info = ''
-        assert(sock.recv_string(routing_info, ZMQ::NonBlocking))
+        assert(sock.recv_string(routing_info, ZMQ::DONTWAIT))
         puts "routing_info received [#{routing_info}] on socket.identity [#{sock.identity}]"
       else
         routing_info = nil
         received_msg = ''
-        assert(sock.recv_string(received_msg, ZMQ::NonBlocking))
+        assert(sock.recv_string(received_msg, ZMQ::DONTWAIT))
 
         # skip to the next iteration if received_msg is nil; that means we got an EAGAIN
         next unless received_msg
@@ -68,13 +67,13 @@ until @done do
 
       while sock.more_parts? do
         received_msg = ''
-        assert(sock.recv_string(received_msg, ZMQ::NonBlocking))
+        assert(sock.recv_string(received_msg, ZMQ::DONTWAIT))
 
         puts "message received [#{received_msg}]"
       end
 
       puts "kick back a reply"
-      assert(sock.send_string(routing_info, ZMQ::SNDMORE | ZMQ::NonBlocking)) if routing_info
+      assert(sock.send_string(routing_info, ZMQ::SNDMORE | ZMQ::DONTWAIT)) if routing_info
       time = Time.now.strftime "%Y-%m-%dT%H:%M:%S.#{Time.now.usec}"
       reply = "reply " + sock.identity.upcase + " #{time}"
       puts "sent reply [#{reply}], #{time}"

data/ffi-rzmq.gemspec

@@ -11,9 +11,9 @@ Gem::Specification.new do |s|
   s.summary     = %q{This gem wraps the ZeroMQ (0mq) networking library using Ruby FFI (foreign function interface).}
   s.description = %q{This gem wraps the ZeroMQ networking library using the ruby FFI (foreign
 function interface). It's a pure ruby wrapper so this gem can be loaded
-and run by any ruby runtime that supports FFI. That's all of the major ones -
-MRI, Rubinius and JRuby.}
+and run by any ruby runtime that supports FFI. That's all of the major ones - MRI, Rubinius and JRuby.}
 
+  s.license = 'MIT'
   s.rubyforge_project = "ffi-rzmq"
 
   s.files         = `git ls-files`.split("\n")
@@ -21,7 +21,7 @@ MRI, Rubinius and JRuby.}
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "ffi"#, [">= 1.0.9"]
-  s.add_development_dependency "rspec", ["~> 2.6"]
+  s.add_runtime_dependency "ffi-rzmq-core", [">= 1.0.1"]
+  s.add_development_dependency "rspec", ["~> 2.14"]
   s.add_development_dependency "rake"
 end

data/lib/ffi-rzmq.rb

@@ -63,10 +63,9 @@ end  # module ZMQ
 # some code is conditionalized based upon what ruby engine we are
 # executing
 
-require 'ffi'
+require 'ffi-rzmq-core'
 
 # the order of files is important
-#%w(wrapper zmq exceptions context message socket poll_items poll device).each do |file|
-%w(libc libzmq constants util exceptions context message socket poll_items poll_item poll device).each do |file|
+%w(util exceptions context message socket poll_items poll_item poll device version).each do |file|
   require ZMQ.libpath(['ffi-rzmq', file])
 end

data/lib/ffi-rzmq/context.rb

@@ -47,44 +47,29 @@ module ZMQ
 
     # Use the factory method Context#create to make contexts.
     #
-    if LibZMQ.version2?
-      def self.create io_threads = 1
-        new(io_threads) rescue nil
-      end
-
-      def initialize io_threads = 1
-        @io_threads = io_threads
-        @context = LibZMQ.zmq_init io_threads
-        ZMQ::Util.error_check 'zmq_init', (@context.nil? || @context.null?) ? -1 : 0
-
-        define_finalizer
-      end
-    elsif LibZMQ.version3?
+    def self.create(opts = {})
+      new(opts) rescue nil
+    end
 
-      def self.create(opts = {})
-        new(opts) rescue nil
+    def initialize(opts = {})
+      if opts.respond_to?(:empty?)
+        @io_threads = opts[:io_threads] || IO_THREADS_DFLT
+        @max_sockets = opts[:max_sockets] || MAX_SOCKETS_DFLT
+      else
+        @io_threads = opts || 1
+        @max_sockets = MAX_SOCKETS_DFLT
       end
 
-      def initialize(opts = {})
-        if opts.respond_to?(:empty?)
-          @io_threads = opts[:io_threads] || IO_THREADS_DFLT
-          @max_sockets = opts[:max_sockets] || MAX_SOCKETS_DFLT
-        else
-          @io_threads = opts || 1
-          @max_sockets = MAX_SOCKETS_DFLT
-        end
-
-        @context = LibZMQ.zmq_ctx_new
-        ZMQ::Util.error_check 'zmq_ctx_new', (@context.nil? || @context.null?) ? -1 : 0
+      @context = LibZMQ.zmq_ctx_new
+      ZMQ::Util.error_check 'zmq_ctx_new', (@context.nil? || @context.null?) ? -1 : 0
 
-        rc = LibZMQ.zmq_ctx_set(@context, ZMQ::IO_THREADS, @io_threads)
-        ZMQ::Util.error_check 'zmq_ctx_set', rc
+      rc = LibZMQ.zmq_ctx_set(@context, ZMQ::IO_THREADS, @io_threads)
+      ZMQ::Util.error_check 'zmq_ctx_set', rc
 
-        rc = LibZMQ.zmq_ctx_set(@context, ZMQ::MAX_SOCKETS, @max_sockets)
-        ZMQ::Util.error_check 'zmq_ctx_set', rc
+      rc = LibZMQ.zmq_ctx_set(@context, ZMQ::MAX_SOCKETS, @max_sockets)
+      ZMQ::Util.error_check 'zmq_ctx_set', rc
 
-        define_finalizer
-      end
+      define_finalizer
     end
 
     # Call to release the context and any remaining data associated
@@ -94,27 +79,14 @@ module ZMQ
     #
     # Returns 0 for success, -1 for failure.
     #
-    if LibZMQ.version2?
-      def terminate
-        unless @context.nil? || @context.null?
-          remove_finalizer
-          rc = LibZMQ.zmq_term @context
-          @context = nil
-          rc
-        else
-          0
-        end
-      end
-    elsif LibZMQ.version3?
-      def terminate
-        unless @context.nil? || @context.null?
-          remove_finalizer
-          rc = LibZMQ.zmq_ctx_destroy(@context)
-          @context = nil
-          rc
-        else
-          0
-        end
+    def terminate
+      unless @context.nil? || @context.null?
+        remove_finalizer
+        rc = LibZMQ.zmq_ctx_destroy(@context)
+        @context = nil
+        rc
+      else
+        0
       end
     end
 

data/lib/ffi-rzmq/device.rb

@@ -3,10 +3,10 @@ module ZMQ
   class Device
     attr_reader :device
 
-    def self.create(device_type, frontend, backend)
+    def self.create(frontend, backend, capture=nil)
       dev = nil
       begin
-        dev = new(device_type, frontend, backend)
+        dev = new(frontend, backend, capture)
       rescue ArgumentError
         dev = nil
       end
@@ -14,15 +14,19 @@ module ZMQ
       dev
     end
 
-    def initialize(device_type, frontend, backend)
+    def initialize(frontend, backend, capture=nil)
       [["frontend", frontend], ["backend", backend]].each do |name, socket|
         unless socket.is_a?(ZMQ::Socket)
           raise ArgumentError, "Expected a ZMQ::Socket, not a #{socket.class} as the #{name}"
         end
       end
 
-      LibZMQ.zmq_device(device_type, frontend.socket, backend.socket)
+      LibZMQ.zmq_proxy(frontend.socket, backend.socket, capture ? capture.socket : nil)
     end
   end
+  
+  # Alias for Device
+  #
+  class Proxy < Device; end
 
 end

data/lib/ffi-rzmq/exceptions.rb

@@ -13,6 +13,9 @@ module ZMQ
     end
   end # call ZeroMQError
 
+  class NotSupportedError < ZeroMQError
+  end
+
 
   class ContextError < ZeroMQError
     # True when the exception was raised due to the library

data/lib/ffi-rzmq/message.rb

@@ -84,8 +84,8 @@ module ZMQ
   #  puts "value1 is #{message.value1}"
   #
   class Message
-    
-    # Recommended way to create a standard message. A Message object is 
+
+    # Recommended way to create a standard message. A Message object is
     # returned upon success, nil when allocation fails.
     #
     def self.create message = nil
@@ -129,7 +129,7 @@ module ZMQ
       data_buffer.write_string bytes, len
 
       # use libC to call free on the data buffer; earlier versions used an
-      # FFI::Function here that called back into Ruby, but Rubinius won't 
+      # FFI::Function here that called back into Ruby, but Rubinius won't
       # support that and there are issues with the other runtimes too
       LibZMQ.zmq_msg_init_data @pointer, data_buffer, len, LibC::Free, nil
     end
@@ -182,42 +182,36 @@ module ZMQ
     #
     def close
       rc = 0
-      
+
       if @pointer
         rc = LibZMQ.zmq_msg_close @pointer
         @pointer = nil
       end
-      
+
       rc
     end
-    
+
     # cache the msg size so we don't have to recalculate it when creating
     # each new instance
-    @msg_size = LibZMQ::Msg.size
-    
+    @msg_size = LibZMQ::Message.size
+
     def self.msg_size() @msg_size; end
 
   end # class Message
-  
-  if LibZMQ.version3?
-    class Message
-      # Version3 only
-      #
-      def get(property)
-        LibZMQ.zmq_msg_get(@pointer, property)
-      end
-      
-      # Version3 only
-      #
-      # Returns true if this message has additional parts coming.
-      #
-      def more?
-        Util.resultcode_ok?(get(MORE))
-      end
-      
-      def set(property, value)
-        LibZMQ.zmq_msg_set(@pointer, property, value)
-      end
+
+  class Message
+    def get(property)
+      LibZMQ.zmq_msg_get(@pointer, property)
+    end
+
+    # Returns true if this message has additional parts coming.
+    #
+    def more?
+      Util.resultcode_ok?(get(MORE))
+    end
+
+    def set(property, value)
+      LibZMQ.zmq_msg_set(@pointer, property, value)
     end
   end
 
@@ -254,7 +248,7 @@ module ZMQ
     #
     def copy_in_bytes bytes, len
       rc = super(bytes, len)
-      
+
       # make sure we have a way to deallocate this memory if the object goes
       # out of scope
       define_finalizer
@@ -296,7 +290,7 @@ module ZMQ
     # cache the msg size so we don't have to recalculate it when creating
     # each new instance
     # need to do this again because ivars are not inheritable
-    @msg_size = LibZMQ::Msg.size
+    @msg_size = LibZMQ::Message.size
 
   end # class ManagedMessage
 

data/lib/ffi-rzmq/poll.rb

@@ -150,22 +150,11 @@ module ZMQ
     # milliseconds, so we need to convert that value to
     # microseconds for the library.
     #
-    if LibZMQ.version2?
-      def adjust timeout
-        if :blocking == timeout || -1 == timeout
-          -1
-        else
-          (timeout * 1000).to_i
-        end
-      end
-    else
-      # version3 changed units from microseconds to milliseconds
-      def adjust timeout
-        if :blocking == timeout || -1 == timeout
-          -1
-        else
-          timeout.to_i
-        end
+    def adjust timeout
+      if :blocking == timeout || -1 == timeout
+        -1
+      else
+        timeout.to_i
       end
     end
 

data/lib/ffi-rzmq/socket.rb

@@ -1,8 +1,7 @@
 
 module ZMQ
 
-  module CommonSocketBehavior
-
+  class Socket
     attr_reader :socket, :name
 
     # Allocates a socket of type +type+ for sending and receiving data.
@@ -70,15 +69,15 @@ module ZMQ
 
       context_ptr = context_ptr.pointer if context_ptr.kind_of?(ZMQ::Context)
 
-      unless context_ptr.null?
+      if context_ptr.nil? || context_ptr.null?
+        raise ContextError.new 'zmq_socket', 0, ETERM, "Context pointer was null"
+      else
         @socket = LibZMQ.zmq_socket context_ptr, type
         if @socket && !@socket.null?
           @name = SocketTypeNameMap[type]
         else
           raise ContextError.new 'zmq_socket', 0, ETERM, "Socket pointer was null"
         end
-      else
-        raise ContextError.new 'zmq_socket', 0, ETERM, "Context pointer was null"
       end
 
       @longlong_cache = @int_cache = nil
@@ -118,7 +117,7 @@ module ZMQ
     # Returns 0 when the operation completed successfully.
     # Returns -1 when this operation failed.
     #
-    # With a -1 return code, the user must check ZMQ.errno to determine the
+    # With a -1 return code, the user must check ZMQ::Util.errno to determine the
     # cause.
     #
     #  rc = socket.setsockopt(ZMQ::LINGER, 1_000)
@@ -136,15 +135,14 @@ module ZMQ
         pointer.write_int value
 
       elsif 2 == @option_lookup[name]
+        # Strings are treated as pointers by FFI so we'll just pass it through
         length ||= value.size
+        pointer = value
 
-        # note: not checking errno for failed memory allocations :(
-        pointer = LibC.malloc length
-        pointer.write_string value
       end
 
       rc = LibZMQ.zmq_setsockopt @socket, name, pointer, length
-      LibC.free(pointer) unless pointer.nil? || pointer.null?
+      LibC.free(pointer) unless pointer.is_a?(String) || pointer.nil? || pointer.null?
       rc
     end
 
@@ -193,7 +191,7 @@ module ZMQ
     # depending upon the value of the socket option ZMQ::LINGER.
     #
     # Returns 0 upon success *or* when the socket has already been closed.
-    # Returns -1 when the operation fails. Check ZMQ.errno for the error code.
+    # Returns -1 when the operation fails. Check ZMQ::Util.errno for the error code.
     #
     #  rc = socket.close
     #  puts("Given socket was invalid!") unless 0 == rc
@@ -215,15 +213,15 @@ module ZMQ
     #
     # +flags+ may take two values:
     # * 0 (default) - blocking operation
-    # * ZMQ::NonBlocking - non-blocking operation
+    # * ZMQ::DONTWAIT - non-blocking operation
     # * ZMQ::SNDMORE - this message is part of a multi-part message
     #
     # Returns 0 when the message was successfully enqueued.
     # Returns -1 under two conditions.
     # 1. The message could not be enqueued
-    # 2. When +flags+ is set with ZMQ::NonBlocking and the socket returned EAGAIN.
+    # 2. When +flags+ is set with ZMQ::DONTWAIT and the socket returned EAGAIN.
     #
-    # With a -1 return code, the user must check ZMQ.errno to determine the
+    # With a -1 return code, the user must check ZMQ::Util.errno to determine the
     # cause.
     #
     def sendmsg message, flags = 0
@@ -233,14 +231,14 @@ module ZMQ
     # Helper method to make a new #Message instance out of the +string+ passed
     # in for transmission.
     #
-    # +flags+ may be ZMQ::NonBlocking and ZMQ::SNDMORE.
+    # +flags+ may be ZMQ::DONTWAIT and ZMQ::SNDMORE.
     #
     # Returns 0 when the message was successfully enqueued.
     # Returns -1 under two conditions.
     # 1. The message could not be enqueued
-    # 2. When +flags+ is set with ZMQ::NonBlocking and the socket returned EAGAIN.
+    # 2. When +flags+ is set with ZMQ::DONTWAIT and the socket returned EAGAIN.
     #
-    # With a -1 return code, the user must check ZMQ.errno to determine the
+    # With a -1 return code, the user must check ZMQ::Util.errno to determine the
     # cause.
     #
     def send_string string, flags = 0
@@ -252,14 +250,14 @@ module ZMQ
     # passed in for transmission. Every element of +parts+ should be
     # a String.
     #
-    # +flags+ may be ZMQ::NonBlocking.
+    # +flags+ may be ZMQ::DONTWAIT.
     #
     # Returns 0 when the messages were successfully enqueued.
     # Returns -1 under two conditions.
     # 1. A message could not be enqueued
-    # 2. When +flags+ is set with ZMQ::NonBlocking and the socket returned EAGAIN.
+    # 2. When +flags+ is set with ZMQ::DONTWAIT and the socket returned EAGAIN.
     #
-    # With a -1 return code, the user must check ZMQ.errno to determine the
+    # With a -1 return code, the user must check ZMQ::Util.errno to determine the
     # cause.
     #
     def send_strings parts, flags = 0
@@ -270,14 +268,14 @@ module ZMQ
     # passed in for transmission. Every element of +parts+ should be
     # a Message (or subclass).
     #
-    # +flags+ may be ZMQ::NonBlocking.
+    # +flags+ may be ZMQ::DONTWAIT.
     #
     # Returns 0 when the messages were successfully enqueued.
     # Returns -1 under two conditions.
     # 1. A message could not be enqueued
-    # 2. When +flags+ is set with ZMQ::NonBlocking and the socket returned EAGAIN.
+    # 2. When +flags+ is set with ZMQ::DONTWAIT and the socket returned EAGAIN.
     #
-    # With a -1 return code, the user must check ZMQ.errno to determine the
+    # With a -1 return code, the user must check ZMQ::Util.errno to determine the
     # cause.
     #
     def sendmsgs parts, flags = 0
@@ -290,9 +288,9 @@ module ZMQ
     # Returns 0 when the message was successfully enqueued.
     # Returns -1 under two conditions.
     # 1. The message could not be enqueued
-    # 2. When +flags+ is set with ZMQ::NonBlocking and the socket returned EAGAIN.
+    # 2. When +flags+ is set with ZMQ::DONTWAIT and the socket returned EAGAIN.
     #
-    # With a -1 return code, the user must check ZMQ.errno to determine the
+    # With a -1 return code, the user must check ZMQ::Util.errno to determine the
     # cause.
     #
     def send_and_close message, flags = 0
@@ -305,14 +303,14 @@ module ZMQ
     #
     # +flags+ may take two values:
     #  0 (default) - blocking operation
-    #  ZMQ::NonBlocking - non-blocking operation
+    #  ZMQ::DONTWAIT - non-blocking operation
     #
     # Returns 0 when the message was successfully dequeued.
     # Returns -1 under two conditions.
     # 1. The message could not be dequeued
-    # 2. When +flags+ is set with ZMQ::NonBlocking and the socket returned EAGAIN.
+    # 2. When +flags+ is set with ZMQ::DONTWAIT and the socket returned EAGAIN.
     #
-    # With a -1 return code, the user must check ZMQ.errno to determine the
+    # With a -1 return code, the user must check ZMQ::Util.errno to determine the
     # cause.
     #
     # The application code is responsible for handling the +message+ object lifecycle
@@ -326,14 +324,14 @@ module ZMQ
     # Helper method to make a new #Message instance and convert its payload
     # to a string.
     #
-    # +flags+ may be ZMQ::NonBlocking.
+    # +flags+ may be ZMQ::DONTWAIT.
     #
     # Returns 0 when the message was successfully dequeued.
     # Returns -1 under two conditions.
     # 1. The message could not be dequeued
-    # 2. When +flags+ is set with ZMQ::NonBlocking and the socket returned EAGAIN.
+    # 2. When +flags+ is set with ZMQ::DONTWAIT and the socket returned EAGAIN.
     #
-    # With a -1 return code, the user must check ZMQ.errno to determine the
+    # With a -1 return code, the user must check ZMQ::Util.errno to determine the
     # cause.
     #
     # The application code is responsible for handling the +message+ object lifecycle
@@ -349,7 +347,7 @@ module ZMQ
 
     # Receive a multipart message as a list of strings.
     #
-    # +flag+ may be ZMQ::NonBlocking. Any other flag will be
+    # +flag+ may be ZMQ::DONTWAIT. Any other flag will be
     # removed.
     #
     def recv_strings list, flag = 0
@@ -369,11 +367,11 @@ module ZMQ
     # Receive a multipart message as an array of objects
     # (by default these are instances of Message).
     #
-    # +flag+ may be ZMQ::NonBlocking. Any other flag will be
+    # +flag+ may be ZMQ::DONTWAIT. Any other flag will be
     # removed.
     #
     def recvmsgs list, flag = 0
-      flag = NonBlocking if dontwait?(flag)
+      flag = DONTWAIT if dontwait?(flag)
 
       message = @receiver_klass.new
       rc = recvmsg message, flag
@@ -426,24 +424,96 @@ module ZMQ
       rc
     end
 
+    # Get the options set on this socket.
+    #
+    # +name+ determines the socket option to request
+    # +array+ should be an empty array; a result of the proper type
+    # (numeric, string, boolean) will be inserted into
+    # the first position.
+    #
+    # Valid +option_name+ values:
+    #  ZMQ::RCVMORE - true or false
+    #  ZMQ::HWM - integer
+    #  ZMQ::SWAP - integer
+    #  ZMQ::AFFINITY - bitmap in an integer
+    #  ZMQ::IDENTITY - string
+    #  ZMQ::RATE - integer
+    #  ZMQ::RECOVERY_IVL - integer
+    #  ZMQ::SNDBUF - integer
+    #  ZMQ::RCVBUF - integer
+    #  ZMQ::FD     - fd in an integer
+    #  ZMQ::EVENTS - bitmap integer
+    #  ZMQ::LINGER - integer measured in milliseconds
+    #  ZMQ::RECONNECT_IVL - integer measured in milliseconds
+    #  ZMQ::BACKLOG - integer
+    #  ZMQ::RECOVER_IVL_MSEC - integer measured in milliseconds
+    #  ZMQ::IPV4ONLY - integer
+    #
+    # Returns 0 when the operation completed successfully.
+    # Returns -1 when this operation failed.
+    #
+    # With a -1 return code, the user must check ZMQ::Util.errno to determine the
+    # cause.
+    #
+    #  # retrieve high water mark
+    #  array = []
+    #  rc = socket.getsockopt(ZMQ::HWM, array)
+    #  hwm = array.first if ZMQ::Util.resultcode_ok?(rc)
+    #
+    def getsockopt name, array
+      rc = __getsockopt__ name, array
+
+      if Util.resultcode_ok?(rc) && (RCVMORE == name)
+        # convert to boolean
+        array[0] = 1 == array[0]
+      end
+
+      rc
+    end
+
+    # Convenience method for getting the value of the socket IDENTITY.
+    #
+    def identity
+      array = []
+      getsockopt IDENTITY, array
+      array.at(0)
+    end
+
+    # Convenience method for setting the value of the socket IDENTITY.
+    #
+    def identity=(value)
+      setsockopt IDENTITY, value.to_s
+    end
+
+    # Disconnect the socket from the given +endpoint+.
+    #
+    def disconnect(endpoint)
+      LibZMQ.zmq_disconnect(socket, endpoint)
+    end
+
+    # Unbind the socket from the given +endpoint+.
+    #
+    def unbind(endpoint)
+      LibZMQ.zmq_unbind(socket, endpoint)
+    end
+
 
     private
-    
+
     def send_multiple(parts, flags, method_name)
       if !parts || parts.empty?
         -1
       else
-        flags = NonBlocking if dontwait?(flags)
+        flags = DONTWAIT if dontwait?(flags)
         rc = 0
-        
+
         parts[0..-2].each do |part|
           rc = send(method_name, part, (flags | ZMQ::SNDMORE))
           break unless Util.resultcode_ok?(rc)
         end
-        
+
         Util.resultcode_ok?(rc) ? send(method_name, parts[-1], flags) : rc
       end
-      
     end
 
     def __getsockopt__ name, array
@@ -485,277 +555,57 @@ module ZMQ
         alloc_pointer(255, 255)
 
       else
-        # uh oh, someone passed in an unknown option; use a slop buffer
+        # uh oh, someone passed in an unknown option; return nil
         @int_cache ||= alloc_pointer(:int32, 4)
       end
     end
 
-    def populate_option_lookup
-      # integer options
-      [EVENTS, LINGER, RCVTIMEO, SNDTIMEO, RECONNECT_IVL, FD, TYPE, BACKLOG].each { |option| @option_lookup[option] = 0 }
-
-      # long long options
-      [RCVMORE, AFFINITY].each { |option| @option_lookup[option] = 1 }
-
-      # string options
-      [SUBSCRIBE, UNSUBSCRIBE].each { |option| @option_lookup[option] = 2 }
-    end
-
     def release_cache
       @longlong_cache = nil
       @int_cache = nil
     end
 
     def dontwait?(flags)
-      (NonBlocking & flags) == NonBlocking
+      (DONTWAIT & flags) == DONTWAIT
     end
     alias :noblock? :dontwait?
-    
+
     def alloc_pointer(kind, length)
       pointer = FFI::MemoryPointer.new :size_t
       pointer.write_int(length)
       [FFI::MemoryPointer.new(kind), pointer]
     end
-  end # module CommonSocketBehavior
 
-
-  module IdentitySupport
-
-    # Convenience method for getting the value of the socket IDENTITY.
-    #
-    def identity
-      array = []
-      getsockopt IDENTITY, array
-      array.at(0)
+    def __sendmsg__(socket, address, flags)
+      LibZMQ.zmq_sendmsg(socket, address, flags)
     end
 
-    # Convenience method for setting the value of the socket IDENTITY.
-    #
-    def identity=(value)
-      setsockopt IDENTITY, value.to_s
+    def __recvmsg__(socket, address, flags)
+      LibZMQ.zmq_recvmsg(socket, address, flags)
     end
 
-
-    private
-
     def populate_option_lookup
-      super()
-
-      # string options
-      [IDENTITY].each { |option| @option_lookup[option] = 2 }
-    end
-
-  end # module IdentitySupport
-
-
-  if LibZMQ.version2?
-
-    class Socket
-      # Inclusion order is *important* since later modules may have a call
-      # to #super. We want those calls to go up the chain in a particular
-      # order
-      include CommonSocketBehavior
-      include IdentitySupport
-
-      # Get the options set on this socket.
-      #
-      # +name+ determines the socket option to request
-      # +array+ should be an empty array; a result of the proper type
-      # (numeric, string, boolean) will be inserted into
-      # the first position.
-      #
-      # Valid +option_name+ values:
-      #  ZMQ::RCVMORE - true or false
-      #  ZMQ::HWM - integer
-      #  ZMQ::SWAP - integer
-      #  ZMQ::AFFINITY - bitmap in an integer
-      #  ZMQ::IDENTITY - string
-      #  ZMQ::RATE - integer
-      #  ZMQ::RECOVERY_IVL - integer
-      #  ZMQ::MCAST_LOOP - true or false
-      #  ZMQ::SNDBUF - integer
-      #  ZMQ::RCVBUF - integer
-      #  ZMQ::FD     - fd in an integer
-      #  ZMQ::EVENTS - bitmap integer
-      #  ZMQ::LINGER - integer measured in milliseconds
-      #  ZMQ::RECONNECT_IVL - integer measured in milliseconds
-      #  ZMQ::BACKLOG - integer
-      #  ZMQ::RECOVER_IVL_MSEC - integer measured in milliseconds
-      #
-      # Returns 0 when the operation completed successfully.
-      # Returns -1 when this operation failed.
-      #
-      # With a -1 return code, the user must check ZMQ.errno to determine the
-      # cause.
-      #
-      #  # retrieve high water mark
-      #  array = []
-      #  rc = socket.getsockopt(ZMQ::HWM, array)
-      #  hwm = array.first if ZMQ::Util.resultcode_ok?(rc)
-      #
-      def getsockopt name, array
-        rc = __getsockopt__ name, array
-
-        if Util.resultcode_ok?(rc) && (RCVMORE == name || MCAST_LOOP == name)
-          # convert to boolean
-          array[0] = 1 == array[0]
-        end
-
-        rc
-      end
-
+      IntegerSocketOptions.each { |option| @option_lookup[option] = 0 }
 
-      private
-
-      def __sendmsg__(socket, address, flags)
-        LibZMQ.zmq_send(socket, address, flags)
-      end
-
-      def __recvmsg__(socket, address, flags)
-        LibZMQ.zmq_recv(socket, address, flags)
-      end
-
-      def populate_option_lookup
-        super()
-
-        # integer options
-        [RECONNECT_IVL_MAX].each { |option| @option_lookup[option] = 0 }
-
-        # long long options
-        [HWM, SWAP, RATE, RECOVERY_IVL, RECOVERY_IVL_MSEC, MCAST_LOOP, SNDBUF, RCVBUF].each { |option| @option_lookup[option] = 1 }
-      end
-
-      # these finalizer-related methods cannot live in the CommonSocketBehavior
-      # module; they *must* be in the class definition directly
-
-      def define_finalizer
-        ObjectSpace.define_finalizer(self, self.class.close(@socket, Process.pid))
-      end
-
-      def remove_finalizer
-        ObjectSpace.undefine_finalizer self
-      end
+      LongLongSocketOptions.each { |option| @option_lookup[option] = 1 }
 
-      def self.close socket, pid
-        Proc.new do
-          LibZMQ.zmq_close(socket) if socket && !socket.nil? && Process.pid == pid
-        end
-      end
-    end # class Socket for version2
-
-  end # LibZMQ.version2?
-
-
-  if LibZMQ.version3?
-    class Socket
-      include CommonSocketBehavior
-      include IdentitySupport
-
-      # Get the options set on this socket.
-      #
-      # +name+ determines the socket option to request
-      # +array+ should be an empty array; a result of the proper type
-      # (numeric, string, boolean) will be inserted into
-      # the first position.
-      #
-      # Valid +option_name+ values:
-      #  ZMQ::RCVMORE - true or false
-      #  ZMQ::HWM - integer
-      #  ZMQ::SWAP - integer
-      #  ZMQ::AFFINITY - bitmap in an integer
-      #  ZMQ::IDENTITY - string
-      #  ZMQ::RATE - integer
-      #  ZMQ::RECOVERY_IVL - integer
-      #  ZMQ::SNDBUF - integer
-      #  ZMQ::RCVBUF - integer
-      #  ZMQ::FD     - fd in an integer
-      #  ZMQ::EVENTS - bitmap integer
-      #  ZMQ::LINGER - integer measured in milliseconds
-      #  ZMQ::RECONNECT_IVL - integer measured in milliseconds
-      #  ZMQ::BACKLOG - integer
-      #  ZMQ::RECOVER_IVL_MSEC - integer measured in milliseconds
-      #  ZMQ::IPV4ONLY - integer
-      #
-      # Returns 0 when the operation completed successfully.
-      # Returns -1 when this operation failed.
-      #
-      # With a -1 return code, the user must check ZMQ.errno to determine the
-      # cause.
-      #
-      #  # retrieve high water mark
-      #  array = []
-      #  rc = socket.getsockopt(ZMQ::HWM, array)
-      #  hwm = array.first if ZMQ::Util.resultcode_ok?(rc)
-      #
-      def getsockopt name, array
-        rc = __getsockopt__ name, array
-
-        if Util.resultcode_ok?(rc) && (RCVMORE == name)
-          # convert to boolean
-          array[0] = 1 == array[0]
-        end
-
-        rc
-      end
-      
-      # Version3 only
-      #
-      # Disconnect the socket from the given +endpoint+.
-      #
-      def disconnect(endpoint)
-        LibZMQ.zmq_disconnect(socket, endpoint)
-      end
-      
-      # Version3 only
-      #
-      # Unbind the socket from the given +endpoint+.
-      #
-      def unbind(endpoint)
-        LibZMQ.zmq_unbind(socket, endpoint)
-      end
-
-
-      private
-
-      def __sendmsg__(socket, address, flags)
-        LibZMQ.zmq_sendmsg(socket, address, flags)
-      end
-
-      def __recvmsg__(socket, address, flags)
-        LibZMQ.zmq_recvmsg(socket, address, flags)
-      end
-
-      def populate_option_lookup
-        super()
-
-        # integer options
-        [RECONNECT_IVL_MAX, RCVHWM, SNDHWM, RATE, RECOVERY_IVL, SNDBUF, RCVBUF, IPV4ONLY,
-          ROUTER_BEHAVIOR, TCP_KEEPALIVE, TCP_KEEPALIVE_CNT,
-          TCP_KEEPALIVE_IDLE, TCP_KEEPALIVE_INTVL, TCP_ACCEPT_FILTER, MULTICAST_HOPS
-        ].each { |option| @option_lookup[option] = 0 }
-
-        # long long options
-        [MAXMSGSIZE].each { |option| @option_lookup[option] = 1 }
-
-        # string options
-        [LAST_ENDPOINT].each { |option| @option_lookup[option] = 2 }
-      end
+      StringSocketOptions.each { |option| @option_lookup[option] = 2 }
+    end
 
-      # these finalizer-related methods cannot live in the CommonSocketBehavior
-      # module; they *must* be in the class definition directly
+    # these finalizer-related methods cannot live in the CommonSocketBehavior
+    # module; they *must* be in the class definition directly
 
-      def define_finalizer
-        ObjectSpace.define_finalizer(self, self.class.close(@socket, Process.pid))
-      end
+    def define_finalizer
+      ObjectSpace.define_finalizer(self, self.class.close(@socket, Process.pid))
+    end
 
-      def remove_finalizer
-        ObjectSpace.undefine_finalizer self
-      end
+    def remove_finalizer
+      ObjectSpace.undefine_finalizer self
+    end
 
-      def self.close socket, pid
-        Proc.new { LibZMQ.zmq_close socket if Process.pid == pid }
-      end
-    end # Socket for version3
-  end # LibZMQ.version3?
+    def self.close socket, pid
+      Proc.new { LibZMQ.zmq_close socket if Process.pid == pid }
+    end
+  end # Socket
 
 end # module ZMQ