nanomsg 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 338cb73be8a94cc3ee3fb4627973faedae7e81f2
-  data.tar.gz: be4319a9d07c46bd202c91a003a690e2dcdff1b4
+  metadata.gz: 5b07218c8858940ab1c5b6c850bef56a1d33a898
+  data.tar.gz: 94235adbd4ccfd1ca44aa7d32602e2d9d87e4422
 SHA512:
-  metadata.gz: 0a77d0a5624efb61e649bc1486766fea9e3ac1260ce23b61daabfe83b6a7b4525840669c01ff2417a6f17dae3fc80688f874ef453167cca7c7b7cc7c79f6074a
-  data.tar.gz: 0f2470ea6c65d1130d6cfbd965af5abecd32ea3134fa4ef9f0c4de84313e891e060d417fd73de36cbf9ac883288e759577b5bbaae809977293541323f7ad1bd8
+  metadata.gz: 7f7b434e91fff657228bd780173992e2ae201464f3f73befe63d1d50de91eec8d2a4af0365422122257f0075ef4c32d0f780e49d21f0869457267c58d97980d1
+  data.tar.gz: 3bfb497f02776ecf0a310890d61f14042db4d72bfe48b9d940d9eeaa678a84bbfdba0bc4f129490fcf80d0dde2ce90ccf485f2d4de563b265a4c5888313051f8

data/HISTORY

@@ -1,3 +1,7 @@
+= 0.6 / 13Mai2016
+
+  * Adds #getsockopt to sockets, allowing only NN_SNDFD and NN_RCVFD for now. 
+
 = 0.5 / 27Aug2015
 
   * GVL-code is now compatible with Ruby 2.2. 

data/README

@@ -43,11 +43,11 @@ SYNOPSIS
 STATUS
 
 Works with a range of nanomsg versions, last one verified is 0.6. Should work
-for mri rubies 1.9, 2.0, 2.1, 2.2.
+for mri rubies 1.9, 2.0, 2.1, 2.2, 2.3.
 
 Beta software: If you know what you're doing, you can use this in production. 
 
 LICENSE
 
-See file LICENSE, Copyright (c) 2013-2015 Kaspar Schiess
+See file LICENSE, Copyright (c) 2013-2016 Kaspar Schiess
 

data/ext/init.c

@@ -290,6 +290,42 @@ sock_setsockopt(VALUE self, VALUE level, VALUE option, VALUE val)
   return self; 
 }
 
+static VALUE 
+sock_getsockopt(VALUE self, VALUE level, VALUE option)
+{
+  int sock = sock_get(self);
+  int level_arg = FIX2INT(level); 
+  int option_arg = FIX2INT(option);
+  int err; 
+ 
+  int out; 
+  size_t sz; 
+
+  if (level_arg == NN_SOL_SOCKET) {
+    // This list of supported options is not complete yet. However, having
+    // a few supported sockets here is more useful than none at all. WIP. 
+    // Yes, pr please ;) 
+    switch (option_arg) {
+      case NN_SNDFD: 
+      case NN_RCVFD: 
+        // Return will be int, which is a system fd. 
+        sz = sizeof(out);
+        err = nn_getsockopt(sock, level_arg, option_arg, &out, &sz);
+        if (err < 0)
+          RAISE_SOCK_ERROR;
+
+        return INT2NUM(out);
+      default: 
+        // Unsupported option, returning nil. 
+        return Qnil;
+    }  
+  }
+  else {
+    // And yet more code here. 
+    return Qnil; 
+  }
+}
+
 #define SOCK_INIT_FUNC(name, type) \
 static VALUE \
 name(int argc, VALUE *argv, VALUE self) \
@@ -468,6 +504,7 @@ Init_nanomsg_ext(void)
   rb_define_method(cSocket, "recv", sock_recv, 0);
   rb_define_method(cSocket, "close", sock_close, 0);
   rb_define_method(cSocket, "setsockopt", sock_setsockopt, 3);
+  rb_define_method(cSocket, "getsockopt", sock_getsockopt, 2);
 
   rb_define_method(cPairSocket, "initialize", pair_sock_init, -1);
 

data/spec/lib/nanomsg/bus_spec.rb

@@ -19,10 +19,10 @@ describe 'BUS sockets' do
           sleep 0.01
 
           a.send 'test'
-          b.recv.should == 'test'
+          b.recv.assert == 'test'
 
           b.send 'ing'
-          a.recv.should == 'ing'
+          a.recv.assert == 'ing'
         end
       end
     end

data/spec/lib/nanomsg/device_spec.rb

@@ -34,7 +34,7 @@ describe 'Devices' do
       sleep 0.01
       c.send 'test'
       timeout(1) do
-        d.recv.should == 'test'
+        d.recv.assert == 'test'
       end
     end
   end

data/spec/lib/nanomsg/pair_socket_spec.rb

@@ -17,12 +17,30 @@ describe NanoMsg::PairSocket do
         sock1.bind(tbind)
         sock2.connect(tbind)
 
-        sock1.send('1234').should == 4
-        sock2.recv.should == '1234'
+        sock1.send('1234').assert == 4
+        sock2.recv.assert == '1234'
 
-        sock2.send('5678').should == 4
-        sock1.recv.should == '5678'    
-      end      
+        sock2.send('5678').assert == 4
+        sock1.recv.assert == '5678'    
+      end
+      it 'allows file descriptor retrieval' do
+        sock1.bind(tbind)
+        sock2.connect(tbind)
+
+        sock1.send('1234').assert == 4
+
+        # Now our socket should be ready: 
+        int_fd = sock2.getsockopt(NanoMsg::NN_SOL_SOCKET, NanoMsg::NN_RCVFD)
+
+        # Reconstruct a Ruby IO from the integer above. Note that if you 
+        # #close this FD, things will be messed up for NanoMsg.
+        io = IO.for_fd(int_fd)
+        io.autoclose = false
+
+        r, _, _ = IO.select([io])
+        r.size.assert == 1
+        r.first.assert == io
+      end
     end
   end
 

