rbczmq 1.4 → 1.5

data/.travis.yml

@@ -8,7 +8,6 @@ rvm:
   - 1.9.3
   - ruby-head
 script: "bundle exec rake"
-before_install: "sudo apt-get install uuid-dev"
 gemfile:
   - Gemfile
 notifications:
@@ -17,4 +16,3 @@ notifications:
 branches:
   only:
     - master
-    - 3.2

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = Changelog
 
+== 1.5 (April 29, 2013)
+* Add support for XSUB and XPUB socket types (Matt Connolly)
+* Introduce a ZMQ.proxy API (Matt Connolly)
+
 == 1.4 (April 27, 2013)
 * Ships with release libzmq and czmq tarballs - removes autotools dependency (James Tucker)
 

data/Gemfile

@@ -1,5 +1,6 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec
 
-gem 'rake'
+gem 'rake'
+gem 'rdoc'

data/Gemfile.lock

@@ -1,14 +1,17 @@
 PATH
   remote: .
   specs:
-    rbczmq (1.3)
+    rbczmq (1.4)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
+    json (1.7.7)
     rake (10.0.4)
     rake-compiler (0.8.3)
       rake
+    rdoc (4.0.1)
+      json (~> 1.4)
 
 PLATFORMS
   ruby
@@ -17,3 +20,4 @@ DEPENDENCIES
   rake
   rake-compiler (~> 0.8.0)
   rbczmq!
+  rdoc

data/Rakefile

@@ -8,11 +8,7 @@ ENV["RBXOPT"] = "-Xrbc.db"
 
 require 'rake/extensiontask'
 require 'rake/testtask'
-begin
 require 'rdoc/task'
-rescue LoadError # fallback to older 1.8.7 rubies
-require 'rake/rdoctask'
-end
 
 gemspec = eval(IO.read('rbczmq.gemspec'))
 

data/ext/rbczmq/context.c

@@ -257,6 +257,10 @@ static inline VALUE rb_czmq_ctx_socket_klass(int socket_type)
                          break;
         case ZMQ_DEALER: return rb_cZmqDealerSocket;
                          break;
+        case ZMQ_XPUB: return rb_cZmqXPubSocket;
+                      break;
+        case ZMQ_XSUB: return rb_cZmqXSubSocket;
+                      break;
         default: rb_raise(rb_eZmqError, "ZMQ socket type %d not supported!", socket_type);
                  break;
     }

data/ext/rbczmq/pollitem.c

@@ -68,12 +68,11 @@ static VALUE rb_czmq_pollitem_s_new(int argc, VALUE *argv, VALUE obj)
     if (!(evts & ZMQ_POLLIN) && !(evts & ZMQ_POLLOUT))
         rb_raise(rb_eZmqError, "invalid socket event: Only ZMQ::POLLIN and ZMQ::POLLOUT events are supported!");
 
-    /* XXX: Cleanup allocated struct on any failures below */
     obj = Data_Make_Struct(rb_cZmqPollitem, zmq_pollitem_wrapper, rb_czmq_mark_pollitem, rb_czmq_free_pollitem_gc, pollitem);
     pollitem->events = events;
     pollitem->handler = Qnil;
     pollitem->item = ALLOC(zmq_pollitem_t);
-    if (!pollitem->item) rb_memerror();
+    ZmqAssertObjOnAlloc(pollitem->item, pollitem);
     pollitem->item->events = evts;
     if (rb_obj_is_kind_of(pollable, rb_cZmqSocket)) {
        GetZmqSocket(pollable);

data/ext/rbczmq/rbczmq_ext.c

@@ -14,6 +14,8 @@ VALUE rb_cZmqDealerSocket;
 VALUE rb_cZmqRepSocket;
 VALUE rb_cZmqReqSocket;
 VALUE rb_cZmqPairSocket;
+VALUE rb_cZmqXPubSocket;
+VALUE rb_cZmqXSubSocket;
 
 VALUE rb_cZmqFrame;
 VALUE rb_cZmqMessage;
@@ -153,6 +155,66 @@ static VALUE rb_czmq_m_interrupted_bang(ZMQ_UNUSED VALUE obj)
     return Qnil;
 }
 
