ffi-rzmq 0.9.3 → 0.9.6

data/spec/socket_spec.rb

@@ -5,6 +5,7 @@ module ZMQ
 
 
   describe Socket do
+    include APIHelper
 
     socket_types = if LibZMQ.version2?
       [ZMQ::REQ, ZMQ::REP, ZMQ::DEALER, ZMQ::ROUTER, ZMQ::PUB, ZMQ::SUB, ZMQ::PUSH, ZMQ::PULL, ZMQ::PAIR]
@@ -78,54 +79,52 @@ module ZMQ
     end # context calling close
 
 
-    if version2? || version3?
 
-      context "identity=" do
-        before(:all) { @ctx = Context.new }
-        after(:all) { @ctx.terminate }
+    context "identity=" do
+      before(:all) { @ctx = Context.new }
+      after(:all) { @ctx.terminate }
 
-        it "fails to set identity for identities in excess of 255 bytes" do
-          sock = Socket.new @ctx.pointer, ZMQ::REQ
+      it "fails to set identity for identities in excess of 255 bytes" do
+        sock = Socket.new @ctx.pointer, ZMQ::REQ
 
-          sock.identity = ('a' * 256)
-          sock.identity.should == ''
-          sock.close
-        end
+        sock.identity = ('a' * 256)
+        sock.identity.should == ''
+        sock.close
+      end
 
-        it "fails to set identity for identities of length 0" do
-          sock = Socket.new @ctx.pointer, ZMQ::REQ
+      it "fails to set identity for identities of length 0" do
+        sock = Socket.new @ctx.pointer, ZMQ::REQ
 
-          sock.identity = ''
-          sock.identity.should == ''
-          sock.close
-        end
+        sock.identity = ''
+        sock.identity.should == ''
+        sock.close
+      end
 
-        it "sets the identity for identities of 1 byte" do
-          sock = Socket.new @ctx.pointer, ZMQ::REQ
+      it "sets the identity for identities of 1 byte" do
+        sock = Socket.new @ctx.pointer, ZMQ::REQ
 
-          sock.identity = 'a'
-          sock.identity.should == 'a'
-          sock.close
-        end
+        sock.identity = 'a'
+        sock.identity.should == 'a'
+        sock.close
+      end
 
-        it "set the identity identities of 255 bytes" do
-          sock = Socket.new @ctx.pointer, ZMQ::REQ
+      it "set the identity identities of 255 bytes" do
+        sock = Socket.new @ctx.pointer, ZMQ::REQ
 
-          sock.identity = ('a' * 255)
-          sock.identity.should == ('a' * 255)
-          sock.close
-        end
+        sock.identity = ('a' * 255)
+        sock.identity.should == ('a' * 255)
+        sock.close
+      end
 
-        it "should convert numeric identities to strings" do
-          sock = Socket.new @ctx.pointer, ZMQ::REQ
+      it "should convert numeric identities to strings" do
+        sock = Socket.new @ctx.pointer, ZMQ::REQ
 
-          sock.identity = 7
-          sock.identity.should == '7'
-          sock.close
-        end
-      end # context identity=
+        sock.identity = 7
+        sock.identity.should == '7'
+        sock.close
+      end
+    end # context identity=
 
-    end # version2? || version3?
 
 
     socket_types.each do |socket_type|
@@ -143,31 +142,27 @@ module ZMQ
         end
 
 
-        if version2? || version3?
-
-          context "using option ZMQ::IDENTITY" do
-            it "should set the identity given any string under 255 characters" do
-              length = 4
-              (1..255).each do |length|
-                identity = 'a' * length
-                socket.setsockopt ZMQ::IDENTITY, identity
-
-                array = []
-                rc = socket.getsockopt(ZMQ::IDENTITY, array)
-                rc.should == 0
-                array[0].should == identity
-              end
-            end
+        context "using option ZMQ::IDENTITY" do
+          it "should set the identity given any string under 255 characters" do
+            length = 4
+            (1..255).each do |length|
+              identity = 'a' * length
+              socket.setsockopt ZMQ::IDENTITY, identity
 
