rbczmq 0.8 → 0.9

data/.travis.yml

@@ -16,4 +16,5 @@ notifications:
     - lourens@methodmissing.com
 branches:
   only:
-    - master
+    - master
+    - 3.2

data/CHANGELOG.rdoc

@@ -1,5 +1,10 @@
 = Changelog
 
+== 0.9 (August 18, 2012)
+* Sockets now record and show all endpoints
+* Support connect_all for SRV managed topologies
+* Fix Rubinius specific compile errors
+
 == 0.8 (June 25, 2012)
 * Remove entries from the frames pointer map when managed frame objects are freed during GC
 * czmq's addstr and pushstr functions expect a format string, users of the library aren't (presently) expecting that (James Tucker)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rbczmq (0.7)
+    rbczmq (0.8)
 
 GEM
   remote: http://rubygems.org/

data/README.rdoc

@@ -222,6 +222,13 @@ Running tests
 
     rake test
 
+OS X notes:
+
+If you are installing the package on a new mack ensure you have libtool and autoconf isntalled.  
+You can get those with brew packaging system:
+
+    brew insatll libtool autoconf automake
+
 == TODO
 
 * ZMQ::Message#save && ZMQ::Message.load

data/ext/rbczmq/context.c

@@ -1,4 +1,4 @@
-#include <rbczmq_ext.h>
+#include "rbczmq_ext.h"
 
 static VALUE intern_zctx_process;
 
@@ -301,7 +301,7 @@ static VALUE rb_czmq_ctx_socket(VALUE obj, VALUE type)
     sock->ctx = ctx->ctx;
     sock->verbose = FALSE;
     sock->state = ZMQ_SOCKET_PENDING;
-    sock->endpoint = Qnil;
+    sock->endpoints = rb_ary_new();
     sock->thread = rb_thread_current();
     rb_obj_call_init(socket, 0, NULL);
     return socket;

data/ext/rbczmq/frame.c

@@ -1,4 +1,4 @@
-#include <rbczmq_ext.h>
+#include "rbczmq_ext.h"
 static VALUE intern_data;
 
 /*

data/ext/rbczmq/loop.c

@@ -1,4 +1,4 @@
-#include <rbczmq_ext.h>
+#include "rbczmq_ext.h"
 
 /*
  * :nodoc:

data/ext/rbczmq/message.c

@@ -1,4 +1,4 @@
-#include <rbczmq_ext.h>
+#include "rbczmq_ext.h"
 
 /*
  * :nodoc:

data/ext/rbczmq/poller.c

@@ -1,4 +1,4 @@
-#include <rbczmq_ext.h>
+#include "rbczmq_ext.h"
 
 /*
  * :nodoc:

data/ext/rbczmq/pollitem.c

@@ -1,4 +1,4 @@
-#include <rbczmq_ext.h>
+#include "rbczmq_ext.h"
 
 /*
  * :nodoc:

data/ext/rbczmq/rbczmq_ext.c

@@ -1,4 +1,4 @@
-#include <rbczmq_ext.h>
+#include "rbczmq_ext.h"
 
 VALUE rb_mZmq;
 VALUE rb_eZmqError;

data/ext/rbczmq/rbczmq_ext.h

@@ -14,7 +14,7 @@
 #define ZMQ_NOINLINE
 #endif
 
-#include <rbczmq_prelude.h>
+#include "rbczmq_prelude.h"
 
 #define ZmqRaiseSysError() { \
         printf("Sys error location: %s:%d\n", __FILE__,__LINE__); \
@@ -73,14 +73,14 @@ extern VALUE intern_readable;
 extern VALUE intern_writable;
 extern VALUE intern_error;
 
-#include <context.h>
-#include <socket.h>
-#include <frame.h>
-#include <message.h>
-#include <loop.h>
-#include <timer.h>
-#include <poller.h>
-#include <pollitem.h>
+#include "context.h"
+#include "socket.h"
+#include "frame.h"
+#include "message.h"
+#include "loop.h"
+#include "timer.h"
+#include "poller.h"
+#include "pollitem.h"
 
 static inline char *rb_czmq_formatted_current_time()
 {

data/ext/rbczmq/rbczmq_prelude.h

@@ -6,15 +6,15 @@
 #endif
 
 #ifdef RUBINIUS
-#include <rubinius.h>
+#include "rubinius.h"
 #else
 #ifdef JRUBY
-#include <jruby.h>
+#include "jruby.h"
 #else
 #ifdef HAVE_RB_THREAD_BLOCKING_REGION
-#include <ruby19.h>
+#include "ruby19.h"
 #else
-#include <ruby18.h>
+#include "ruby18.h"
 #endif
 #endif
 #endif

data/ext/rbczmq/socket.c

@@ -1,4 +1,4 @@
-#include <rbczmq_ext.h>
+#include "rbczmq_ext.h"
 
 /*
  * :nodoc:
@@ -40,7 +40,7 @@ void rb_czmq_mark_sock(void *ptr)
     if (sock){
         if (sock->verbose)
             zclock_log ("I: %s socket %p, context %p: GC mark", zsocket_type_str(sock->socket), sock, sock->ctx);
-        rb_gc_mark(sock->endpoint);
+        rb_gc_mark(sock->endpoints);
         rb_gc_mark(sock->thread);
     }
 }
@@ -96,24 +96,24 @@ static VALUE rb_czmq_socket_close(VALUE obj)
 
 /*
  *  call-seq:
- *     sock.endpoint   =>  String or nil
+ *     sock.endpoints   =>  Array of Strings
  *
- *  Returns the endpoint this socket is currently connected to, if any.
+ *  Returns the endpoints this socket is currently connected to, if any.
  *
  * === Examples
  *     ctx = ZMQ::Context.new
  *     sock = ctx.socket(:PUSH)
- *     sock.endpoint    =>   nil
+ *     sock.endpoints    =>   []
  *     sock.bind("inproc://test")
- *     sock.endpoint    =>  "inproc://test"
+ *     sock.endpoints    =>  ["inproc://test"]
  *
 */
 
-static VALUE rb_czmq_socket_endpoint(VALUE obj)
+static VALUE rb_czmq_socket_endpoints(VALUE obj)
 {
     zmq_sock_wrapper *sock = NULL;
     GetZmqSocket(obj);
-    return sock->endpoint;
+    return sock->endpoints;
 }
 
 /*
@@ -221,7 +221,7 @@ static VALUE rb_czmq_socket_bind(VALUE obj, VALUE endpoint)
     if (sock->verbose)
         zclock_log ("I: %s socket %p: bound \"%s\"", zsocket_type_str(sock->socket), obj, StringValueCStr(endpoint));
     sock->state = ZMQ_SOCKET_BOUND;
-    sock->endpoint = rb_str_new4(endpoint);
+    rb_ary_push(sock->endpoints, rb_str_new4(endpoint));
     return INT2NUM(rc);
 }
 
@@ -255,7 +255,7 @@ static VALUE rb_czmq_socket_connect(VALUE obj, VALUE endpoint)
     if (sock->verbose)
         zclock_log ("I: %s socket %p: connected \"%s\"", zsocket_type_str(sock->socket), obj, StringValueCStr(endpoint));
     sock->state = ZMQ_SOCKET_CONNECTED;
-    sock->endpoint = rb_str_new4(endpoint);
+    rb_ary_push(sock->endpoints, rb_str_new4(endpoint));
     return Qtrue;
 }
 
@@ -1503,7 +1503,7 @@ void _init_rb_czmq_socket()
     rb_define_const(rb_cZmqSocket, "CONNECTED", INT2NUM(ZMQ_SOCKET_CONNECTED));
 
     rb_define_method(rb_cZmqSocket, "close", rb_czmq_socket_close, 0);
-    rb_define_method(rb_cZmqSocket, "endpoint", rb_czmq_socket_endpoint, 0);
+    rb_define_method(rb_cZmqSocket, "endpoints", rb_czmq_socket_endpoints, 0);
     rb_define_method(rb_cZmqSocket, "state", rb_czmq_socket_state, 0);
     rb_define_method(rb_cZmqSocket, "real_bind", rb_czmq_socket_bind, 1);
     rb_define_method(rb_cZmqSocket, "real_connect", rb_czmq_socket_connect, 1);

data/ext/rbczmq/socket.h

@@ -20,7 +20,7 @@ typedef struct {
     zlist_t *frame_buffer;
     zlist_t *msg_buffer;
 #endif
-    VALUE endpoint;
+    VALUE endpoints;
     VALUE thread;
 } zmq_sock_wrapper;
 

data/ext/rbczmq/timer.c

@@ -1,4 +1,4 @@
-#include <rbczmq_ext.h>
+#include "rbczmq_ext.h"
 
 /*
  * :nodoc:

data/lib/zmq/socket.rb

@@ -24,6 +24,18 @@ class ZMQ::Socket
     end
   end
 
+
+  #  Returns the endpoint this socket is currently connected to, if any.
+  #
+  #     ctx = ZMQ::Context.new
+  #     sock = ctx.socket(:PUSH)
+  #     sock.endpoint    =>   nil
+  #     sock.bind("inproc://test")
+  #     sock.endpoint    =>  "inproc://test"
+  def endpoint
+    endpoints.first
+  end
+
   # Determines if there are one or more messages to read from this socket. Should be used in conjunction with the
   # ZMQ_FD socket option for edge-triggered notifications.
   #
@@ -59,9 +71,9 @@ class ZMQ::Socket
   def to_s
     case state
     when BOUND
-      "#{type_str} socket bound to #{endpoint}"
+      "#{type_str} socket bound to #{endpoints.join(', ')}"
     when CONNECTED
-      "#{type_str} socket connected to #{endpoint}"
+      "#{type_str} socket connected to #{endpoints.join(', ')}"
     else
       "#{type_str} socket"
     end
@@ -101,15 +113,35 @@ class ZMQ::Socket
     real_connect(uri)
   end
 
+  # Connects to all endpoints that are returned from a SRV record lookup.
+  #
+  # socket = ctx.socket(:PUB)
+  #
+  # socket.connect "collector.domain.com" # resolves 10.0.0.2:9000 10.0.0.3:9000
+  #
+  def connect_all(uri)
+    if uri =~ PROTO_REXP
+      real_connect(uri)
+      return
+    end
+
+    addresses = resolve_all(uri)
+    if addresses.empty?
+      real_connect(uri)
+    else
+      addresses.each do |address|
+        host = Resolv.getaddress(address.target.to_s)
+        real_connect("tcp://#{host}:#{address.port}")
+      end
+    end
+    self
+  end
+
   private
   # Attempt to resolve DNS SRV records ( http://en.wikipedia.org/wiki/SRV_record ). Respects priority and weight
   # to provide a combination of load balancing and backup.
   def resolve(uri)
-    parts = uri.split('.')
-    service = parts.shift
-    domain = parts.join(".")
-    # ZeroMQ does not yet support udp, but may look into possibly supporting [e]pgm here
-    resources = ZMQ.resolver.getresources("_#{service}._tcp.#{domain}", Resolv::DNS::Resource::IN::SRV)
+    resources = resolve_all(uri)
     # lowest-numbered priority value is preferred
     resources.sort!{|a,b| a.priority <=> b.priority }
     res = resources.first
@@ -120,10 +152,18 @@ class ZMQ::Socket
       res = priority_peers.sort{|a,b| a.weight <=> b.weight }.last
     end
     return uri unless res
+    # ZeroMQ does not yet support udp, but may look into possibly supporting [e]pgm here
     "tcp://#{Resolv.getaddress(res.target.to_s)}:#{res.port}"
   rescue
     uri
   end
+
+  def resolve_all(uri)
+    parts = uri.split('.')
+    service = parts.shift
+    domain = parts.join(".")
+    ZMQ.resolver.getresources("_#{service}._tcp.#{domain}", Resolv::DNS::Resource::IN::SRV)
+  end
 end
 
 module ZMQ::DownstreamSocket

data/lib/zmq/version.rb

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

data/test/test_socket.rb

@@ -131,6 +131,21 @@ class TestZmqSocket < ZmqTestCase
     ctx.destroy
   end
 
+  def test_connect_all
+    ctx = ZMQ::Context.new
+    rep = ctx.socket(:PAIR)
+    port = rep.bind("inproc://test.socket-connect")
+    req = ctx.socket(:PAIR)
+    assert(req.state & ZMQ::Socket::PENDING)
+    req.connect_all("inproc://test.socket-connect")
+    assert req.fd != -1
+    assert(req.state & ZMQ::Socket::CONNECTED)
+
+    # TODO - test SRV lookups - insufficient infrastructure for resolver tests
+  ensure
+    ctx.destroy
+  end
+
   def test_bind_connect_errors
     ctx = ZMQ::Context.new
     req = ctx.socket(:REQ)
@@ -156,6 +171,12 @@ class TestZmqSocket < ZmqTestCase
     assert_equal "PAIR socket", sock.to_s
     assert_equal "REP socket bound to tcp://127.0.0.1:*", rep.to_s
     assert_equal "REQ socket connected to tcp://127.0.0.1:#{port}", req.to_s
+
+
+    port2 = rep.bind("tcp://127.0.0.1:*")
+    req.connect("tcp://127.0.0.1:#{port2}")
+    assert_equal "REP socket bound to tcp://127.0.0.1:*, tcp://127.0.0.1:*", rep.to_s
+    assert_equal "REQ socket connected to tcp://127.0.0.1:#{port}, tcp://127.0.0.1:#{port2}", req.to_s
   ensure
     ctx.destroy
   end
@@ -172,6 +193,23 @@ class TestZmqSocket < ZmqTestCase
     ctx.destroy
   end
 
+  def test_endpoints
+    ctx = ZMQ::Context.new
+    rep = ctx.socket(:REP)
+    port = rep.bind("tcp://127.0.0.1:*")
+    req = ctx.socket(:REQ)
+    req.connect("tcp://127.0.0.1:#{port}")
+    assert_equal ["tcp://127.0.0.1:*"], rep.endpoints
+    assert_equal ["tcp://127.0.0.1:#{port}"], req.endpoints
+
+    port2 = rep.bind("tcp://127.0.0.1:*")
+    req.connect("tcp://127.0.0.1:#{port2}")
+    assert_equal ["tcp://127.0.0.1:*", "tcp://127.0.0.1:*"], rep.endpoints
+    assert_equal ["tcp://127.0.0.1:#{port}", "tcp://127.0.0.1:#{port2}"], req.endpoints
+  ensure
+    ctx.destroy
+  end
+
   def test_close
     ctx = ZMQ::Context.new
     sock = ctx.socket(:REP)
@@ -451,4 +489,4 @@ class TestZmqSocket < ZmqTestCase
   ensure
     ctx.destroy
   end
-end
+end

data/test/test_zmq.rb

@@ -8,7 +8,9 @@ class TestZmq < ZmqTestCase
   end
 
   def test_version
-    assert_equal [2,2,1], ZMQ.version
+    version = ZMQ.version
+    assert_instance_of Array, version
+    assert version.all?{|v| Fixnum === v }
   end
 
   def test_now

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rbczmq
 version: !ruby/object:Gem::Version 
-  hash: 3451978084848223320
+  hash: 25
   prerelease: 
   segments: 
   - 0
-  - 8
-  version: "0.8"
+  - 9
+  version: "0.9"
 platform: ruby
 authors: 
 - "Lourens Naud\xC3\xA9"
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-25 00:00:00 +01:00
-default_executable: 
+date: 2012-08-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake-compiler
@@ -26,7 +25,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 289844351982071926
+        hash: 63
         segments: 
         - 0
         - 8
@@ -146,7 +145,6 @@ files:
 - test/test_threading.rb
 - test/test_timer.rb
 - test/test_zmq.rb
-has_rdoc: true
 homepage: http://github.com/methodmissing/rbczmq
 licenses: []
 
@@ -160,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2002549777813010636
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -169,14 +167,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2002549777813010636
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: "Ruby extension for CZMQ - High-level C Binding for \xC3\x98MQ (http://czmq.zeromq.org)"
@@ -207,3 +205,4 @@ test_files:
 - test/test_threading.rb
 - test/test_timer.rb
 - test/test_zmq.rb
+has_rdoc: true