rbczmq 1.6 → 1.6.2

data/ext/rbczmq/socket.h

@@ -8,6 +8,7 @@
 #define ZMQ_SOCKET_PENDING 0x01
 #define ZMQ_SOCKET_BOUND 0x02
 #define ZMQ_SOCKET_CONNECTED 0x04
+#define ZMQ_SOCKET_DISCONNECTED 0x08
 
 typedef struct {
     zctx_t *ctx;
@@ -15,11 +16,6 @@ typedef struct {
     int flags;
     bool verbose;
     int state;
-#ifndef HAVE_RB_THREAD_BLOCKING_REGION
-    zlist_t *str_buffer;
-    zlist_t *frame_buffer;
-    zlist_t *msg_buffer;
-#endif
     VALUE endpoints;
     VALUE thread;
     VALUE context;
@@ -126,6 +122,11 @@ struct nogvl_recv_args {
     zmq_sock_wrapper *socket;
 };
 
+struct nogvl_socket_poll_args {
+    zmq_sock_wrapper *socket;
+    int timeout;
+};
+
 struct nogvl_monitor_recv_args {
     void *socket;
     zmq_msg_t msg;

data/lib/zmq.rb

@@ -13,20 +13,6 @@ require 'zmq/version' unless defined? ZMQ::VERSION
 require 'socket'
 
 module ZMQ
-  def self.version3?
-    version[0] == 3
-  end
-
-  def self.stable_version?
-    version[0] == 3 &&
-    version[1] == 2 &&
-    version[2] == 2
-  end
-
-  def self.version2?
-    !version3?
-  end
-
   # Sugaring for creating new ZMQ frames
   #
   # ZMQ::Frame("frame")  =>  ZMQ::Frame

data/lib/zmq/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module ZMQ
-  VERSION = "1.6"
+  VERSION = "1.6.2"
 end

data/rbczmq.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version = ZMQ::VERSION
   s.summary = "Ruby extension for CZMQ - High-level C Binding for ØMQ (http://czmq.zeromq.org)"
   s.description = "Ruby extension for CZMQ - High-level C Binding for ØMQ (http://czmq.zeromq.org)"
-  s.authors = ["Lourens Naudé", "James Tucker"]
+  s.authors = ["Lourens Naudé", "James Tucker", "Matt Connolly"]
   s.email = ["lourens@methodmissing.com", "jftucker@gmail.com"]
   s.homepage = "http://github.com/methodmissing/rbczmq"
   s.date = Time.now.utc.strftime('%Y-%m-%d')

data/test/test_beacon.rb

@@ -0,0 +1,92 @@
+# encoding: utf-8
+
+require File.join(File.dirname(__FILE__), 'helper')
+
+class TestZmqBeacon < ZmqTestCase
+  def test_beacon
+    beacon = ZMQ::Beacon.new(80000)
+    assert_instance_of ZMQ::Beacon, beacon
+    assert_nil beacon.destroy
+    assert_raises TypeError do
+      ZMQ::Beacon.new(:invalid)
+    end
+  ensure
+    beacon.destroy
+  end
+
+  def test_hostname
+    beacon = ZMQ::Beacon.new(80000)
+    assert_instance_of String, beacon.hostname
+  ensure
+    beacon.destroy
+  end
+
+  def test_set_interval
+    beacon = ZMQ::Beacon.new(80000)
+    beacon.interval = 100
+    assert_raises TypeError do
+      beacon.interval = :invalid
+    end
+  ensure
+    beacon.destroy
+  end
+
+  def test_noecho
+    beacon = ZMQ::Beacon.new(80000)
+    assert_nil beacon.noecho
+  ensure
+    beacon.destroy
+  end
+
+  def test_publish
+    beacon = ZMQ::Beacon.new(80000)
+    assert_raises TypeError do
+      beacon.publish :invalid
+    end
+    assert_nil beacon.publish("test")
+    assert_nil beacon.silence
+  ensure
+    beacon.destroy
+  end
+
+  def test_subscribe
+    beacon = ZMQ::Beacon.new(80000)
+    assert_raises TypeError do
+      beacon.subscribe :invalid
+    end
+    assert_nil beacon.subscribe("test")
+    assert_nil beacon.unsubscribe
+  ensure
+    beacon.destroy
+  end
+
+  def test_pipe
+    beacon = ZMQ::Beacon.new(80000)
+    assert_instance_of ZMQ::Socket::Pair, beacon.pipe
+    GC.start # check GC cycle with "detached" socket
+  ensure
+    beacon.destroy
+  end
+
+  def test_announce_lookup
+    ctx = ZMQ::Context.new
+    address = "tcp://127.0.0.1:90000"
+    rep = ctx.bind(:REP, address)
+    service_beacon = ZMQ::Beacon.new(80000)
+    service_beacon.publish(address)
+    sleep(0.5)
+    client_beacon = ZMQ::Beacon.new(80000)
+    client_beacon.subscribe("tcp")
+    client_beacon.pipe.rcvtimeo = 1000
+    sender_address = client_beacon.pipe.recv
+    client_address = client_beacon.pipe.recv
+    assert_equal address, client_address
+    req = ctx.connect(:REQ, client_address)
+    req.send "ping"
+    assert_equal "ping", rep.recv
+  ensure
+    ctx.destroy
+    service_beacon.destroy
+    client_beacon.destroy
+  end
+end

data/test/test_context.rb

@@ -59,21 +59,6 @@ class TestZmqContext < ZmqTestCase
     ctx.destroy
   end
 
-  def test_hwm
-    ctx = ZMQ::Context.new
-    assert_raises TypeError do
-      ctx.hwm = :invalid
-    end
-    ctx.hwm = 10
-    assert_raises ZMQ::Error do
-      ctx.hwm = -2
-    end
-    # deprecated method
-    assert_equal 0, ctx.hwm
-  ensure
-    ctx.destroy
-  end
-
   def test_bind_connect
     ctx = ZMQ::Context.new
     rep = ctx.bind(:REP, "inproc://test.bind_connect")

data/test/test_loop.rb

@@ -175,7 +175,7 @@ class TestZmqLoop < ZmqTestCase
 
   def test_register_ruby_sockets
     server = TCPServer.new("127.0.0.1", 0)
-    f, port, host, addr = server.addr
+    port = server.addr[1]
     client = TCPSocket.new("127.0.0.1", port)
     s = server.accept
     ret = ZMQ::Loop.run do

data/test/test_monitoring.rb

@@ -2,8 +2,6 @@
 
 require File.join(File.dirname(__FILE__), 'helper')
 
-if ZMQ.stable_version?
-
 class TestMonitor
   attr_reader :listening, :closed
 
@@ -43,5 +41,3 @@ class TestZmqMonitoring < ZmqTestCase
     ctx.destroy
   end
 end
-
-end

data/test/test_poller.rb

@@ -71,7 +71,7 @@ class TestZmqPoller < ZmqTestCase
   def test_poll_ruby_sockets
     poller = ZMQ::Poller.new
     server = TCPServer.new("127.0.0.1", 0)
-    f, port, host, addr = server.addr
+    port = server.addr[1]
     client = TCPSocket.new("127.0.0.1", port)
     s = server.accept
 

data/test/test_socket.rb

@@ -15,14 +15,24 @@ class TestZmqSocket < ZmqTestCase
     ctx.destroy
   end
 
-  def test_send_timeout
+  def test_disconnect
     ctx = ZMQ::Context.new
     rep = ctx.socket(:REP)
-    if ZMQ.version3?
-      rep.sndhwm = 1
-    else
-      rep.hwm = 1
+    endpoint = "inproc://test.socket-send-timeout"
+    rep.bind(endpoint)
+    req = ctx.connect(:REQ, endpoint)
+    assert req.disconnect(endpoint)
+    assert_raises Errno::EINVAL do
+      req.disconnect "invalid"
     end
+  ensure
+    ctx.destroy
+  end
+
+  def test_send_timeout
+    ctx = ZMQ::Context.new
+    rep = ctx.socket(:REP)
+    rep.sndhwm = 1
     rep.bind("inproc://test.socket-send-timeout")
     req = ctx.connect(:REQ, "inproc://test.socket-send-timeout")
     # Cannot test much other than normal transfer's not disrupted
@@ -125,7 +135,7 @@ class TestZmqSocket < ZmqTestCase
   def test_connect
     ctx = ZMQ::Context.new
     rep = ctx.socket(:PAIR)
-    port = rep.bind("inproc://test.socket-connect")
+    rep.bind("inproc://test.socket-connect")
     req = ctx.socket(:PAIR)
     assert(req.state & ZMQ::Socket::PENDING)
     req.connect("inproc://test.socket-connect")
@@ -138,7 +148,7 @@ class TestZmqSocket < ZmqTestCase
   def test_connect_all
     ctx = ZMQ::Context.new
     rep = ctx.socket(:PAIR)
-    port = rep.bind("inproc://test.socket-connect")
+    rep.bind("inproc://test.socket-connect")
     req = ctx.socket(:PAIR)
     assert(req.state & ZMQ::Socket::PENDING)
     req.connect_all("inproc://test.socket-connect")
@@ -381,6 +391,19 @@ class TestZmqSocket < ZmqTestCase
     ctx.destroy
   end
 
+  def test_poll
+    ctx = ZMQ::Context.new
+    rep = ctx.socket(:PAIR)
+    rep.bind("inproc://test.socket-poll")
+    assert !rep.poll(100)
+    req = ctx.socket(:PAIR)
+    req.connect("inproc://test.socket-poll")
+    req.send("test")
+    assert rep.poll(100)
+  ensure
+    ctx.destroy
+  end
+
   def test_send_receive_message
     ctx = ZMQ::Context.new
     rep = ctx.socket(:PAIR)
@@ -415,57 +438,44 @@ class TestZmqSocket < ZmqTestCase
     sock = ctx.socket(:ROUTER)
     sock.verbose = true
 
-    if ZMQ.version3?
-      assert_equal 1000, sock.sndhwm
-      sock.sndhwm = 10000
-      assert_equal 10000, sock.sndhwm      
-
-      assert_equal 1000, sock.rcvhwm
-      sock.rcvhwm = 10000
-      assert_equal 10000, sock.rcvhwm
-    else
-      assert_equal 0, sock.hwm
-      sock.hwm = 1000
-      assert_equal 1000, sock.hwm
-
-      assert_equal 0, sock.swap
-      sock.swap = 1000
-      assert_equal 1000, sock.swap
+    assert_equal 1000, sock.sndhwm
+    sock.sndhwm = 10000
+    assert_equal 10000, sock.sndhwm      
 
-      assert_equal(-1, sock.recovery_ivl_msec)
-      sock.recovery_ivl_msec = 20
-      assert_equal 20, sock.recovery_ivl_msec
-    end
+    assert_equal 1000, sock.rcvhwm
+    sock.rcvhwm = 10000
+    assert_equal 10000, sock.rcvhwm
 
     assert_equal 0, sock.affinity
     sock.affinity = 1
     assert_equal 1, sock.affinity
 
-    if ZMQ.version3?
-      assert_equal 100, sock.rate
-      sock.rate = 50000
-      assert_equal 50000, sock.rate
-    else
-      assert_equal 40000, sock.rate
-      sock.rate = 50000
-      assert_equal 50000, sock.rate
-    end
+    assert_equal 100, sock.rate
+    sock.rate = 50000
+    assert_equal 50000, sock.rate
 
-    if ZMQ.version3?
-      assert_equal 10000, sock.recovery_ivl
-      sock.recovery_ivl = 20
-      assert_equal 20, sock.recovery_ivl
-    else
-      assert_equal 10, sock.recovery_ivl
-      sock.recovery_ivl = 20
-      assert_equal 20, sock.recovery_ivl
-    end
+    assert_equal 10000, sock.recovery_ivl
+    sock.recovery_ivl = 20
+    assert_equal 20, sock.recovery_ivl
 
-    if ZMQ.version2?
-      assert_equal true, sock.mcast_loop?
-      sock.mcast_loop = false
-      assert !sock.mcast_loop?
-    end
+    assert_equal(-1, sock.maxmsgsize)
+    sock.maxmsgsize = 20
+    assert_equal 20, sock.maxmsgsize
+
+    assert_equal 1, sock.multicast_hops
+    sock.multicast_hops = 20
+    assert_equal 20, sock.multicast_hops
+
+    assert sock.ipv4only?
+    sock.ipv4only = false
+    assert !sock.ipv4only?
+
+    sock.delay_attach_on_connect = true
+    sock.router_mandatory = true
+    sock.router_raw = true
+
+    xpub = ctx.socket(:XPUB)
+    xpub.xpub_verbose = true
 
     assert_equal 0, sock.sndbuf
     sock.sndbuf = 1000
@@ -491,11 +501,11 @@ class TestZmqSocket < ZmqTestCase
     sock.reconnect_ivl_max = 5
     assert_equal 5, sock.reconnect_ivl_max
 
-    assert_equal -1, sock.rcvtimeo
+    assert_equal(-1, sock.rcvtimeo)
     sock.rcvtimeo = 200
     assert_equal 200, sock.rcvtimeo
 
-    assert_equal -1, sock.sndtimeo
+    assert_equal(-1, sock.sndtimeo)
     sock.sndtimeo = 200
     assert_equal 200, sock.sndtimeo
 

metadata

@@ -1,21 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: rbczmq
 version: !ruby/object:Gem::Version
-  version: '1.6'
-  prerelease: 
+  version: 1.6.2
 platform: ruby
 authors:
 - Lourens Naudé
 - James Tucker
+- Matt Connolly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-02 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -23,7 +22,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -50,7 +48,9 @@ files:
 - examples/pub_sub.rb
 - examples/push_pull.rb
 - examples/req_rep.rb
-- ext/czmq-1.4.0.tar.gz
+- ext/czmq-1.4.1.tar.gz
+- ext/rbczmq/beacon.c
+- ext/rbczmq/beacon.h
 - ext/rbczmq/context.c
 - ext/rbczmq/context.h
 - ext/rbczmq/extconf.rb
@@ -128,6 +128,7 @@ files:
 - test/socket/test_router_socket.rb
 - test/socket/test_routing.rb
 - test/socket/test_sub_socket.rb
+- test/test_beacon.rb
 - test/test_context.rb
 - test/test_frame.rb
 - test/test_handler.rb
@@ -142,28 +143,27 @@ files:
 - test/test_zmq.rb
 homepage: http://github.com/methodmissing/rbczmq
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby extension for CZMQ - High-level C Binding for ØMQ (http://czmq.zeromq.org)
 test_files:
 - test/helper.rb
@@ -181,6 +181,7 @@ test_files:
 - test/socket/test_router_socket.rb
 - test/socket/test_routing.rb
 - test/socket/test_sub_socket.rb
+- test/test_beacon.rb
 - test/test_context.rb
 - test/test_frame.rb
 - test/test_handler.rb
@@ -193,4 +194,3 @@ test_files:
 - test/test_threading.rb
 - test/test_timer.rb
 - test/test_zmq.rb
-has_rdoc: true