nn-core 0.1.0 → 0.1.5

data/History.txt

@@ -1,3 +1,10 @@
+20130215 / 0.1.5
+	*	libnanomsg has removed the nn_init and nn_term functions. Updated
+		specs to remove those features.
+		
+	*	Added NN_BUS protocol.
+
+
 20130204 / 0.1.0
 	* Initial release. Wrapped the nanomsg library as of commit 
 		5ded934af0.

data/lib/nn-core/constants.rb

@@ -32,6 +32,9 @@ module NNCore
   NN_SURVEY_ID = 6
   NN_SURVEYOR = (NN_SURVEY_ID * 16 + 0)
   NN_RESPONDENT = (NN_SURVEY_ID * 16 + 1)
+  
+  NN_BUS_ID = 7
+  NN_BUS = (NN_BUS_ID * 16 + 0)
 
   # Socket Option Levels (SOL)
   NN_SOL_SOCKET = 0
@@ -81,5 +84,5 @@ module NNCore
   EFSM = Errno::EFSM::Errno rescue NN_HAUSNUMERO + 54
 
   # Miscellaneous
-  NN_INPROCB_NAMELEN_MAX = 64
+  NN_SOCKADDR_MAX = 128
 end

data/lib/nn-core/libnanomsg.rb

@@ -35,8 +35,6 @@ module NNCore
 
     attach_function :nn_version, [:pointer, :pointer, :pointer], :int
     
-    attach_function :nn_init, [], :int
-    attach_function :nn_term, [], :int
     attach_function :nn_errno, [], :int
     attach_function :nn_strerror, [:int], :string
     attach_function :nn_socket, [:int, :int], :int

data/lib/nn-core/version.rb

@@ -1,3 +1,3 @@
 module NNCore
-  VERSION = "0.1.0"
+  VERSION = "0.1.5"
 end

data/spec/nn_bind_spec.rb

@@ -4,19 +4,14 @@ module NNCore
   describe "nn_bind" do
 
     context "given an initialized library and" do
-      before(:each) { LibNanomsg.nn_init }
-      after(:each) { LibNanomsg.nn_term }
-
 
       context "given a valid socket" do
         before(:each) do
-          LibNanomsg.nn_init
           @socket = LibNanomsg.nn_socket(AF_SP, NN_PUB)
         end
 
         after(:each) do
           LibNanomsg.nn_close(@socket)
-          LibNanomsg.nn_term
         end
 
         it "returns a non-zero endpoint number for a valid INPROC address" do
@@ -41,7 +36,7 @@ module NNCore
         end
 
         it "returns -1 for an invalid INPROC address (too long)" do
-          rc = LibNanomsg.nn_bind(@socket, "inproc://#{'a' * (NN_INPROCB_NAMELEN_MAX + 1)}")
+          rc = LibNanomsg.nn_bind(@socket, "inproc://#{'a' * (NN_SOCKADDR_MAX + 1)}")
           rc.should == -1
           LibNanomsg.nn_errno.should == ENAMETOOLONG
         end

data/spec/nn_close_spec.rb

@@ -3,19 +3,7 @@ require 'spec_helper'
 module NNCore
   describe "nn_close" do
 
-    context "given an unitialized library" do
-      before(:each) { LibNanomsg.nn_term }
-
-      it "returns -1 and sets nn_errno to EFAULT" do
-        LibNanomsg.nn_close(0).should == -1
-        LibNanomsg.nn_errno.should == EFAULT
-      end
-
-    end
-
     context "given an initialized library and" do
-      before(:each) { LibNanomsg.nn_init }
-      after(:each) { LibNanomsg.nn_term }
 
       context "given a valid socket" do
         before(:each) { @socket = LibNanomsg.nn_socket(AF_SP, NN_PUB) }

data/spec/nn_connect_spec.rb

@@ -10,19 +10,14 @@ module NNCore
   describe "nn_connect" do
 
     context "given an initialized library and" do
-      before(:each) { LibNanomsg.nn_init }
-      after(:each) { LibNanomsg.nn_term }
-
 
       context "given a valid socket" do
         before(:each) do
-          LibNanomsg.nn_init
           @socket = LibNanomsg.nn_socket(AF_SP, NN_PUB)
         end
 
         after(:each) do
           LibNanomsg.nn_close(@socket)
-          LibNanomsg.nn_term
         end
 
         it "returns a non-zero endpoint number for a valid INPROC address" do
@@ -47,7 +42,7 @@ module NNCore
         end
 
         it "returns -1 for an invalid INPROC address (too long)" do
-          rc = LibNanomsg.nn_connect(@socket, "inproc://#{'a' * (NN_INPROCB_NAMELEN_MAX + 1)}")
+          rc = LibNanomsg.nn_connect(@socket, "inproc://#{'a' * (NN_SOCKADDR_MAX + 1)}")
           rc.should == -1
           LibNanomsg.nn_errno.should == ENAMETOOLONG
         end