data/spec/lib/nanomsg/pub_sub_spec.rb

@@ -4,12 +4,32 @@ require 'timeout'
 
 describe 'PUB/SUB sockets' do
   describe 'PUB socket' do
-    it 'has no #recv method'
+    let!(:pub) { NanoMsg::PubSocket.new }
+    
+    it 'has no #recv method' do
+      NanoMsg::Errno::ENOTSUP.assert.raised? do
+        pub.recv
+      end
+    end
   end
   describe 'SUB socket' do
-    it 'has no #send method'
-    it 'allows subscribing to channels'
-    it 'allows unsubscribing to channels'
+    let!(:sub) { NanoMsg::SubSocket.new }
+    it 'has no #send method' do
+      NanoMsg::Errno::ENOTSUP.assert.raised? do
+        sub.send 'foo'
+      end
+    end
+    
+    it 'allows unsubscribing to channels' do
+      sub.subscribe 'foo'
+      sub.unsubscribe 'foo'
+    end
+    it 'allows unsubscribing to channels' do
+      # NOTE unsubscribe without previous subscribe currently provokes an 
+      #   access protection (null pointer deref) in nn_setsockopt/NN_SUB_UNSUBSCRIBE
+      #   We told you it was alpha software. 
+      # sub.unsubscribe 'foo'
+    end
   end
 
   def self.examples_for_transport tbind
@@ -41,13 +61,13 @@ describe 'PUB/SUB sockets' do
         sleep 0.1
 
         pub.send 'foo1234'
-        sub1.recv.should == 'foo1234'
-        sub2.recv.should == 'foo1234'
+        sub1.recv.assert == 'foo1234'
+        sub2.recv.assert == 'foo1234'
 
         pub.send 'bar4567'
         pub.send 'foo9999'
-        sub1.recv.should == 'bar4567'
-        sub2.recv.should == 'foo9999'
+        sub1.recv.assert == 'bar4567'
+        sub2.recv.assert == 'foo9999'
       end      
     end
   end

data/spec/lib/nanomsg/push_pull_spec.rb

@@ -33,7 +33,7 @@ describe 'PUSH/PULL pipeline sockets' do
           end
 
           # This is about a 5% level of the binominal distribution
-          (n.first - n.last).abs.should < 10
+          (n.first - n.last).abs.assert < 10
         end
       end
       describe 'fanin' do
@@ -57,7 +57,7 @@ describe 'PUSH/PULL pipeline sockets' do
           end
 
           100.times do |i|
-            consumer.recv.to_i.should == i
+            consumer.recv.to_i.assert == i
           end
         end
       end

data/spec/lib/nanomsg/req_rep_spec.rb

@@ -19,10 +19,10 @@ describe 'REQ/REP sockets' do
 
         req.send 'req1'
 
-        rep.recv.should == 'req1'
+        rep.recv.assert == 'req1'
         rep.send 'rep1'
         
-        req.recv.should == 'rep1'
+        req.recv.assert == 'rep1'
       end      
     end
   end

data/spec/lib/nanomsg/survey_spec.rb

@@ -14,9 +14,9 @@ describe 'SURVEY sockets' do
     
     describe "transport #{name}" do
       it 'allows simple surveys' do
-        surveyor.deadline.should == 1 # default: 1 second
+        surveyor.deadline.assert == 1 # default: 1 second
         surveyor.deadline = 0.1 # 100ms
-        surveyor.deadline.should == 0.1
+        surveyor.deadline.assert == 0.1
 
         surveyor.bind(tbind)
 
@@ -25,17 +25,20 @@ describe 'SURVEY sockets' do
 
         sleep 0.1
         surveyor.send 'u there?'
-        resp1.recv.should == 'u there?'
-        resp2.recv.should == 'u there?'
+        resp1.recv.assert == 'u there?'
+        resp2.recv.assert == 'u there?'
 
         resp1.send 'KTHNXBYE'
-        surveyor.recv.should == 'KTHNXBYE'
+        surveyor.recv.assert == 'KTHNXBYE'
 
         # nanomsg/tests/survey.c says this should be EFSM, the documentation 
         # says it should be ETIMEDOUT. Reality wins. 
         begin
           surveyor.recv
         rescue NanoMsg::Errno::EFSM
+          # Old nanomsg version
+        rescue NanoMsg::Errno::ETIMEDOUT
+          # New version
         end
       end      
     end

data/spec/lib/nanomsg_spec.rb

@@ -3,9 +3,9 @@ require 'spec_helper'
 
 describe NanoMsg do
   it 'has NN_LINGER constant set to an integer value' do
-    NanoMsg::NN_LINGER.should >= 0
+    NanoMsg::NN_LINGER.assert >= 0
   end  
   it 'allows shutting down using nn_term' do
-    NanoMsg.should respond_to(:terminate)
+    NanoMsg.assert.respond_to?(:terminate)
   end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 
+require 'ae'
 
 $:.unshift File.dirname(__FILE__) + "/../ext"
 require 'nanomsg'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanomsg
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Kaspar Schiess
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2016-05-13 00:00:00.000000000 Z
 dependencies: []
 description: "    nanomsg library is a high-performance implementation of several
   \"scalability \n    protocols\". Scalability protocol's job is to define how multiple
@@ -66,9 +66,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Ruby binding for nanomsg. nanomsg library is a high-performance implementation
   of several "scalability protocols".
 test_files: []
+has_rdoc: