ffi-rzmq 0.7.2 → 0.8.0

data/History.txt

@@ -1,3 +1,23 @@
+== 0.8.0 / 20110307
+  * API change!
+    Socket#send_message no longer automatically calls
+    Message#close on behalf of the user. The user is completely
+    responsible for the lifecycle management of all buffers associated
+    with the ZMQ::Message objects.
+    This is a breaking change.
+    If you want the old behavior (auto-close messages on send) then
+    use the new Socket#send_and_close method which does as its name
+    implies.
+  * Fixed bug with type :size_t on Windows (thank you to arvicco)
+
+== 0.7.3 / 20110304
+  * Fixed a bug where we had a small memory leak. When closing a socket
+    I forgot to release a small amount of native memory used as a cache
+    for doing #getsockopt calls.
+  * Util.minimum_api? didn't work. Fixed.
+  * Added ROUTER/DEALER constants to reflect new naming for XREQ/XREP.
+    XREQ and XREP remain aliased for backward compatibility.
+
 == 0.7.2 / 20110224
   * Several minor refactorings to make the code intent clearer and to allow
     for better testing. In particular, the error condition checking for
@@ -12,10 +32,10 @@
   * Improved performance of calls to Socket#getsockopt. There are usually
     a lot of calls passing RCVMORE, so we now cache those buffers instead
     of reallocating them every time.
-    
+
   * Updated the docs on Poller#poll to warn about a possible busy-loop
     condition.
-    
+
   * Fixed some more specs to conform with the 0mq 2.1 requirement that
     all sockets must be closed explicitly otherwise the program may
     hang on exit.
@@ -28,26 +48,26 @@
 
   * Preliminary support for the Windows platform. Patches supplied
     by arvicco.
-    
+
   * Added support for FD and EVENTS socket options. These were added
     in 0mq 2.1.0. Patches + specs supplied by andrewvc.
-    
+
   * Added support for LINGER, RECONNECT_IVL, BACKLOG  and
     RECOVERY_IVL_MSEC socket options.
-    
+
   * Conditionally re-enable the socket finalizer when we are running
     with 0mq 2.1.0 or later.
-    
+
   * Drop support for MRI 1.8.x since the 'ffi' gem has dropped it as a
     supported Ruby runtime with its 1.0 release. No action is taken to
     prevent running with MRI 1.8.x but it won't be supported.
-    
+
   * Misc. spec fixes. Need more specs!
 
 == 0.6.0 / 20100911
   * API Change! Modified ZMQ::Message by removing automatic memory
     management. While doing some performance tests I saw that
-    defining/undefining the finalizer added 15-30% processing 
+    defining/undefining the finalizer added 15-30% processing
     overhead on the latency test. So, I split this functionality
     out to a subclass called ZMQ::ManagedMemory. Any existing code
     that relies on the default Message class to clean up after itself
@@ -57,7 +77,7 @@
 
   * Rubinius/rbx compatibility! Requires an rbx code pull from git
     from 20100911 or later to get the necessary code fixes.
-  
+
   * Modify Message to use the @pointer directly rather than indirectly
     via the @struct object. Provides better compatibility for rbx
     since rbx does not yet support the FFI pointer protocol for structs
@@ -76,38 +96,38 @@
     a pointer to the free function.
 
   * Modify FFI wrapper to remove the FFI::Function callback used
-    by Message. It's no longer necessary since we now use free 
+    by Message. It's no longer necessary since we now use free
     directly.
 
 == 0.5.1 / 20100830
   * Works with 0mq 2.0.8 release.
-  
+
   * Removed the socket finalizer. The current 0mq framework cannot
     handle the case where zmq_close is called on a socket that was
     created from another thread. Therefore, the garbage collection
     thread causes the framework to break. Version 2.1 (or later)
     should fix this 0mq limitation.
-    
+
   * Misc fixes. See commits.
 
 == 0.5.0 / 20100606
   * Updated the bindings to conform to the 0mq 2.0.7 release.
   Several parts of the API changed.