data/spec/nn_getsockopt_spec.rb

@@ -4,13 +4,9 @@ module NNCore
   describe "nn_getsockopt" do
 
     context "given an initialized library and" do
-      before(:each) { LibNanomsg.nn_init }
-      after(:each) { LibNanomsg.nn_term }
-
 
       context "given a valid socket" do
         before(:each) do
-          LibNanomsg.nn_init
           @socket = LibNanomsg.nn_socket(AF_SP, NN_PUB)
           @option = FFI::MemoryPointer.new(:int32)
           @size = FFI::MemoryPointer.new :size_t
@@ -19,7 +15,6 @@ module NNCore
 
         after(:each) do
           LibNanomsg.nn_close(@socket)
-          LibNanomsg.nn_term
         end
 
         it "NN_LINGER returns a default of 1000" do

data/spec/nn_recv_spec.rb

@@ -4,13 +4,9 @@ module NNCore
   describe "nn_recv" do
 
     context "given an initialized library and" do
-      before(:each) { LibNanomsg.nn_init }
-      after(:each) { LibNanomsg.nn_term }
-
 
       context "given a valid connected sender and receiver socket pair" do
         before(:each) do
-          LibNanomsg.nn_init
           @socket = LibNanomsg.nn_socket(AF_SP, NN_PAIR)
           @sender = LibNanomsg.nn_socket(AF_SP, NN_PAIR)
           @endpoint = LibNanomsg.nn_bind(@socket, "inproc://some_endpoint")
@@ -20,7 +16,6 @@ module NNCore
         after(:each) do
           LibNanomsg.nn_close(@socket)
           LibNanomsg.nn_close(@sender)
-          LibNanomsg.nn_term
         end
 
         context "given a pre-allocated buffer" do
@@ -37,7 +32,6 @@ module NNCore
         end
         
         context "given no pre-allocated buffer" do
-          
 
           it "returns the number of bytes received and returns the buffer" do
             string = "ABC"

data/spec/nn_send_spec.rb

@@ -4,19 +4,14 @@ module NNCore
   describe "nn_send" do
 
     context "given an initialized library and" do
-      before(:each) { LibNanomsg.nn_init }
-      after(:each) { LibNanomsg.nn_term }
-
 
       context "given a valid socket" do
         before(:each) do
-          LibNanomsg.nn_init
           @socket = LibNanomsg.nn_socket(AF_SP, NN_PUB)
         end
 
         after(:each) do
           LibNanomsg.nn_close(@socket)
-          LibNanomsg.nn_term
         end
 
         context "given a valid endpoint" do

data/spec/nn_setsockopt_spec.rb

@@ -4,13 +4,9 @@ module NNCore
   describe "nn_setsockopt" do
 
     context "given an initialized library and" do
-      before(:each) { LibNanomsg.nn_init }
-      after(:each) { LibNanomsg.nn_term }
-
 
       context "given a valid socket" do
         before(:each) do
-          LibNanomsg.nn_init
           @socket = LibNanomsg.nn_socket(AF_SP, NN_PUB)
           @option = FFI::MemoryPointer.new(:int32)
           @size = FFI::MemoryPointer.new :size_t
@@ -19,7 +15,6 @@ module NNCore
 
         after(:each) do
           LibNanomsg.nn_close(@socket)
-          LibNanomsg.nn_term
         end
 
         SOCKET_OPTIONS.keys.each do |socket_option|

data/spec/nn_shutdown_spec.rb

@@ -4,19 +4,14 @@ module NNCore
   describe "nn_shutdown" do
 
     context "given an initialized library and" do
-      before(:each) { LibNanomsg.nn_init }
-      after(:each) { LibNanomsg.nn_term }
-
 
       context "given a valid socket and" do
         before(:each) do
-          LibNanomsg.nn_init
           @socket = LibNanomsg.nn_socket(AF_SP, NN_PUB)
         end
 
         after(:each) do
           LibNanomsg.nn_close(@socket)
-          LibNanomsg.nn_term
         end
 
         context "given a valid endpoint" do

data/spec/nn_socket_spec.rb

@@ -4,8 +4,6 @@ module NNCore
   describe "nn_socket" do
 
     context "given an initialized library and" do
-      before(:each) { LibNanomsg.nn_init }
-      after(:each) { LibNanomsg.nn_term }
 
       PROTOCOLS.keys.each do |protocol|
 
@@ -13,20 +11,22 @@ module NNCore
 
           it "returns a non-zero file descriptor for the socket" do
             @socket = LibNanomsg.nn_socket(AF_SP, PROTOCOLS[protocol])
-            
+
             @socket.should == 0
-            
+
             LibNanomsg.nn_close(@socket)
           end
         end
 
         context "given a supported protocol #{protocol} and address family AF_SP_RAW" do
 
