lib/zmachine/zmq_channel.rb in zmachine-0.4.0 vs lib/zmachine/zmq_channel.rb in zmachine-0.4.1

@@ -1,10 +1,5 @@
-require 'zmachine/jeromq-0.3.2-SNAPSHOT.jar'
-java_import org.zeromq.ZMsg
-java_import org.zeromq.ZMQ
-java_import org.zeromq.ZMQException
-
 require 'zmachine'
 require 'zmachine/channel'
 
 class ZMQ
   class Socket
@@ -40,11 +35,11 @@
 
     def bind(address, type)
       ZMachine.logger.debug("zmachine:zmq_channel:#{__method__}", channel: self) if ZMachine.debug
       @bound = true
       @connected = true
-      @socket = ZMachine.context.create_socket(type)
+      @socket = ZContext.create_socket(type)
       @socket.bind(address)
     end
 
     def bound?
       @bound
@@ -56,11 +51,11 @@
     end
 
     def connect(address, type)
       ZMachine.logger.debug("zmachine:zmq_channel:#{__method__}", channel: self) if ZMachine.debug
       @connection_pending = true
-      @socket = ZMachine.context.create_socket(type)
+      @socket = ZContext.create_socket(type)
       @socket.connect(address)
     end
 
     def connection_pending?
       @connection_pending
@@ -82,37 +77,15 @@
       data = ZMsg.recv_msg(@socket)
       data = String.from_java_bytes(data.first.data) unless @raw
       data
     end
 
-    def send1(a)
-      @socket.send_byte_array(a, ZMQ::DONTWAIT)
-    end
-
-    def send2(a, b)
-      @socket.send_byte_array(a, ZMQ::SNDMORE | ZMQ::DONTWAIT) and
-      @socket.send_byte_array(b, ZMQ::DONTWAIT)
-    end
-
-    def send3(a, b, c)
-      @socket.send_byte_array(a, ZMQ::SNDMORE | ZMQ::DONTWAIT) and
-      @socket.send_byte_array(b, ZMQ::SNDMORE | ZMQ::DONTWAIT) and
-      @socket.send_byte_array(c, ZMQ::DONTWAIT)
-    end
-
-    def send4(a, b, c, d)
-      @socket.send_byte_array(a, ZMQ::SNDMORE | ZMQ::DONTWAIT) and
-      @socket.send_byte_array(b, ZMQ::SNDMORE | ZMQ::DONTWAIT) and
-      @socket.send_byte_array(c, ZMQ::SNDMORE | ZMQ::DONTWAIT) and
-      @socket.send_byte_array(d, ZMQ::DONTWAIT)
-    end
-
     def close!
       ZMachine.logger.debug("zmachine:zmq_channel:#{__method__}", channel: self) if ZMachine.debug
       @closed = true
       @connected = false
       @bound = false
-      ZMachine.context.destroySocket(@socket)
+      ZContext.destroy_socket(@socket)
     end
 
     def closed?
       @closed
     end