-  
+
   * Updated all examples to use the new Context api.
-  
+
   * Added Socket#getsockopt.
-  
+
   * Added a Socket#identity and Socket#identity= method pair to
   allow for easy get/put on socket identities. Useful for async
   request/reply using XREQ/XREP sockets.
-  
+
   * Added more specs (slowly but surely).
-  
+
   * Support multi-part messages (new as of 2.0.7). I am unsure how
   to best support multi-part messages so the Message (and related)
   API may change in the future. Added Socket#more_parts?.
-  
+
   * Lots of fixes. Many classes use finalizers to deallocate native
   memory when they go out of scope; be sure to use JRuby 1.5.1 or
   later to get important finalizer fixes.
@@ -120,41 +140,41 @@
 == 0.4.0 / 20100510
   * Changed the Socket#recv method signature to take an optional
   message object as its first argument. This allows the library
-  user to allocate and pass in their own message object for the 
+  user to allocate and pass in their own message object for the
   purposes of zero-copy. Original behavior was for the library to
   *always* allocate a new message object to receive a message into.
   Hopefully this is the last change required.
-  
+
   * Modified the Socket constructor to take an optional hash as its
   final argument. It honors two keys; :receiver_klass and
   :sender_klass. Passing in a new constant for either (or both) keys
   will override the class used by Socket for allocating new
-  Message objects. 
+  Message objects.
 
 == 0.3.1 / 20100509
   * Modified ZMQ::Message so we have both an UnmanagedMessage where
   memory management is manual via the #close method, and Message where
   memory management is automated via a finalizer method run during
   garbage collection.
-  
+
   * Updated ZMQ::Message docs to make it clearer how to use a subclass
   and FFI::Struct to lazily access the message buffer. This gets us as
   close to zero-copy as possible for performance.
-  
+
   * Fixed a memory leak in Message where the FFI::Struct backing the
   C struct was not being freed.
-  
+
   * Tested the FFI code against MRI 1.8.x and 1.9.x. It works!
-  
+
   * Patched a potential problem in LibZMQ::MessageDeallocator. It was
   crashing under MRI because it complained that FFI::Pointer did not
-  have a free method. It now checks for :free before calling it. 
+  have a free method. It now checks for :free before calling it.
   Need to investigate this further because it never happened under
   JRuby.
-  
+
   * Modified the Socket constructor slightly to allow for using
   unmanaged or managed messages.
-  
+
   * Changed the /examples to print a throughput (msgs/s) number upon
   completion.
 
@@ -164,20 +184,20 @@
     However, to do so requires lots of copying to and from buffers which
     greatly impacts performance. These methods now return a ZMQ::Message
     object which can be subclassed to do lazy evaluation of the buffer.
-    
+
   * Added ZMQ::Socket#send_string and ZMQ::Socket#recv_string. They
     automatically convert the messages to strings just like the official
     0mq ruby bindings.
 
   * Fixed bug in ZMQ::Util#error_string
-  
+
   * Split the ZMQ::Message class into two classes. The base class called
     UnmanagedMessage requires manual memory management. The Message
     class (used by default by Socket) has a finalizer defined to
     automatically release memory when the message object gets garbage
     collected.
-  
-  
+
+
 == 0.2.0 / 20100505
 
 * 1 major enhancement

data/ffi-rzmq.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ffi-rzmq}
-  s.version = "0.7.2"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chuck Remes"]
@@ -10,17 +10,10 @@ Gem::Specification.new do |s|
   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 them:
-MRI 1.9.x, Rubinius and JRuby.
-
-The impetus behind this library was to provide support for ZeroMQ in
-JRuby which has native threads. Unlike MRI, IronRuby and
-Rubinius which all have a GIL, JRuby allows for threaded access to ruby
-code from outside extensions. ZeroMQ is heavily threaded, so until the
-other runtimes remove their GIL, JRuby will likely be the best
-environment to run this library.}
+MRI 1.9.x, Rubinius and JRuby.}
   s.email = %q{cremes@mac.com}
   s.extra_rdoc_files = ["History.txt", "README.rdoc", "examples/README.rdoc", "version.txt"]