-          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
+          if RAW_UNSUPPORTED.include?(protocol)
+            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
+            end
           end
         end
 

data/spec/nn_version_spec.rb

@@ -4,8 +4,6 @@ module NNCore
   describe "nn_bind" do
 
     context "given an initialized library" do
-      before(:each) { LibNanomsg.nn_init }
-      after(:each) { LibNanomsg.nn_term }
 
       it "returns 0 and populates the pointers with the major, minor and patch version numbers" do
         major = FFI::MemoryPointer.new(:int)

data/spec/spec_helper.rb

@@ -15,11 +15,25 @@ module NNCore
   
   PROTOCOLS = {
     :NN_PUB => NN_PUB,
-    :NN_SUB => NN_SUB
+    :NN_SUB => NN_SUB,
+    :NN_BUS => NN_BUS,
+    :NN_PAIR => NN_PAIR,
+    :NN_REQ => NN_REQ,
+    :NN_REP => NN_REP,
+    :NN_SOURCE => NN_SOURCE,
+    :NN_SINK => NN_SINK,
+    :NN_PUSH => NN_PUSH,
+    :NN_PULL => NN_PULL,
+    :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 = [:NN_PUB, :NN_SUB]
 end

metadata

@@ -2,14 +2,14 @@
 name: nn-core
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.1.0
+  version: 0.1.5
 platform: ruby
 authors:
 - Chuck Remes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2013-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   prerelease: false
@@ -19,6 +19,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
     none: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -26,7 +27,6 @@ dependencies:
         version: '0'
     none: false
   name: ffi
-  type: :runtime
 - !ruby/object:Gem::Dependency
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
@@ -35,6 +35,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.6'
     none: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
@@ -42,7 +43,6 @@ dependencies:
         version: '2.6'
     none: false
   name: rspec
-  type: :development
 - !ruby/object:Gem::Dependency
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
@@ -51,6 +51,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
     none: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -58,7 +59,6 @@ dependencies:
         version: '0'
     none: false
   name: rake
-  type: :development
 description: ! 'Wraps the nanomsg networking library using the ruby FFI (foreign
 
   function interface). It only exposes the native C API to Ruby. Other gems should
@@ -105,8 +105,6 @@ files:
   c3BlYy9ubl9jb25uZWN0X3NwZWMucmI=
 - !binary |-
   c3BlYy9ubl9nZXRzb2Nrb3B0X3NwZWMucmI=
-- !binary |-
-  c3BlYy9ubl9pbml0X3NwZWMucmI=
 - !binary |-
   c3BlYy9ubl9yZWN2X3NwZWMucmI=
 - !binary |-
@@ -117,8 +115,6 @@ files:
   c3BlYy9ubl9zaHV0ZG93bl9zcGVjLnJi
 - !binary |-
   c3BlYy9ubl9zb2NrZXRfc3BlYy5yYg==
-- !binary |-
-  c3BlYy9ubl90ZXJtX3NwZWMucmI=
 - !binary |-
   c3BlYy9ubl92ZXJzaW9uX3NwZWMucmI=
 - !binary |-
@@ -156,8 +152,6 @@ test_files:
   c3BlYy9ubl9jb25uZWN0X3NwZWMucmI=
 - !binary |-
   c3BlYy9ubl9nZXRzb2Nrb3B0X3NwZWMucmI=
-- !binary |-
-  c3BlYy9ubl9pbml0X3NwZWMucmI=
 - !binary |-
   c3BlYy9ubl9yZWN2X3NwZWMucmI=
 - !binary |-
@@ -168,8 +162,6 @@ test_files:
   c3BlYy9ubl9zaHV0ZG93bl9zcGVjLnJi
 - !binary |-
   c3BlYy9ubl9zb2NrZXRfc3BlYy5yYg==
-- !binary |-
-  c3BlYy9ubl90ZXJtX3NwZWMucmI=
 - !binary |-
   c3BlYy9ubl92ZXJzaW9uX3NwZWMucmI=
 - !binary |-

data/spec/nn_init_spec.rb

@@ -1,11 +0,0 @@
-require 'spec_helper'
-
-module NNCore
-  describe "nn_init" do
-
-    it "returns 0 for successful library initialization" do
-      LibNanomsg.nn_init.should be_zero
-    end
-
-  end
-end

data/spec/nn_term_spec.rb

@@ -1,17 +0,0 @@
-require 'spec_helper'
-
-module NNCore
-  describe "nn_term" do
-
-    context "given an initialized library and" do
-      before(:each) { LibNanomsg.nn_init }
-      after(:each) { LibNanomsg.nn_term }
-
-      it "returns 0 for successful library termination" do
-        LibNanomsg.nn_term.should be_zero
-      end
-
-    end
-
-  end
-end