-            it "returns -1 given a string 256 characters or longer" do
-              identity = 'a' * 256
               array = []
-              rc = socket.setsockopt(ZMQ::IDENTITY, identity)
-              rc.should == -1
+              rc = socket.getsockopt(ZMQ::IDENTITY, array)
+              rc.should == 0
+              array[0].should == identity
             end
-          end # context using option ZMQ::IDENTITY
+          end
 
-        end # version2? || version3?
+          it "returns -1 given a string 256 characters or longer" do
+            identity = 'a' * 256
+            array = []
+            rc = socket.setsockopt(ZMQ::IDENTITY, identity)
+            rc.should == -1
+          end
+        end # context using option ZMQ::IDENTITY
 
 
         if version2?
@@ -240,7 +235,41 @@ module ZMQ
             end
           end # context using option ZMQ::RECOVERY_IVL_MSEC
 
-        end # version2?
+        else # version3 or higher
+
+          context "using option ZMQ::IPV4ONLY" do
+            it "should enable use of IPV6 sockets when set to 0" do
+              value = 0
+              socket.setsockopt ZMQ::IPV4ONLY, value
+              array = []
+              rc = socket.getsockopt(ZMQ::IPV4ONLY, array)
+              rc.should == 0
+              array[0].should == value
+            end
+
+            it "should default to a value of 1" do
+              value = 1
+              array = []
+              rc = socket.getsockopt(ZMQ::IPV4ONLY, array)
+              rc.should == 0
+              array[0].should == value
+            end
+
+            it "returns -1 given a negative value" do
+              value = -1
+              rc = socket.setsockopt ZMQ::IPV4ONLY, value
+              rc.should == -1
+            end
+
+            it "returns -1 given a value > 1" do
+              value = 2
+              rc = socket.setsockopt ZMQ::IPV4ONLY, value
+              rc.should == -1
+            end
+          end # context using option ZMQ::IPV4ONLY
+
+
+        end # version2? if/else block
 
 
         context "using option ZMQ::SUBSCRIBE" do
@@ -366,7 +395,7 @@ module ZMQ
             array[0].should == value
           end
 
-          if ZMQ::SUB == socket_type || ZMQ::XSUB == socket_type
+          if (ZMQ::SUB == socket_type) && version3? || (defined?(ZMQ::XSUB) && ZMQ::XSUB == socket_type)
             it "should default to a value of 0" do
               value = 0
               array = []
@@ -424,6 +453,7 @@ module ZMQ
             array[0].should == value
           end
         end # context using option ZMQ::BACKLOG
+
       end # context #setsockopt
 
 
@@ -512,7 +542,7 @@ module ZMQ
 
     describe "Mapping socket EVENTS to POLLIN and POLLOUT" do
       include APIHelper
-      
+
       shared_examples_for "pubsub sockets where" do
         it "SUB socket that received a message always has POLLIN set" do
           events = []
@@ -547,37 +577,40 @@ module ZMQ
 
         before(:each) do
           @ctx = Context.new
+          poller_setup
 
+          endpoint = "inproc://socket_test"
           @sub = @ctx.socket ZMQ::SUB
           rc = @sub.setsockopt ZMQ::SUBSCRIBE, ''
+          rc.should == 0
 
           @pub = @ctx.socket ZMQ::PUB
-          port = bind_to_random_tcp_port(@sub)
-          rc = @pub.connect "tcp://127.0.0.1:#{port}"
-          sleep 0.5
+          @sub.bind(endpoint)
+          connect_to_inproc(@pub, endpoint)
 
-          rc = @pub.send_string('test')
-          sleep 0.2
+          @pub.send_string('test')
         end
 
-        it_behaves_like "pubsub sockets where"
+        #it_behaves_like "pubsub sockets where" # see Jira LIBZMQ-270
       end # context SUB binds PUB connects
 
       context "when SUB connects and PUB binds" do
 
         before(:each) do
           @ctx = Context.new