+/*
+ * :nodoc:
+ *  Runs the ZeroMQ proxy with the GVL released.
+ *
+*/
+static VALUE rb_czmq_m_proxy_nogvl(void* args)
+{
+	void** sockets = (void**)args;
+	return (VALUE)zmq_proxy(sockets[0], sockets[1], sockets[2]);
+}
+
+/*
+ *  call-seq:
+ *     ZMQ.proxy(frontend, backend, capture = nil) => nil
+ *
+ * Run the ZMQ proxy method echoing messages received from front end socket to back end and vice versa,
+ * copying messages to the capture socket if provided. This method does not return unless the application
+ * is interrupted with a signal.
+ *
+ * @see http://api.zeromq.org/3-2:zmq-proxy
+ *
+ * === Examples
+ *     context = ZMQ::Context.new
+ *     frontend = context.socket(ZMQ::ROUTER)
+ *     frontend.bind("tcp://*:5555")
+ *     backend = context.socket(ZMQ::DEALER)
+ *     backend.bind("tcp://*:5556")
+ *     ZMQ.proxy(frontend, backend) => -1 when interrupted
+*/
+static VALUE rb_czmq_m_proxy(int argc, VALUE *argv, ZMQ_UNUSED VALUE klass)
+{
+    zmq_sock_wrapper *sock = NULL;
+    VALUE frontend, backend, capture;
+    void *sockets[3];
+    int rc;
+
+    rb_scan_args(argc, argv, "21", &frontend, &backend, &capture);
+
+    GetZmqSocket(frontend);
+    sockets[0] = sock->socket;
+
+    GetZmqSocket(backend);
+    sockets[1] = sock->socket;
+
+    if (!NIL_P(capture))
+    {
+        GetZmqSocket(capture);
+        sockets[2] = sock->socket;
+    }
+    else
+    {
+        sockets[2] = NULL;
+    }
+
+    rc = (int)rb_thread_blocking_region(rb_czmq_m_proxy_nogvl, (void *)sockets, RUBY_UBF_IO, 0);
+
+    // int result = zmq_proxy(frontend_socket, backend_socket, capture_socket);
+    return INT2NUM(rc);
+}
+
 void Init_rbczmq_ext()
 {
     frames_map = st_init_numtable();
@@ -177,6 +239,7 @@ void Init_rbczmq_ext()
     rb_define_module_function(rb_mZmq, "error", rb_czmq_m_error, 0);
     rb_define_module_function(rb_mZmq, "errno", rb_czmq_m_errno, 0);
     rb_define_module_function(rb_mZmq, "interrupted!", rb_czmq_m_interrupted_bang, 0);
+    rb_define_module_function(rb_mZmq, "proxy", rb_czmq_m_proxy, -1);
 
     rb_define_const(rb_mZmq, "POLLIN", INT2NUM(ZMQ_POLLIN));
     rb_define_const(rb_mZmq, "POLLOUT", INT2NUM(ZMQ_POLLOUT));
@@ -191,6 +254,8 @@ void Init_rbczmq_ext()
     rb_define_const(rb_mZmq, "ROUTER", INT2NUM(ZMQ_ROUTER));
     rb_define_const(rb_mZmq, "PUSH", INT2NUM(ZMQ_PUSH));
     rb_define_const(rb_mZmq, "PULL", INT2NUM(ZMQ_PULL));
+    rb_define_const(rb_mZmq, "XSUB", INT2NUM(ZMQ_XSUB));
+    rb_define_const(rb_mZmq, "XPUB", INT2NUM(ZMQ_XPUB));
 
     rb_define_const(rb_mZmq, "EFSM", INT2NUM(EFSM));
     rb_define_const(rb_mZmq, "ENOCOMPATPROTO", INT2NUM(ENOCOMPATPROTO));

data/ext/rbczmq/rbczmq_ext.h

@@ -58,6 +58,8 @@ extern VALUE rb_cZmqDealerSocket;
 extern VALUE rb_cZmqRepSocket;
 extern VALUE rb_cZmqReqSocket;
 extern VALUE rb_cZmqPairSocket;
+extern VALUE rb_cZmqXPubSocket;
+extern VALUE rb_cZmqXSubSocket;
 
 extern VALUE rb_cZmqFrame;
 extern VALUE rb_cZmqMessage;

data/ext/rbczmq/socket.c

@@ -1748,6 +1748,8 @@ void _init_rb_czmq_socket()
     rb_cZmqRepSocket = rb_define_class_under(rb_cZmqSocket, "Rep", rb_cZmqSocket);;
     rb_cZmqReqSocket = rb_define_class_under(rb_cZmqSocket, "Req", rb_cZmqSocket);;
     rb_cZmqPairSocket = rb_define_class_under(rb_cZmqSocket, "Pair", rb_cZmqSocket);;
+    rb_cZmqXPubSocket = rb_define_class_under(rb_cZmqSocket, "XPub", rb_cZmqSocket);
+    rb_cZmqXSubSocket = rb_define_class_under(rb_cZmqSocket, "XSub", rb_cZmqSocket);;
 
     intern_on_connected = rb_intern("on_connected");
     intern_on_connect_delayed = rb_intern("on_connect_delayed");

data/lib/zmq/version.rb

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

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rbczmq
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 1
-  - 4
-  version: "1.4"
+  - 5
+  version: "1.5"
 platform: ruby
 authors: 
 - "Lourens Naud\xC3\xA9"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-27 00:00:00 Z
+date: 2013-04-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake-compiler