-  s.files = [".bnsignore", "History.txt", "README.rdoc", "Rakefile", "examples/README.rdoc", "examples/local_lat.rb", "examples/local_lat_poll.rb", "examples/local_lat_zerocopy.rb", "examples/local_throughput.rb", "examples/publish_subscribe.rb", "examples/remote_lat.rb", "examples/remote_lat_zerocopy.rb", "examples/remote_throughput.rb", "examples/reqrep_poll.rb", "examples/request_response.rb", "ffi-rzmq.gemspec", "lib/ffi-rzmq.rb", "lib/ffi-rzmq/context.rb", "lib/ffi-rzmq/exceptions.rb", "lib/ffi-rzmq/message.rb", "lib/ffi-rzmq/poll.rb", "lib/ffi-rzmq/poll_items.rb", "lib/ffi-rzmq/socket.rb", "lib/ffi-rzmq/wrapper.rb", "lib/ffi-rzmq/zmq.rb", "spec/context_spec.rb", "spec/message_spec.rb", "spec/pushpull_spec.rb", "spec/reqrep_spec.rb", "spec/socket_spec.rb", "spec/spec_helper.rb", "version.txt"]
+  s.files = [".bnsignore", "History.txt", "README.rdoc", "Rakefile", "examples/README.rdoc", "examples/local_lat.rb", "examples/local_lat_poll.rb", "examples/local_lat_zerocopy.rb", "examples/local_throughput.rb", "examples/publish_subscribe.rb", "examples/remote_lat.rb", "examples/remote_lat_zerocopy.rb", "examples/remote_throughput.rb", "examples/reqrep_poll.rb", "examples/request_response.rb", "ffi-rzmq.gemspec", "lib/ffi-rzmq.rb", "lib/ffi-rzmq/context.rb", "lib/ffi-rzmq/device.rb", "lib/ffi-rzmq/exceptions.rb", "lib/ffi-rzmq/message.rb", "lib/ffi-rzmq/poll.rb", "lib/ffi-rzmq/poll_items.rb", "lib/ffi-rzmq/socket.rb", "lib/ffi-rzmq/wrapper.rb", "lib/ffi-rzmq/zmq.rb", "spec/context_spec.rb", "spec/device_spec.rb", "spec/message_spec.rb", "spec/pushpull_spec.rb", "spec/reqrep_spec.rb", "spec/socket_spec.rb", "spec/spec_helper.rb", "version.txt"]
   s.homepage = %q{http://github.com/chuckremes/ffi-rzmq}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]

data/lib/ffi-rzmq.rb

@@ -67,6 +67,6 @@ end  # module ZMQ
 RBX = defined?(RUBY_ENGINE) && RUBY_ENGINE =~ /rbx/ ? true : false
 
 # the order of files is important
-%w(wrapper zmq exceptions context message socket poll_items poll).each do |file|
+%w(wrapper zmq exceptions context message socket poll_items poll device).each do |file|
   require ZMQ.libpath(['ffi-rzmq', file])
 end

data/lib/ffi-rzmq/context.rb

@@ -77,8 +77,8 @@ module ZMQ
     #   #ZMQ::PAIR
     #   #ZMQ::PULL
     #   #ZMQ::PUSH
-    #   #ZMQ::XREQ
-    #   #ZMQ::XREP
+    #   #ZMQ::DEALER
+    #   #ZMQ::ROUTER
     #
     # Returns a #ZMQ::Socket.
     #

data/lib/ffi-rzmq/device.rb

@@ -0,0 +1,15 @@
+module ZMQ
+  class Device
+    attr_reader :device
+     
+    def initialize(device_type,frontend,backend)
+      [["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)
+    end
+  end
+end

data/lib/ffi-rzmq/message.rb

@@ -189,8 +189,14 @@ module ZMQ
     # Manually release the message struct and its associated data
     # buffer.
     #
+    # Only releases the buffer a single time. Subsequent calls are
+    # no ops.
+    #
     def close
-      LibZMQ.zmq_msg_close @pointer
+      if @pointer
+        LibZMQ.zmq_msg_close @pointer
+        @pointer = nil
+      end
     end
 
 

data/lib/ffi-rzmq/poll.rb

@@ -67,7 +67,6 @@ module ZMQ
     def register sock, events = ZMQ::POLLIN | ZMQ::POLLOUT, fd = 0
       return false if (sock.nil? && fd.zero?) || events.zero?
 
-      @poll_items_dirty = true
       item = @items.get(@sockets.index(sock))
 
       unless item
@@ -78,7 +77,7 @@ module ZMQ
           item[:socket] = sock.socket
           item[:fd] = 0
         else
-          item[:socket] = 0
+          item[:socket] = FFI::MemoryPointer.new(0)
           item[:fd] = fd
         end
 
@@ -132,14 +131,28 @@ module ZMQ
 
     # Deletes the +sock+ for all subscribed events.
     #
+#    def delete sock
+#      removed = false
+#      
+#      if index = @sockets.index(sock)
+#        removed = @items.delete_at(index) and @sockets.delete(sock) and @raw_to_socket.delete(sock.socket.address)
+#      end
+#      
+#      removed
+#    end
     def delete sock
       removed = false
+      size = @sockets.size
+      @sockets.delete_if { |socket| socket.socket.address == sock.socket.address }
+      socket_deleted = size != @sockets.size
       
-      if index = @sockets.index(sock)
-        removed = @items.delete_at(index) and @sockets.delete(sock) and @raw_to_socket.delete(sock.socket.address)
-      end
+      item_deleted = @items.delete sock
+      
+      size = @raw_to_socket.size
+      @raw_to_socket.delete(sock.socket.address)
+      raw_deleted = size != @raw_to_socket.size
       
-      removed
+      socket_deleted && item_deleted && raw_deleted
     end
 
     def size(); @items.size; end

data/lib/ffi-rzmq/poll_items.rb

@@ -37,6 +37,25 @@ module ZMQ
     end
     alias :push :<<
     
+    def delete sock
+      address = sock.socket.address
+      found = false
+      
+      each_with_index do |item, index|
+        if address == item[:socket].address
+          @items.delete_at index
+          found = true
+          @dirty = true
+          clean
+          break
+        end
+      end
+      
+      # these semantics are different from the usual Array#delete; returns a
+      # boolean instead of the actual item or nil
+      found
+    end
+    
     def delete_at index
       value = nil
       unless @items.empty?
@@ -84,7 +103,7 @@ module ZMQ
     # it is garbage collected that native memory should be automatically freed.
     def clean
       if @dirty
-        @store = FFI::MemoryPointer.new @element_size, @items.size, false
+        @store = FFI::MemoryPointer.new @element_size, @items.size, true
 
         # copy over
         offset = 0

data/lib/ffi-rzmq/socket.rb

@@ -19,7 +19,7 @@ module ZMQ
     #
     # +type+ can be one of ZMQ::REQ, ZMQ::REP, ZMQ::PUB,
     # ZMQ::SUB, ZMQ::PAIR, ZMQ::PULL, ZMQ::PUSH,
-    # ZMQ::XREQ or ZMQ::XREP.
+    # ZMQ::DEALER or ZMQ::ROUTER.
     #
     # By default, this class uses ZMQ::Message for manual
     # memory management. For automatic garbage collection of received messages,
@@ -144,7 +144,7 @@ module ZMQ
     def getsockopt option_name
       begin
         option_value = FFI::MemoryPointer.new :pointer
-        option_length = FFI::MemoryPointer.new :size_t
+        option_length = FFI::MemoryPointer.new(:size_t) rescue FFI::MemoryPointer.new(:ulong)
 
         unless [
           RCVMORE, HWM, SWAP, AFFINITY, RATE, RECOVERY_IVL, MCAST_LOOP, IDENTITY,
@@ -226,6 +226,7 @@ module ZMQ
       result_code = LibZMQ.zmq_close @socket
       error_check ZMQ_CLOSE_STR, result_code
       @socket = nil
+      release_cache
     end
   end
 
@@ -242,13 +243,8 @@ module ZMQ
   # 1. The message could not be enqueued
   # 2. When +flags+ is set with ZMQ::NOBLOCK and the socket returned EAGAIN.
   #
-  # The application code is *not* responsible for handling the +message+ object
-  # lifecycle when #send returns successfully or it raises an exception. The
-  # #send method takes ownership of the +message+ and its associated buffers.
-  # Both successful and failed calls will release the +message+ data buffer.
-  #
-  # Again, once a +message+ object has been passed to this method,
-  # do not try to access its #data buffer anymore. The 0mq library now owns it.
+  # The application code is responsible for handling the +message+ object
+  # lifecycle when #send returns.
   #
   # Can raise two kinds of exceptions depending on the error.
   # ContextError:: Raised when a socket operation is attempted on a terminated
@@ -262,8 +258,6 @@ module ZMQ
       # when the flag isn't set, do a normal error check
       # when set, check to see if the message was successfully queued
       queued = flags != NOBLOCK ? error_check(ZMQ_SEND_STR, result_code) : error_check_nonblock(result_code)
-    ensure
-      message.close
     end
 
     # true if sent, false if failed/EAGAIN
@@ -281,10 +275,24 @@ module ZMQ
   # SocketError:: See all of the possibilities in the docs for #SocketError.
   #
   def send_string message_string, flags = 0
-    message = Message.new
-    message.copy_in_string message_string
-    result = send message, flags
-    result
+    message = Message.new message_string
+    result_code = send_and_close message, flags
+
+    result_code
+  end
+  
+  # Sends a message. This will automatically close the +message+ for both successful
+  # and failed sends.
+  #
+  # Raises the same exceptions as Socket#send
+  #
+  def send_and_close message, flags = 0
+    begin
+      result_code = send message, flags
+    ensure
+      message.close
+    end
+    result_code
   end
 
   # Dequeues a message from the underlying queue. By default, this is a blocking operation.
@@ -404,6 +412,10 @@ module ZMQ
       option_value
     end
   end
+  
+  def release_cache
+    @sockopt_cache.clear
+  end
 
   # require a minimum of 0mq 2.1.0 to support socket finalizers; it contains important
   # fixes for sockets and threads so that a garbage collector thread can successfully

data/lib/ffi-rzmq/wrapper.rb

@@ -78,6 +78,9 @@ module LibZMQ
   attach_function :zmq_recv, [:pointer, :pointer, :int], :int
   attach_function :zmq_close, [:pointer], :int
 
+  #experimental zmq_devices support
+  attach_function :zmq_device, [:int, :pointer, :pointer], :int
+  
   # Poll api
   @blocking = true
   attach_function :zmq_poll, [:pointer, :int, :long], :int
@@ -117,4 +120,4 @@ module LibZMQ
     def to_s; inspect; end
   end # class PollItem
 
-end # module ZMQ
+end # module LibZMQ

data/lib/ffi-rzmq/zmq.rb

@@ -7,19 +7,19 @@ module ZMQ
   SUB = 2
   REQ = 3
   REP = 4
-  XREQ = 5
-  XREP = 6
+  ROUTER = XREQ = 5
+  DEALER = XREP = 6
   PULL = UPSTREAM = 7
   PUSH = DOWNSTREAM = 8
-  
+
   SocketTypeNameMap = {
     PAIR => "PAIR",
     PUB => "PUB",
     SUB => "SUB",
     REQ => "REQ",
     REP => "REP",
-    XREQ => "XREQ",
-    XREP => "XREP",
+    ROUTER => "ROUTER",
+    DEALER => "DEALER",
     PULL => "PULL",
     PUSH => "PUSH"
   }
@@ -63,6 +63,11 @@ module ZMQ
   ENODEV = Errno::ENODEV::Errno
   EFAULT = Errno::EFAULT::Errno
 
+  #  Device Types
+  STREAMER = 1
+  FORWARDER = 2
+  QUEUE = 3
+
   # ZMQ errors
   HAUSNUMERO     = 156384712
   EMTHREAD       = (HAUSNUMERO + 50)
@@ -114,7 +119,7 @@ module ZMQ
       LibZMQ.zmq_version major, minor, patch
       [major.read_int, minor.read_int, patch.read_int]
     end
-    
+
     # Compares the 0mq library API version to a minimal version tuple. Returns
     # true if it meets the minimum requirement, false otherwise.
     #
@@ -125,11 +130,11 @@ module ZMQ
     #
     def self.minimum_api? tuple
       api_version = Util.version
-      
+
       # call #to_i to convert nil entries to 0 so the comparison is valid
-      tuple[0].to_i >= api_version[0] &&
-      tuple[1].to_i >= api_version[1] &&
-      tuple[2].to_i >= api_version[2]
+      result = tuple[0].to_i <= api_version[0] &&
+      tuple[1].to_i <= api_version[1] &&
+      tuple[2].to_i <= api_version[2]
     end
 
 
@@ -180,7 +185,7 @@ module ZMQ
       when ZMQ_MSG_INIT_STR, ZMQ_MSG_INIT_DATA_STR, ZMQ_MSG_COPY_STR, ZMQ_MSG_MOVE_STR
         raise MessageError.new source, result_code, errno, error_string
       else
-        raise ZeroMQError.new source, result_code, -1, 
+        raise ZeroMQError.new source, result_code, -1,
         "Source [#{source}] does not match any zmq_* strings, rc [#{result_code}], errno [#{errno}], error_string [#{error_string}]"
       end
     end

data/spec/device_spec.rb

@@ -0,0 +1,68 @@
+
+require File.join(File.dirname(__FILE__), %w[spec_helper])
+
+module ZMQ
+  describe Device do
+    include APIHelper
+    
+    def create_streamer
+      @back_addr  = "tcp://127.0.0.1:#{random_port}"
+      @front_addr = "tcp://127.0.0.1:#{random_port}"
+      Thread.new do
+        back  = SPEC_CTX.socket(ZMQ::PULL)
+        back.bind(@back_addr)
+        front = SPEC_CTX.socket(ZMQ::PUSH)
+        front.bind(@front_addr)
+        Device.new(ZMQ::STREAMER, back, front)
+      end
+    end
+    
+    it "should create a streamer device without error given valid opts" do
+      create_streamer
+    end
+
+    it "should be able to send messages through the device" do
+      create_streamer
+      
+      pusher = SPEC_CTX.socket(ZMQ::PUSH)
+      pusher.connect(@back_addr)
+      puller = SPEC_CTX.socket(ZMQ::PULL)
+      puller.connect(@front_addr)
+      
+      pusher.send_string("hello")
+      sleep 0.5
+      res = puller.recv_string(ZMQ::NOBLOCK)
+      res.should == "hello"
+    end
+
+    it "should raise an ArgumentError when trying to pass non-socket objects into the device" do
+      lambda {
+        Device.new(ZMQ::STREAMER, 1,2)
+      }.should raise_exception(ArgumentError)
+    end
+
+    it "should be able to create a forwarder device without error" do
+      back_addr  = "tcp://127.0.0.1:#{random_port}"
+      front_addr = "tcp://127.0.0.1:#{random_port}"
+      Thread.new do
+        back  = SPEC_CTX.socket(ZMQ::SUB)
+        back.bind(back_addr)
+        front = SPEC_CTX.socket(ZMQ::PUB)
+        front.bind(front_addr)
+        Device.new(ZMQ::FORWARDER, back, front)
+      end
+    end
+     
+    it "should be able to create a queue device without error" do
+      back_addr  = "tcp://127.0.0.1:#{random_port}"
+      front_addr = "tcp://127.0.0.1:#{random_port}"
+      Thread.new do
+        back  = SPEC_CTX.socket(ZMQ::ROUTER)
+        back.bind(back_addr)
+        front = SPEC_CTX.socket(ZMQ::DEALER)
+        front.bind(front_addr)
+        Device.new(ZMQ::QUEUE, back, front)
+      end
+    end
+  end
+end

data/spec/socket_spec.rb

@@ -15,7 +15,7 @@ module ZMQ
         lambda { Socket.new(FFI::Pointer.new(0), ZMQ::REQ) }.should raise_exception(ZMQ::ContextError)
       end
 
-      [ZMQ::REQ, ZMQ::REP, ZMQ::XREQ, ZMQ::XREP, ZMQ::PUB, ZMQ::SUB, ZMQ::PUSH, ZMQ::PULL, ZMQ::PAIR].each do |socket_type|
+      [ZMQ::REQ, ZMQ::REP, ZMQ::DEALER, ZMQ::ROUTER, ZMQ::PUB, ZMQ::SUB, ZMQ::PUSH, ZMQ::PULL, ZMQ::PAIR].each do |socket_type|
 
         it "should not raise an error for a #{ZMQ::SocketTypeNameMap[socket_type]} socket type" do
           sock = nil
@@ -99,7 +99,7 @@ module ZMQ
     end # context identity=
 
 
-    [ZMQ::REQ, ZMQ::REP, ZMQ::XREQ, ZMQ::XREP, ZMQ::PUB, ZMQ::SUB, ZMQ::PUSH, ZMQ::PULL, ZMQ::PAIR].each do |socket_type|
+    [ZMQ::REQ, ZMQ::REP, ZMQ::DEALER, ZMQ::ROUTER, ZMQ::PUB, ZMQ::SUB, ZMQ::PUSH, ZMQ::PULL, ZMQ::PAIR].each do |socket_type|
 
       context "#setsockopt for a #{ZMQ::SocketTypeNameMap[socket_type]} socket" do
         before(:all) { @ctx = Context.new }

data/version.txt

@@ -1 +1 @@
-0.7.2
+0.8.0

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ffi-rzmq
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
+  hash: 63
+  prerelease: 
   segments: 
   - 0
-  - 7
-  - 2
-  version: 0.7.2
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Chuck Remes
@@ -39,13 +39,6 @@ description: |-
   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 them:
   MRI 1.9.x, Rubinius and JRuby.
-  
-  The impetus behind this library was to provide support for ZeroMQ in
-  JRuby which has native threads. Unlike MRI, IronRuby and
-  Rubinius which all have a GIL, JRuby allows for threaded access to ruby
-  code from outside extensions. ZeroMQ is heavily threaded, so until the
-  other runtimes remove their GIL, JRuby will likely be the best
-  environment to run this library.
 email: cremes@mac.com
 executables: []
 
@@ -75,6 +68,7 @@ files:
 - ffi-rzmq.gemspec
 - lib/ffi-rzmq.rb
 - lib/ffi-rzmq/context.rb
+- lib/ffi-rzmq/device.rb
 - lib/ffi-rzmq/exceptions.rb
 - lib/ffi-rzmq/message.rb
 - lib/ffi-rzmq/poll.rb
@@ -83,6 +77,7 @@ files:
 - lib/ffi-rzmq/wrapper.rb
 - lib/ffi-rzmq/zmq.rb
 - spec/context_spec.rb
+- spec/device_spec.rb
 - spec/message_spec.rb
 - spec/pushpull_spec.rb
 - spec/reqrep_spec.rb
@@ -120,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ffi-rzmq
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: This gem wraps the ZeroMQ networking library using the ruby FFI (foreign function interface).