+          poller_setup
 
+          endpoint = "inproc://socket_test"
           @sub = @ctx.socket ZMQ::SUB
           rc = @sub.setsockopt ZMQ::SUBSCRIBE, ''
 
           @pub = @ctx.socket ZMQ::PUB
-          port = bind_to_random_tcp_port(@pub)
-          rc = @sub.connect "tcp://127.0.0.1:#{port}"
-          sleep 0.5
+          @pub.bind(endpoint)
+          connect_to_inproc(@sub, endpoint)
 
-          rc = @pub.send_string('test')
-          sleep 0.2
+          poll_it_for_read(@sub) do
+            rc = @pub.send_string('test')
+          end
         end
 
         it_behaves_like "pubsub sockets where"

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@
 require File.expand_path(
 File.join(File.dirname(__FILE__), %w[.. lib ffi-rzmq]))
 
+require 'thread' # necessary when testing in MRI 1.8 mode
 Thread.abort_on_exception = true
 
 # define some version guards so we can turn on/off specs based upon
@@ -18,8 +19,19 @@ def version3?
 end
 
 
-NonBlockingFlag = (ZMQ::LibZMQ.version2? ? ZMQ::NOBLOCK : ZMQ::DONTWAIT) unless defined?(NonBlockingFlag)
+SLEEP_SHORT = 0.1
+SLEEP_LONG = 0.3
 
+def delivery_sleep() sleep(SLEEP_SHORT); end
+def connect_sleep() sleep(SLEEP_SHORT); end
+def bind_sleep() sleep(SLEEP_LONG); end
+def thread_startup_sleep() sleep(1.0); end
+
+def connect_to_inproc(socket, endpoint)
+  begin
+    rc = socket.connect(endpoint)
+  end until ZMQ::Util.resultcode_ok?(rc)
+end
 
 module APIHelper
   def stub_libzmq
@@ -31,20 +43,48 @@ module APIHelper
     :zmq_sterror => @err_str_mock
     )
   end
+  
+  def poller_setup
+    @helper_poller ||= ZMQ::Poller.new
+  end
+  
+  def poller_register_socket(socket)
+    @helper_poller.register(socket, ZMQ::POLLIN)
+  end
+  
+  def poller_deregister_socket(socket)
+    @helper_poller.deregister(socket, ZMQ::POLLIN)
+  end
+  
+  def poll_delivery
+    # timeout after 1 second
+    @helper_poller.poll(1000)
+  end
+  
+  def poll_it_for_read(socket, &blk)
+    poller_register_socket(socket)
+    blk.call
+    poll_delivery
+    poller_deregister_socket(socket)
+  end
 
   # generate a random port between 10_000 and 65534
   def random_port
     rand(55534) + 10_000
   end
 
-  def bind_to_random_tcp_port socket, max_tries = 500
+  def bind_to_random_tcp_port(socket, max_tries = 500)
     tries = 0
     rc = -1
 
     while !ZMQ::Util.resultcode_ok?(rc) && tries < max_tries
       tries += 1
       random = random_port
-      rc = socket.bind "tcp://127.0.0.1:#{random}"
+      rc = socket.bind(local_transport_string(random))
+    end
+
+    unless ZMQ::Util.resultcode_ok?(rc)
+      raise "Could not bind to random port successfully; retries all failed!"
     end
 
     random
@@ -57,12 +97,20 @@ module APIHelper
     while !ZMQ::Util.resultcode_ok?(rc) && tries < max_tries
       tries += 1
       random = random_port
-      rc = socket.connect "tcp://127.0.0.1:#{random}"
+      rc = socket.connect(local_transport_string(random))
+    end
+
+    unless ZMQ::Util.resultcode_ok?(rc)
+      raise "Could not connect to random port successfully; retries all failed!"
     end
 
     random
   end
 
