nn-core 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aec634c40b00d3f8dc8301ee40777c9943d069d6
-  data.tar.gz: 23b6f3ea3d5327711e0f1ba2ec971f9f904d4d2f
+  metadata.gz: 691df12ac377ed030b7fd74b5b54d6b9b3becb98
+  data.tar.gz: 3f5b4557cd9539120cb7ee980e8c878b6ea03de4
 SHA512:
-  metadata.gz: 171ba1be554febe2101e3253094c722e9124f1da03b870427a7e062b470ab1f9eb955f22e0387e1081bb9ef9ef7fed402321de1172b068213276455a40d753ea
-  data.tar.gz: 7e969d818f3044048f9721250cb15a9cc5c1682cefbea62e322f7e3f31b2f04bbc3192611a475aec0b0390c95c4bc7c67e3e21ac3117006fb7d3bc24dd62af77
+  metadata.gz: 8d304d2c2b4945a9795557621aba3350854c19b4f69aa96bacd9bb204006a9fc169cc599079913d81a2b0fb3ed506e03487e2c4f2f7606ff31e111f424458eeb
+  data.tar.gz: 4ba0fa436aea595eb065bf941d591579e040e57bb64729dfe857df99bb67e517cec8ce7488867f21a87986b6964ff65dd8d8fe5b803b3802b1a37d7b7b063bb3

data/.rspec

@@ -1,4 +1,4 @@
 --color
 --format documentation
 --backtrace
---default_path spec
+--default-path spec

data/.travis.yml

@@ -0,0 +1,13 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.1
+  - jruby-head
+  - rbx-2
+script: bundle exec rspec spec
+matrix:
+  allow_failures:
+before_install:
+  - git clone git://github.com/nanomsg/nanomsg.git
+  - cd nanomsg && ./autogen.sh && ./configure && sudo make install && sudo ldconfig && cd ${TRAVIS_BUILD_DIR}

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gemspec
 

data/History.txt

@@ -1,3 +1,12 @@
+20140219 / 0.3.0
+  * Support nn_poll function for checking socket reading/writing availability
+
+  * Support nn_symbol_info function
+
+  * Support reallocmsg function for reallocating messages previously allocated by nn_allocmsg
+
+  * Support nn_device for messages forwarding between two sockets
+
 20130327 / 0.2.0
 	* Support nn_symbol function for setting up all constants in the binding.
 	
@@ -30,4 +39,4 @@
 20130204 / 0.1.0
 	* Initial release. Wrapped the nanomsg library as of commit 
 		5ded934af0.
-		
+		

data/README.md

@@ -1,6 +1,8 @@
 nn-core
 -------
 
