rbczmq 0.3 → 0.4

data/ext/rbczmq/socket.c

@@ -175,11 +175,7 @@ VALUE rb_czmq_nogvl_socket_bind(void *ptr)
     struct nogvl_conn_args *args = ptr;
     errno = 0;
     zmq_sock_wrapper *socket = args->socket;
-#ifdef HAVE_RB_THREAD_BLOCKING_REGION
-    rc = zsocket_bind(socket->socket, args->endpoint);
-#else
     rc = zsocket_bind(socket->socket, args->endpoint);
-#endif
     return (VALUE)rc;
 }
 
@@ -194,11 +190,7 @@ VALUE rb_czmq_nogvl_socket_connect(void *ptr)
     struct nogvl_conn_args *args = ptr;
     errno = 0;
     zmq_sock_wrapper *socket = args->socket;
-#ifdef HAVE_RB_THREAD_BLOCKING_REGION
-    rc = zsocket_connect(socket->socket, args->endpoint);
-#else
     rc = zsocket_connect(socket->socket, args->endpoint);
-#endif
     return (VALUE)rc;
 }
 
@@ -1595,8 +1587,8 @@ void _init_rb_czmq_socket()
     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, "state", rb_czmq_socket_state, 0);
-    rb_define_method(rb_cZmqSocket, "bind", rb_czmq_socket_bind, 1);
-    rb_define_method(rb_cZmqSocket, "connect", rb_czmq_socket_connect, 1);
+    rb_define_method(rb_cZmqSocket, "real_bind", rb_czmq_socket_bind, 1);
+    rb_define_method(rb_cZmqSocket, "real_connect", rb_czmq_socket_connect, 1);
     rb_define_method(rb_cZmqSocket, "fd", rb_czmq_socket_fd, 0);
     rb_define_alias(rb_cZmqSocket, "to_i", "fd");
     rb_define_method(rb_cZmqSocket, "verbose=", rb_czmq_socket_set_verbose, 1);

data/lib/zmq.rb

@@ -63,6 +63,13 @@ module ZMQ
     [poller.readables, poller.writables, []] if ready
   end
 
+  def self.resolver
+    @resolver ||= begin
+      require 'resolv'
+      Resolv::DNS.new
+    end
+  end
+
   autoload :Handler, 'zmq/handler'
   autoload :DefaultHandler, 'zmq/default_handler'
 end

data/lib/zmq/socket.rb

@@ -1,6 +1,8 @@
 # encoding: utf-8
 
 class ZMQ::Socket
+  PROTO_REXP = /^inproc|ipc|tcp|e?pgm:\/\//
+
   def self.unsupported_api(*methods)
     methods.each do |m|
       class_eval <<-"evl", __FILE__, __LINE__
@@ -74,6 +76,54 @@ class ZMQ::Socket
   def poll_writable?
     true
   end
+
+  # Binds to a given endpoint. Attemps to resolve URIs without a protocol through DNS SRV records.
+  #
+  # socket = ctx.socket(:PUB)
+  # socket.bind "tcp://127.0.0.1:9000"
+  #
+  # socket.bind "collector.domain.com" # resolves 10.0.0.2:9000
+  #
+  def bind(uri)
+    uri = resolve(uri) if uri && uri !~ PROTO_REXP
+    real_bind(uri)
+  end
+
+  # Connects to a given endpoint. Attemps to resolve URIs without a protocol through DNS SRV records.
+  #
+  # socket = ctx.socket(:PUB)
+  # socket.connect "tcp://127.0.0.1:9000"
+  #
+  # socket.connect "collector.domain.com" # resolves 10.0.0.2:9000
+  #
+  def connect(uri)
+    uri = resolve(uri) if uri && uri !~ PROTO_REXP
+    real_connect(uri)
+  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)
+    # lowest-numbered priority value is preferred
+    resources.sort!{|a,b| a.priority <=> b.priority }
+    res = resources.first
+    # detetermine if we should filter by weight as well (multiple records with equal priority)
+    priority_peers = resources.select{|r| res.priority == r.priority }
+    if priority_peers.size > 1
+      # highest weight preferred
+      res = priority_peers.sort{|a,b| a.weight <=> b.weight }.last
+    end
+    return uri unless res
+    "tcp://#{res.target}:#{res.port}"
+  rescue
+    uri
+  end
 end
 
 module ZMQ::DownstreamSocket

data/lib/zmq/version.rb

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

data/test/test_socket.rb

@@ -121,6 +121,20 @@ class TestZmqSocket < ZmqTestCase
     ctx.destroy
   end
 
+  def test_bind_connect_errors
+    ctx = ZMQ::Context.new
+    req = ctx.socket(:REQ)
+    rep = ctx.socket(:REP)
+    assert_raises Errno::EINVAL do
+      rep.bind "bad uri"
+    end
+    assert_raises Errno::EINVAL do
+      req.connect "bad uri"
+    end
+  ensure
+    ctx.destroy
+  end
+
   def test_to_s
     ctx = ZMQ::Context.new
     sock = ctx.socket(:PAIR)

data/test/test_zmq.rb

@@ -59,4 +59,9 @@ class TestZmq < ZmqTestCase
     assert_equal STDOUT, item.pollable
     assert_equal ZMQ::POLLIN, item.events
   end
+
+  def test_resolver
+    require 'resolv'
+    assert_instance_of Resolv::DNS, ZMQ.resolver
+  end
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rbczmq
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: 
   segments: 
   - 0
-  - 3
-  version: "0.3"
+  - 4
+  version: "0.4"
 platform: ruby
 authors: 
 - "Lourens Naud\xC3\xA9"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-18 00:00:00 Z
+date: 2012-04-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake-compiler
@@ -173,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: "Ruby extension for CZMQ - High-level C Binding for \xC3\x98MQ (http://czmq.zeromq.org)"