+  def local_transport_string(port)
+    "tcp://127.0.0.1:#{port}"
+  end
+
   def assert_ok(rc)
     raise "Failed with rc [#{rc}] and errno [#{ZMQ::Util.errno}], msg [#{ZMQ::Util.error_string}]! #{caller(0)}" unless rc >= 0
   end

metadata

@@ -1,154 +1,174 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ffi-rzmq
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.9.3
+version: !ruby/object:Gem::Version
+  prerelease:
+  version: 0.9.6
 platform: ruby
-authors: 
-  - Chuck Remes
-autorequire: 
+authors:
+- Chuck Remes
+autorequire:
 bindir: bin
 cert_chain: []
+date: 2012-08-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: ffi
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: rspec
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rake
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
+description: This gem wraps the ZeroMQ networking library using the ruby FFI (foreign
 
-date: 2011-12-20 00:00:00 Z
-dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: ffi
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    type: :runtime
-    version_requirements: *id001
-  - !ruby/object:Gem::Dependency 
-    name: rspec
-    prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: "2.6"
-    type: :development
-    version_requirements: *id002
-  - !ruby/object:Gem::Dependency 
-    name: rake
-    prerelease: false
-    requirement: &id003 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    type: :development
-    version_requirements: *id003
-description: |-
-  This gem wraps the ZeroMQ networking library using the ruby FFI (foreign
   function interface). It's a pure ruby wrapper so this gem can be loaded
-  and run by any ruby runtime that supports FFI. That's all of them:
+
+  and run by any ruby runtime that supports FFI. That's all of them -
+
   MRI 1.9.x, Rubinius and JRuby.
-email: 
-  - cremes@mac.com
+email:
+- git@chuckremes.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-  - .bnsignore
-  - .gitignore
-  - AUTHORS.txt
-  - Gemfile
-  - History.txt
-  - README.rdoc
-  - Rakefile
-  - examples/README.rdoc
-  - examples/v2api/latency_measurement.rb
-  - examples/v2api/local_lat.rb
-  - examples/v2api/local_lat_poll.rb
-  - examples/v2api/local_throughput.rb
-  - examples/v2api/publish_subscribe.rb
-  - examples/v2api/remote_lat.rb
-  - examples/v2api/remote_throughput.rb
-  - examples/v2api/reqrep_poll.rb
-  - examples/v2api/request_response.rb
-  - examples/v2api/throughput_measurement.rb
-  - examples/v2api/xreqxrep_poll.rb
-  - examples/v3api/latency_measurement.rb
-  - examples/v3api/local_lat.rb
-  - examples/v3api/local_lat_poll.rb
-  - examples/v3api/local_throughput.rb
-  - examples/v3api/publish_subscribe.rb
-  - examples/v3api/remote_lat.rb
-  - examples/v3api/remote_throughput.rb
-  - examples/v3api/reqrep_poll.rb
-  - examples/v3api/request_response.rb
-  - examples/v3api/throughput_measurement.rb
-  - examples/v3api/xreqxrep_poll.rb
-  - ext/README
-  - ffi-rzmq.gemspec
-  - lib/ffi-rzmq.rb
-  - lib/ffi-rzmq/constants.rb
-  - lib/ffi-rzmq/context.rb
-  - lib/ffi-rzmq/device.rb
-  - lib/ffi-rzmq/exceptions.rb
-  - lib/ffi-rzmq/libc.rb
-  - lib/ffi-rzmq/libzmq.rb
-  - lib/ffi-rzmq/message.rb
-  - lib/ffi-rzmq/poll.rb
-  - lib/ffi-rzmq/poll_items.rb
-  - lib/ffi-rzmq/socket.rb
-  - lib/ffi-rzmq/util.rb
-  - lib/ffi-rzmq/version.rb
-  - spec/context_spec.rb
-  - spec/device_spec.rb
-  - spec/message_spec.rb
-  - spec/multipart_spec.rb
-  - spec/nonblocking_recv_spec.rb
-  - spec/poll_spec.rb
-  - spec/pushpull_spec.rb
-  - spec/reqrep_spec.rb
-  - spec/socket_spec.rb
-  - spec/spec_helper.rb
+files:
+- .bnsignore
+- .gitignore
+- AUTHORS.txt
+- Gemfile
+- History.txt
+- README.rdoc
+- Rakefile
+- examples/README.rdoc
+- examples/v2api/latency_measurement.rb
+- examples/v2api/local_lat.rb
+- examples/v2api/local_lat_poll.rb
+- examples/v2api/local_throughput.rb
+- examples/v2api/pub.rb
+- examples/v2api/publish_subscribe.rb
+- examples/v2api/remote_lat.rb
+- examples/v2api/remote_throughput.rb
+- examples/v2api/reqrep_poll.rb
+- examples/v2api/request_response.rb
+- examples/v2api/sub.rb
+- examples/v2api/throughput_measurement.rb
+- examples/v2api/xreqxrep_poll.rb
+- examples/v3api/latency_measurement.rb
+- examples/v3api/local_lat.rb
+- examples/v3api/local_lat_poll.rb
+- examples/v3api/local_throughput.rb
+- examples/v3api/pub.rb
+- examples/v3api/publish_subscribe.rb
+- examples/v3api/remote_lat.rb
+- examples/v3api/remote_throughput.rb
+- examples/v3api/reqrep_poll.rb
+- examples/v3api/request_response.rb
+- examples/v3api/sub.rb
+- examples/v3api/throughput_measurement.rb
+- examples/v3api/xreqxrep_poll.rb
+- ext/README
+- ffi-rzmq.gemspec
+- lib/ffi-rzmq.rb
+- lib/ffi-rzmq/constants.rb
+- lib/ffi-rzmq/context.rb
+- lib/ffi-rzmq/device.rb
+- lib/ffi-rzmq/exceptions.rb
+- lib/ffi-rzmq/libc.rb
+- lib/ffi-rzmq/libzmq.rb
+- lib/ffi-rzmq/message.rb
+- lib/ffi-rzmq/poll.rb
+- lib/ffi-rzmq/poll_items.rb
+- lib/ffi-rzmq/socket.rb
+- lib/ffi-rzmq/util.rb
+- lib/ffi-rzmq/version.rb
+- spec/context_spec.rb
+- spec/device_spec.rb
+- spec/message_spec.rb
+- spec/multipart_spec.rb
+- spec/nonblocking_recv_spec.rb
+- spec/poll_spec.rb
+- spec/pushpull_spec.rb
+- spec/reqrep_spec.rb
+- spec/socket_spec.rb
+- spec/spec_helper.rb
 homepage: http://github.com/chuckremes/ffi-rzmq
 licenses: []
-
-post_install_message: 
+post_install_message:
 rdoc_options: []
-
-require_paths: 
-  - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: !binary |-
+        MA==
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: !binary |-
+        MA==
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
 requirements: []
-
 rubyforge_project: ffi-rzmq
-rubygems_version: 1.8.9
-signing_key: 
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
 summary: This gem wraps the ZeroMQ (0mq) networking library using Ruby FFI (foreign function interface).
-test_files: 
-  - spec/context_spec.rb
-  - spec/device_spec.rb
-  - spec/message_spec.rb
-  - spec/multipart_spec.rb
-  - spec/nonblocking_recv_spec.rb
-  - spec/poll_spec.rb
-  - spec/pushpull_spec.rb
-  - spec/reqrep_spec.rb
-  - spec/socket_spec.rb
-  - spec/spec_helper.rb
+test_files:
+- spec/context_spec.rb
+- spec/device_spec.rb
+- spec/message_spec.rb
+- spec/multipart_spec.rb
+- spec/nonblocking_recv_spec.rb
+- spec/poll_spec.rb
+- spec/pushpull_spec.rb
+- spec/reqrep_spec.rb
+- spec/socket_spec.rb
+- spec/spec_helper.rb