+[![Build Status](https://travis-ci.org/chuckremes/nn-core.svg?branch=master)](https://travis-ci.org/chuckremes/nn-core)
+
 nn-core is a very thin FFI wrapper around the nanomsg library. The intention is to provide a very
 simple wrapper that hews as close to the C API as possible. Other gems that want to offer a more
 idiomatic API for Ruby should require this gem and build a nice Ruby API with it.

data/lib/nn-core/constants.rb

@@ -2,8 +2,8 @@ module NNCore
 
   # To simplify management of constants in language bindings that cannot
   # parse or directly utilize a C header file, the library provides the
-  # nn_symbol function. This function returns a string and an integer 
-  # value so that bindings authors can easily setup all constants and 
+  # nn_symbol function. This function returns a string and an integer
+  # value so that bindings authors can easily setup all constants and
   # their values without worrying about copy/paste or transcription
   # errors every time the underlying library is changed.
   #
@@ -20,7 +20,7 @@ module NNCore
     const_set(constant_string, value.read_int)
     index += 1
   end
-  
+
   # This constant is not exported by nn_symbol. It is also of type size_t.
   NN_MSG = -1
 end

data/lib/nn-core/libnanomsg.rb

@@ -2,7 +2,7 @@
 module NNCore
   module LibNanomsg
     extend FFI::Library
-    
+
     begin
       # bias the library discovery to a path inside the gem first, then
       # to the usual system paths
@@ -34,12 +34,13 @@ module NNCore
     find_type(:size_t) rescue typedef(:ulong, :size_t)
 
     attach_function :nn_symbol, [:int, :pointer], :string, :blocking => true
-    
+    attach_function :nn_symbol_info, [:int, :pointer, :int], :int, :blocking => true
+
     attach_function :nn_errno, [], :int, :blocking => true
     attach_function :nn_strerror, [:int], :string, :blocking => true
     attach_function :nn_socket, [:int, :int], :int, :blocking => true
     attach_function :nn_close, [:int], :int, :blocking => true
-    
+
     attach_function :nn_getsockopt, [:int, :int, :int, :pointer, :pointer], :int, :blocking => true
     attach_function :nn_setsockopt, [:int, :int, :int, :pointer, :size_t], :int, :blocking => true
     attach_function :nn_bind, [:int, :string], :int, :blocking => true
@@ -48,11 +49,15 @@ module NNCore
     attach_function :nn_send, [:int, :pointer, :size_t, :int], :int, :blocking => true
     attach_function :nn_recv, [:int, :pointer, :size_t, :int], :int, :blocking => true
     attach_function :nn_term, [], :void, :blocking => true
+    attach_function :nn_device, [:int, :int], :int, :blocking => true
+
+    attach_function :nn_poll, [:pointer, :int, :int], :int, :blocking => true
 
     # functions for working with raw buffers
     attach_function :nn_sendmsg, [:int, :pointer, :int], :int, :blocking => true
     attach_function :nn_recvmsg, [:int, :pointer, :int], :int, :blocking => true
     attach_function :nn_allocmsg, [:size_t, :int], :pointer, :blocking => true
+    attach_function :nn_reallocmsg, [:pointer, :size_t], :pointer, :blocking => true
     attach_function :nn_freemsg, [:pointer], :int, :blocking => true
   end
 end

data/lib/nn-core/structs.rb

@@ -1,7 +1,6 @@
-
 module NNCore
   module LibNanomsg
-        
+
     # Structs for working with raw buffers (not recommended)
     module NNIOVecLayout
       def self.included(base)
@@ -14,24 +13,24 @@ module NNCore
 
     class NNIOVec < FFI::Struct
       include NNIOVecLayout
-      
+
       def iov_base
         self[:iov_base]
       end
-      
+
       def iov_base=(pointer)
         self[:iov_base] = pointer
       end
-      
+
       def iov_len
         self[:iov_len]
       end
-      
+
       def iov_len=(length)
         self[:iov_len] = length
       end
     end
-    
+
     module NNMsgHdrLayout
       def self.included(base)
         base.class_eval do
@@ -42,43 +41,43 @@ module NNCore
         end
       end
     end
-    
+
     class NNMsgHdr < FFI::Struct
       include NNMsgHdrLayout
-      
+
       def msg_iov
         self[:msg_iov]
       end
-      
+
       def msg_iov=(structure)
         self[:msg_iov] = structure
       end
-      
+
       def msg_iovlen
         self[:msg_iovlen]
       end
-      
+
       def msg_iovlen=(length)
         self[:msg_iovlen] = length
       end
-      
+
       def msg_control
         self[:msg_control]
       end
-      
+
       def msg_control=(pointer)
         self[:msg_control] = pointer
       end
-      
+
       def msg_controllen
         self[:msg_controllen]
       end
-      
+
       def msg_controllen=(value)
         self[:msg_controllen] = value
       end
     end
-    
+
     module NNCMsgHdrLayout
       def self.included(base)
         base.class_eval do
@@ -88,34 +87,110 @@ module NNCore
         end
       end
     end
-    
+
     class NNCMsgHdr < FFI::Struct
       include NNCMsgHdrLayout
-      
+
       def cmsg_len
         self[:cmsg_len]
       end
-      
+
       def cmsg_len=(length)
         self[:csmg_len] = length
       end
-      
+
       def cmsg_level
         self[:cmsg_level]
       end
-      
+
       def cmsg_level=(level)
         self[:cmsg_level] = level
       end
-      
+
       def cmsg_type
         self[:cmsg_type]
       end
-      
+
       def cmsg_type=(type)
         self[:cmsg_type] = type
       end
     end
-        
+
+    module NNPollFdLayout
+      def self.included(base)
+        base.class_eval do
+          layout :fd, :int,
+          :events, :short,
+          :revents, :short
+        end
+      end
+    end
+
+    # Struct for nn_poll
+    class NNPollFd < FFI::Struct
+      include NNPollFdLayout
+
+      def fd
+        self[:fd]
+      end
+
+      def fd=(socket)
+        self[:fd] = socket
+      end
+
+      def events
+        self[:events]
+      end
+
+      def events=(value)
+        self[:events] = value
+      end
+
+      def revents
+        self[:revents]
+      end
+
+      def revents=(value)
+        self[:revents] = value
+      end
+    end
+
+    # Struct for nn_symbol_info return values
+    module NNSymbolPropertiesLayout
+      def self.included(base)
+        base.class_eval do
+          layout :value, :int,
+          :name, :string,
+          :ns, :int,
+          :type, :int,
+          :unit, :int
+        end
+      end
+    end
+
+    class NNSymbolProperties < FFI::Struct
+      include NNSymbolPropertiesLayout
+
+      def value
+        self[:value]
+      end
+
+      def name
+        self[:name]
+      end
+
+      def ns
+        self[:ns]
+      end
+
+      def type
+        self[:type]
+      end
+
+      def unit
+        self[:unit]
+      end
+    end
+
   end
 end

data/lib/nn-core/version.rb

@@ -1,3 +1,3 @@
 module NNCore
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/nn-core.gemspec

@@ -21,6 +21,6 @@ to build an API using Ruby idioms.}
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency "ffi"
-  s.add_development_dependency "rspec", ["~> 2.6"]
+  s.add_development_dependency "rspec", ["~> 3.2"]
   s.add_development_dependency "rake"
 end

data/spec/nn_bind_spec.rb

@@ -16,84 +16,85 @@ module NNCore
 
         it "returns a non-zero endpoint number for a valid INPROC address" do
           rc = LibNanomsg.nn_bind(@socket, "inproc://some_address")
-          rc.should > 0
+          expect(rc).to be > 0
         end
 
         it "returns a non-zero endpoint number for a valid IPC address" do
           rc = LibNanomsg.nn_bind(@socket, "ipc:///tmp/some_address")
-          rc.should > 0
+          expect(rc).to be > 0
         end
 
         it "returns a non-zero endpoint number for a valid TCP address" do
           rc = LibNanomsg.nn_bind(@socket, "tcp://127.0.0.1:5555")
-          rc.should > 0
+          expect(rc).to be > 0
         end
 
         it "returns -1 for an invalid INPROC address" do
           rc = LibNanomsg.nn_bind(@socket, "inproc:/missing_first_slash")
-          rc.should == -1
-          LibNanomsg.nn_errno.should == EINVAL
+          errno = LibNanomsg.nn_errno
+          expect(rc).to eq(-1)
+          expect(errno).to eq(EINVAL)
         end
 
         it "returns -1 for an invalid INPROC address (too long)" do
           rc = LibNanomsg.nn_bind(@socket, "inproc://#{'a' * (NN_SOCKADDR_MAX + 1)}")
-          rc.should == -1
-          LibNanomsg.nn_errno.should == ENAMETOOLONG
+          expect(rc).to eq(-1)
+          expect(LibNanomsg.nn_errno).to eq(ENAMETOOLONG)
         end
 
         it "returns -1 for an invalid IPC address" do
           rc = LibNanomsg.nn_bind(@socket, "ipc:/missing_slashes)")
-          rc.should == -1
-          LibNanomsg.nn_errno.should == EINVAL
+          expect(rc).to eq(-1)
+          expect(LibNanomsg.nn_errno).to eq(EINVAL)
         end
 
         it "returns -1 for an invalid TCP address (missing address)" do
           rc = LibNanomsg.nn_bind(@socket, "tcp://")
-          rc.should == -1
-          LibNanomsg.nn_errno.should == EINVAL
+          expect(rc).to eq(-1)
+          expect(LibNanomsg.nn_errno).to eq(EINVAL)
         end
 
         it "returns -1 for an invalid TCP address (non-numeric port)" do
           rc = LibNanomsg.nn_bind(@socket, "tcp://192.168.0.1:port")
-          rc.should == -1
-          LibNanomsg.nn_errno.should == EINVAL
+          expect(rc).to eq(-1)
+          expect(LibNanomsg.nn_errno).to eq(EINVAL)
         end
 
         it "returns -1 for an invalid TCP address (port number is out of range)" do
           rc = LibNanomsg.nn_bind(@socket, "tcp://192.168.0.1:65536")
-          rc.should == -1
-          LibNanomsg.nn_errno.should == EINVAL
+          expect(rc).to eq(-1)
+          expect(LibNanomsg.nn_errno).to eq(EINVAL)
         end
 
         it "returns -1 for an unsupported transport protocol" do
           rc = LibNanomsg.nn_bind(@socket, "zmq://192.168.0.1:65536")
-          rc.should == -1
-          LibNanomsg.nn_errno.should == EPROTONOSUPPORT
+          expect(rc).to eq(-1)
+          expect(LibNanomsg.nn_errno).to eq(EPROTONOSUPPORT)
         end
 
         it "returns -1 for specifying a non-existent device using TCP transport" do
           rc = LibNanomsg.nn_bind(@socket, "tcp://eth5:5555")
-          rc.should == -1
-          LibNanomsg.nn_errno.should == ENODEV
+          expect(rc).to eq(-1)
+          expect(LibNanomsg.nn_errno).to eq(ENODEV)
         end
 
         it "returns -1 when binding to an existing endpoint" do
           rc = LibNanomsg.nn_bind(@socket, "inproc://some_endpoint")
           rc = LibNanomsg.nn_bind(@socket, "inproc://some_endpoint")
-          rc.should == -1
-          LibNanomsg.nn_errno.should == EADDRINUSE
+          expect(rc).to eq(-1)
+          expect(LibNanomsg.nn_errno).to eq(EADDRINUSE)
         end
-        
+
       end
 
       context "given an invalid file descriptor" do
-        
+
         it "returns -1 and sets nn_errno to EBADF" do
           rc = LibNanomsg.nn_bind(0, "inproc://some_endpoint")
-          rc.should == -1
-          LibNanomsg.nn_errno.should == EBADF
+          expect(rc).to eq(-1)
+          expect(LibNanomsg.nn_errno).to eq(EBADF)
         end
-        
+
       end
 
     end

data/spec/nn_close_spec.rb

@@ -9,7 +9,7 @@ module NNCore
         before(:each) { @socket = LibNanomsg.nn_socket(AF_SP, NN_PUB) }
 
         it "returns 0" do
-          LibNanomsg.nn_close(@socket).should be_zero
+          expect(LibNanomsg.nn_close(@socket)).to be_zero
         end
 
       end
@@ -17,8 +17,8 @@ module NNCore
       context "given an invalid file descriptor" do
 
         it "returns -1 and sets nn_errno to EBADF" do
-          LibNanomsg.nn_close(0).should == -1
-          LibNanomsg.nn_errno.should == EBADF
+          expect(LibNanomsg.nn_close(0)).to eq(-1)
+          expect(LibNanomsg.nn_errno).to eq(EBADF)
         end
 
       end

data/spec/nn_connect_spec.rb

@@ -22,77 +22,77 @@ module NNCore
 
         it "returns a non-zero endpoint number for a valid INPROC address" do
           rc = LibNanomsg.nn_connect(@socket, "inproc://some_address")
-          rc.should > 0
+          expect(rc).to be > 0
         end
 
         it "returns a non-zero endpoint number for a valid IPC address" do
           rc = LibNanomsg.nn_connect(@socket, "ipc:///tmp/some_address")
-          rc.should > 0
+          expect(rc).to be > 0
         end
 
         it "returns a non-zero endpoint number for a valid TCP address" do
           rc = LibNanomsg.nn_connect(@socket, "tcp://127.0.0.1:5555")
-          rc.should > 0
+          expect(rc).to be > 0
         end
 
         it "returns -1 for an invalid INPROC address" do
           rc = LibNanomsg.nn_connect(@socket, "inproc:/missing_first_slash")
-          rc.should == -1
-          LibNanomsg.nn_errno.should == EINVAL
+          expect(rc).to eq(-1)
+          expect(LibNanomsg.nn_errno).to eq(EINVAL)
         end
 
         it "returns -1 for an invalid INPROC address (too long)" do
           rc = LibNanomsg.nn_connect(@socket, "inproc://#{'a' * (NN_SOCKADDR_MAX + 1)}")
-          rc.should == -1
-          LibNanomsg.nn_errno.should == ENAMETOOLONG
+          expect(rc).to eq(-1)
+          expect(LibNanomsg.nn_errno).to eq(ENAMETOOLONG)
         end
 
         it "returns -1 for an invalid IPC address" do
           rc = LibNanomsg.nn_connect(@socket, "ipc:/missing_slashes)")
-          rc.should == -1
-          LibNanomsg.nn_errno.should == EINVAL
+          expect(rc).to eq(-1)
+          expect(LibNanomsg.nn_errno).to eq(EINVAL)
         end
 
         it "returns -1 for an invalid TCP address (missing port)" do
           rc = LibNanomsg.nn_connect(@socket, "tcp://*:")
-          rc.should == -1
-          LibNanomsg.nn_errno.should == EINVAL
+          expect(rc).to eq(-1)
+          expect(LibNanomsg.nn_errno).to eq(EINVAL)
         end
 
         it "returns -1 for an invalid TCP address (non-numeric port)" do
           rc = LibNanomsg.nn_connect(@socket, "tcp://192.168.0.1:port")
-          rc.should == -1
-          LibNanomsg.nn_errno.should == EINVAL
+          expect(rc).to eq(-1)
+          expect(LibNanomsg.nn_errno).to eq(EINVAL)
         end
 
         it "returns -1 for an invalid TCP address (port number is out of range)" do
           rc = LibNanomsg.nn_connect(@socket, "tcp://192.168.0.1:65536")
-          rc.should == -1
-          LibNanomsg.nn_errno.should == EINVAL
+          expect(rc).to eq(-1)
+          expect(LibNanomsg.nn_errno).to eq(EINVAL)
         end
 
         it "returns -1 for an unsupported transport protocol" do
           rc = LibNanomsg.nn_connect(@socket, "zmq://192.168.0.1:65536")
-          rc.should == -1
-          LibNanomsg.nn_errno.should == EPROTONOSUPPORT
+          expect(rc).to eq(-1)
+          expect(LibNanomsg.nn_errno).to eq(EPROTONOSUPPORT)
         end
 
         it "returns 2 when connecting twice to an existing endpoint" do
           rc = LibNanomsg.nn_connect(@socket, "inproc://some_endpoint")
           rc = LibNanomsg.nn_connect(@socket, "inproc://some_endpoint")
-          rc.should == 2
+          expect(rc).to eq(2)
         end
-        
+
       end
 
       context "given an invalid file descriptor" do
-        
+
         it "returns -1 and sets nn_errno to EBADF" do
           rc = LibNanomsg.nn_connect(0, "inproc://some_endpoint")
-          rc.should == -1
-          LibNanomsg.nn_errno.should == EBADF
+          expect(rc).to eq(-1)
+          expect(LibNanomsg.nn_errno).to eq(EBADF)
         end
-        
+
       end
 
     end

data/spec/nn_getsockopt_spec.rb

@@ -19,50 +19,50 @@ module NNCore
 
         it "NN_LINGER returns a default of 1000" do
           rc = LibNanomsg.nn_getsockopt(@socket, NN_SOL_SOCKET, NN_LINGER, @option, @size)
-          rc.should == 0
-          @option.read_int.should == 1000
+          expect(rc).to eq(0)
+          expect(@option.read_int).to eq(1000)
         end
 
         it "NN_SNDBUF returns a default of 128KB" do
           rc = LibNanomsg.nn_getsockopt(@socket, NN_SOL_SOCKET, NN_SNDBUF, @option, @size)
-          rc.should == 0
-          @option.read_int.should == 131072
+          expect(rc).to eq(0)
+          expect(@option.read_int).to eq(131072)
         end
 
         it "NN_RCVBUF returns a default of 128KB" do
           rc = LibNanomsg.nn_getsockopt(@socket, NN_SOL_SOCKET, NN_RCVBUF, @option, @size)
-          rc.should == 0
-          @option.read_int.should == 131072
+          expect(rc).to eq(0)
+          expect(@option.read_int).to eq(131072)
         end
 
         it "NN_SNDTIMEO returns a default of -1" do
           rc = LibNanomsg.nn_getsockopt(@socket, NN_SOL_SOCKET, NN_SNDTIMEO, @option, @size)
-          rc.should == 0
-          @option.read_int.should == -1
+          expect(rc).to eq(0)
+          expect(@option.read_int).to eq(-1)
         end
 
         it "NN_RCVTIMEO returns a default of -1" do
           rc = LibNanomsg.nn_getsockopt(@socket, NN_SOL_SOCKET, NN_RCVTIMEO, @option, @size)
-          rc.should == 0
-          @option.read_int.should == -1
+          expect(rc).to eq(0)
+          expect(@option.read_int).to eq(-1)
         end
 
         it "NN_RECONNECT_IVL returns a default of 100 (units are milliseconds)" do
           rc = LibNanomsg.nn_getsockopt(@socket, NN_SOL_SOCKET, NN_RECONNECT_IVL, @option, @size)
-          rc.should == 0
-          @option.read_int.should == 100
+          expect(rc).to eq(0)
+          expect(@option.read_int).to eq(100)
         end
 
         it "NN_RECONNECT_IVL_MAX returns a default of 0 (units are milliseconds)" do
           rc = LibNanomsg.nn_getsockopt(@socket, NN_SOL_SOCKET, NN_RECONNECT_IVL_MAX, @option, @size)
-          rc.should == 0
-          @option.read_int.should == 0
+          expect(rc).to eq(0)
+          expect(@option.read_int).to eq(0)
         end
 
         it "NN_SNDPRIO returns a default of 8" do
           rc = LibNanomsg.nn_getsockopt(@socket, NN_SOL_SOCKET, NN_SNDPRIO, @option, @size)
-          rc.should == 0
-          @option.read_int.should == 8
+          expect(rc).to eq(0)
+          expect(@option.read_int).to eq(8)
         end
 
 
@@ -75,8 +75,8 @@ module NNCore
               size.write_int(4)
 
               rc = LibNanomsg.nn_getsockopt(@socket, 100, SOCKET_OPTIONS[socket_option], option, size)
-              rc.should == -1
-              LibNanomsg.nn_errno.should == ENOPROTOOPT
+              expect(rc).to eq(-1)
+              expect(LibNanomsg.nn_errno).to eq(ENOPROTOOPT)
             end
           end
 
@@ -93,8 +93,8 @@ module NNCore
             size.write_int(4)
 
             rc = LibNanomsg.nn_getsockopt(0, NN_SOL_SOCKET, SOCKET_OPTIONS[socket_option], option, size)
-            rc.should == -1
-            LibNanomsg.nn_errno.should == EBADF
+            expect(rc).to eq(-1)
+            expect(LibNanomsg.nn_errno).to eq(EBADF)
           end
         end
       end

data/spec/nn_poll_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+module NNCore
+  describe "nn_poll" do
+
+    context "given an initialized library and" do
+
+      context "given a valid socket" do
+        before(:each) do
+          @socket = LibNanomsg.nn_socket(AF_SP, NN_PUB)
+          @endpoint = LibNanomsg.nn_bind(@socket, "inproc://some_endpoint")
+        end
+
+        after(:each) do
+          LibNanomsg.nn_close(@socket)
+        end
+
+        it "returns a non-zero number of signaled events" do
+          pointer = FFI::MemoryPointer.new(NNCore::LibNanomsg::NNPollFd, 1)
+          struct = NNCore::LibNanomsg::NNPollFd.new(pointer)
+          struct.fd = @socket
+          struct.events = 2
+          result = LibNanomsg.nn_poll(pointer, 1, 1000)
+
+          expect(result).to be > 0
+        end
+
+      end
+
+    end
+  end
+end

data/spec/nn_recv_spec.rb

@@ -23,27 +23,27 @@ module NNCore
           it "returns the number of bytes received" do
             string = "ABC"
             LibNanomsg.nn_send(@sender, string, string.size, 0)
-            
+
             buffer = FFI::MemoryPointer.new(5)
             nbytes = LibNanomsg.nn_recv(@socket, buffer, 5, 0)
-            nbytes.should == 3
-            buffer.read_string.should == string
+            expect(nbytes).to eq(3)
+            expect(buffer.read_string).to eq(string)
           end
         end
-        
+
         context "given no pre-allocated buffer" do
 
           it "returns the number of bytes received and returns the buffer" do
             string = "ABC"
             LibNanomsg.nn_send(@sender, string, string.size, 0)
-            
+
             buffer = FFI::MemoryPointer.new(:pointer)
             nbytes = LibNanomsg.nn_recv(@socket, buffer, NN_MSG, 0)
-            nbytes.should == 3
-            
+            expect(nbytes).to eq(3)
+
             # important to pass +nbytes+ to #read_string since the sent string
             # is not null-terminated
-            buffer.get_pointer(0).read_string(nbytes).should == string
+            expect(buffer.get_pointer(0).read_string(nbytes)).to eq(string)
           end
         end
       end
@@ -52,8 +52,8 @@ module NNCore
 
         it "returns -1 and sets nn_errno to EBADF" do
           rc = LibNanomsg.nn_send(0, "ABC", 3, 0)
-          rc.should == -1
-          LibNanomsg.nn_errno.should == EBADF
+          expect(rc).to eq(-1)
+          expect(LibNanomsg.nn_errno).to eq(EBADF)
         end
 
       end

data/spec/nn_send_spec.rb

@@ -21,14 +21,14 @@ module NNCore
 
           it "returns the number of bytes sent" do
             nbytes = LibNanomsg.nn_send(@socket, "ABC", 3, 0)
-            nbytes.should == 3
+            expect(nbytes).to eq(3)
           end
         end
 
         context "disconnected from all endpoints" do
           it "returns the number of bytes queued" do
             nbytes = LibNanomsg.nn_send(@socket, "ABC", 3, 0)
-            nbytes.should == 3
+            expect(nbytes).to eq(3)
           end
         end
       end
@@ -37,8 +37,8 @@ module NNCore
 
         it "returns -1 and sets nn_errno to EBADF" do
           rc = LibNanomsg.nn_send(0, "ABC", 3, 0)
-          rc.should == -1
-          LibNanomsg.nn_errno.should == EBADF
+          expect(rc).to eq(-1)
+          expect(LibNanomsg.nn_errno).to eq(EBADF)
         end
 
       end

data/spec/nn_setsockopt_spec.rb

@@ -22,11 +22,11 @@ module NNCore
           it "#{socket_option} overrides the default" do
             @option.write_int(10)
             rc = LibNanomsg.nn_setsockopt(@socket, NN_SOL_SOCKET, SOCKET_OPTIONS[socket_option], @option, 4)
-            rc.should == 0
+            expect(rc).to eq(0)
             rc = LibNanomsg.nn_getsockopt(@socket, NN_SOL_SOCKET, SOCKET_OPTIONS[socket_option], @option, @size)
-            rc.should == 0
+            expect(rc).to eq(0)
 
-            @option.read_int.should == 10
+            expect(@option.read_int).to eq(10)
           end
         end
 
@@ -38,8 +38,8 @@ module NNCore
               option = FFI::MemoryPointer.new(:int32)
 
               rc = LibNanomsg.nn_setsockopt(@socket, 100, SOCKET_OPTIONS[socket_option], option, 4)
-              rc.should == -1
-              LibNanomsg.nn_errno.should == ENOPROTOOPT
+              expect(rc).to eq(-1)
+              expect(LibNanomsg.nn_errno).to eq(ENOPROTOOPT)
             end
           end
 
@@ -56,8 +56,8 @@ module NNCore
             size.write_int(4)
 
             rc = LibNanomsg.nn_getsockopt(0, NN_SOL_SOCKET, SOCKET_OPTIONS[socket_option], option, size)
-            rc.should == -1
-            LibNanomsg.nn_errno.should == EBADF
+            expect(rc).to eq(-1)
+            expect(LibNanomsg.nn_errno).to eq(EBADF)
           end
         end
       end

data/spec/nn_shutdown_spec.rb

@@ -21,15 +21,15 @@ module NNCore
 
           it "returns 0" do
             rc = LibNanomsg.nn_shutdown(@socket, @endpoint)
-            rc.should == 0
+            expect(rc).to eq(0)
           end
         end
 
         context "given an invalid endpoint" do
           it "returns -1 and set nn_errno to EINVAL" do
             rc = LibNanomsg.nn_shutdown(@socket, 0)
-            rc.should == -1
-            LibNanomsg.nn_errno.should == EINVAL
+            expect(rc).to eq(-1)
+            expect(LibNanomsg.nn_errno).to eq(EINVAL)
           end
         end
       end
@@ -38,8 +38,8 @@ module NNCore
 
         it "returns -1 and sets nn_errno to EBADF" do
           rc = LibNanomsg.nn_shutdown(0, 0)
-          rc.should == -1
-          LibNanomsg.nn_errno.should == EBADF
+          expect(rc).to eq(-1)
+          expect(LibNanomsg.nn_errno).to eq(EBADF)
         end
 
       end

data/spec/nn_socket_spec.rb

@@ -12,7 +12,7 @@ module NNCore
           it "returns a non-zero file descriptor for the socket" do
             @socket = LibNanomsg.nn_socket(AF_SP, PROTOCOLS[protocol])
 
-            @socket.should == 0
+            expect(@socket).to eq(0)
 
             LibNanomsg.nn_close(@socket)
           end
@@ -24,8 +24,8 @@ module NNCore
             it "returns -1 and sets nn_errno to EINVAL" do
               @socket = LibNanomsg.nn_socket(AF_SP_RAW, PROTOCOLS[protocol])
 
-              @socket.should == -1
-              LibNanomsg.nn_errno.should == EINVAL
+              expect(@socket).to eq(-1)
+              expect(LibNanomsg.nn_errno).to eq(EINVAL)
             end
           end
         end
@@ -34,21 +34,21 @@ module NNCore
 
       context "given an unsupported address family" do
         it "nn_socket returns -1 and sets nn_errno to EAFNOSUPPORT" do
-          LibNanomsg.nn_socket(0, NN_PUB).should == -1
-          LibNanomsg.nn_errno.should == EAFNOSUPPORT
+          expect(LibNanomsg.nn_socket(0, NN_PUB)).to eq(-1)
+          expect(LibNanomsg.nn_errno).to eq(EAFNOSUPPORT)
         end
       end
 
       context "given an unsupported protocol and a supported address family" do
 
         it "AF_SP returns -1 and sets nn_errno to EINVAL" do
-          LibNanomsg.nn_socket(AF_SP, 0).should == -1
-          LibNanomsg.nn_errno.should == EINVAL
+          expect(LibNanomsg.nn_socket(AF_SP, 0)).to eq(-1)
+          expect(LibNanomsg.nn_errno).to eq(EINVAL)
         end
 
         it "AF_SP_RAW returns -1 and sets nn_errno to EINVAL" do
-          LibNanomsg.nn_socket(AF_SP_RAW, 0).should == -1
-          LibNanomsg.nn_errno.should == EINVAL
+          expect(LibNanomsg.nn_socket(AF_SP_RAW, 0)).to eq(-1)
+          expect(LibNanomsg.nn_errno).to eq(EINVAL)
         end
       end
 

data/spec/nn_symbol_info_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+module NNCore
+  describe "nn_symbol_info" do
+
+    def symbol_info(index)
+      pointer = FFI::MemoryPointer.new(NNCore::LibNanomsg::NNSymbolProperties)
+      result_size = LibNanomsg.nn_symbol_info(index, pointer, NNCore::LibNanomsg::NNSymbolProperties.size)
+      properties = NNCore::LibNanomsg::NNSymbolProperties.new(pointer)
+
+      [result_size, properties]
+    end
+
+    context "given an initialized library" do
+
+      it "returns the NN_PUB constant among the symbols with correct attributes values" do
+
+        for i in 0..Float::INFINITY
+          result_size, properties = symbol_info(i)
+
+          expect(result_size).to be > 0 if i < 5
+
+          break if result_size == 0
+
+          if properties.name == 'NN_PUB'
+            found_nn_pub = true
+
+            expect(properties.value).to eql(32)
+            expect(properties.ns).to eql(4)
+            expect(properties.type).to eql(0)
+            expect(properties.unit).to eql(0)
+          end
+        end
+
+        expect(found_nn_pub).to be_truthy
+      end
+
+    end
+  end
+end

data/spec/nn_symbol_spec.rb

@@ -9,14 +9,14 @@ module NNCore
         value = FFI::MemoryPointer.new(:int)
 
         constant_string = LibNanomsg.nn_symbol(0, value)
-        constant_string.should be_a(String)
+        expect(constant_string).to be_a(String)
       end
 
       it "returns an integer value in the second parameter given an index of 0" do
         value = FFI::MemoryPointer.new(:int)
 
         constant_string = LibNanomsg.nn_symbol(0, value)
-        value.read_int.should >= 0
+        expect(value.read_int).to be >= 0
       end
 
     end

data/spec/nn_term_spec.rb

@@ -17,8 +17,8 @@ module NNCore
         it "makes subsequent calls to nn_send fail with ETERM" do
           LibNanomsg.nn_term
           rc = LibNanomsg.nn_send(0, "ABC", 3, 0)
-          rc.should == -1
-          LibNanomsg.nn_errno.should == ETERM
+          expect(rc).to eq(-1)
+          expect(LibNanomsg.nn_errno).to eq(ETERM)
         end
 
 #        it "makes subsequent calls to nn_recv fail with ETERM" do

data/spec/spec_helper.rb

@@ -12,7 +12,7 @@ module NNCore
     :NN_RECONNECT_IVL_MAX => NN_RECONNECT_IVL_MAX,
     :NN_SNDPRIO => NN_SNDPRIO
   }
-  
+
   PROTOCOLS = {
     :NN_PUB => NN_PUB,
     :NN_SUB => NN_SUB,
@@ -25,12 +25,12 @@ module NNCore
     :NN_SURVEYOR => NN_SURVEYOR,
     :NN_RESPONDENT => NN_RESPONDENT
   }
-  
+
   ADDRESS_FAMILIES = {
     :AF_SP => AF_SP,
     :AF_SP_RAW => AF_SP_RAW
   }
-  
+
   # Some protocols support the AF_SP_RAW address family, so we need to skip those
   # tests that are expecting a failure.
   RAW_UNSUPPORTED = []

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nn-core
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Chuck Remes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -64,6 +64,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Authors.txt
 - Gemfile
 - History.txt
@@ -80,11 +81,13 @@ files:
 - spec/nn_close_spec.rb
 - spec/nn_connect_spec.rb
 - spec/nn_getsockopt_spec.rb
+- spec/nn_poll_spec.rb
 - spec/nn_recv_spec.rb
 - spec/nn_send_spec.rb
 - spec/nn_setsockopt_spec.rb
 - spec/nn_shutdown_spec.rb
 - spec/nn_socket_spec.rb
+- spec/nn_symbol_info_spec.rb
 - spec/nn_symbol_spec.rb
 - spec/nn_term_spec.rb
 - spec/spec_helper.rb
@@ -107,20 +110,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: nn-core
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Wraps the nanomsg networking library using Ruby FFI (foreign function interface).
-test_files:
-- spec/nn_bind_spec.rb
-- spec/nn_close_spec.rb
-- spec/nn_connect_spec.rb
-- spec/nn_getsockopt_spec.rb
-- spec/nn_recv_spec.rb
-- spec/nn_send_spec.rb
-- spec/nn_setsockopt_spec.rb
-- spec/nn_shutdown_spec.rb
-- spec/nn_socket_spec.rb
-- spec/nn_symbol_spec.rb
-- spec/nn_term_spec.rb
-- spec/spec_helper.rb
+test_files: []
+has_rdoc: