ffi-rzmq 1.0.3 → 2.0.7

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.terminate_context(@context)
+        @context = nil
+        rc || 0
+      else
+        0
       end
     end
 
@@ -157,7 +129,7 @@ module ZMQ
     end
 
     def self.close context, pid
-      Proc.new { LibZMQ.zmq_term context if !context.null? && Process.pid == pid }
+      Proc.new { LibZMQ.zmq_ctx_term context if !context.null? && Process.pid == pid }
     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/poll_item.rb

@@ -1,5 +1,4 @@
 require 'forwardable'
-require 'io_extensions'
 
 module ZMQ
   class PollItem