ffi-rzmq 0.9.0 → 0.9.2

data/lib/ffi-rzmq/version.rb

@@ -0,0 +1,3 @@
+module ZMQ
+  VERSION = "0.9.2"
+end

data/spec/nonblocking_recv_spec.rb

@@ -16,14 +16,24 @@ module ZMQ
 
     shared_examples_for "any socket" do
 
-      it "returns -1 and gets EAGAIN when there are no messages to read" do
+      it "returns -1 when there are no messages to read" do
         array = []
         rc = @receiver.recvmsgs(array, NonBlockingFlag)
         Util.resultcode_ok?(rc).should be_false
-        array.size.should == 0
+      end
+
+      it "gets EAGAIN when there are no messages to read" do
+        array = []
+        rc = @receiver.recvmsgs(array, NonBlockingFlag)
         ZMQ::Util.errno.should == ZMQ::EAGAIN
       end
 
+      it "returns the given array unmodified when there are no messages to read" do
+        array = []
+        rc = @receiver.recvmsgs(array, NonBlockingFlag)
+        array.size.should be_zero
+      end
+
     end
 
     shared_examples_for "sockets without exposed envelopes" do
@@ -222,55 +232,51 @@ module ZMQ
     end # PUSH
 
 
-    unless LibZMQ.version4?
-
-      context "DEALER" do
-
-        describe "non-blocking #recvmsgs where sender connects & receiver binds" do
-          include APIHelper
+    context "DEALER" do
 
-          before(:each) do
-            @receiver = @ctx.socket ZMQ::ROUTER
-            port = bind_to_random_tcp_port(@receiver)
-            @sender = @ctx.socket ZMQ::DEALER
-            assert_ok(@sender.connect("tcp://127.0.0.1:#{port}"))
-            sleep 0.1
-          end
+      describe "non-blocking #recvmsgs where sender connects & receiver binds" do
+        include APIHelper
 
-          after(:each) do
-            @receiver.close
-            @sender.close
-          end
+        before(:each) do
+          @receiver = @ctx.socket ZMQ::ROUTER
+          port = bind_to_random_tcp_port(@receiver)
+          @sender = @ctx.socket ZMQ::DEALER
+          assert_ok(@sender.connect("tcp://127.0.0.1:#{port}"))
+          sleep 0.1
+        end
 
-          it_behaves_like "any socket"
-          it_behaves_like "sockets with exposed envelopes"
+        after(:each) do
+          @receiver.close
+          @sender.close
+        end
 
-        end # describe 'non-blocking recvmsgs'
+        it_behaves_like "any socket"
+        it_behaves_like "sockets with exposed envelopes"
 
-        describe "non-blocking #recvmsgs where sender binds & receiver connects" do
-          include APIHelper
+      end # describe 'non-blocking recvmsgs'
 
-          before(:each) do
-            @receiver = @ctx.socket ZMQ::ROUTER
-            port = connect_to_random_tcp_port(@receiver)
-            @sender = @ctx.socket ZMQ::DEALER
-            assert_ok(@sender.bind("tcp://127.0.0.1:#{port}"))
-            sleep 0.1
-          end
+      describe "non-blocking #recvmsgs where sender binds & receiver connects" do
+        include APIHelper
 
-          after(:each) do
-            @receiver.close
-            @sender.close
-          end
+        before(:each) do
+          @receiver = @ctx.socket ZMQ::ROUTER
+          port = connect_to_random_tcp_port(@receiver)
+          @sender = @ctx.socket ZMQ::DEALER
+          assert_ok(@sender.bind("tcp://127.0.0.1:#{port}"))
+          sleep 0.1
+        end
 
-          it_behaves_like "any socket"
-          it_behaves_like "sockets with exposed envelopes"
+        after(:each) do
+          @receiver.close
+          @sender.close
+        end
 
-        end # describe 'non-blocking recvmsgs'
+        it_behaves_like "any socket"
+        it_behaves_like "sockets with exposed envelopes"
 
-      end # DEALER
+      end # describe 'non-blocking recvmsgs'
 
-    end # unless version4?
+    end # DEALER
 
 
     context "XREQ" do

data/spec/poll_spec.rb

@@ -0,0 +1,84 @@
+$: << "." # added for ruby 1.9.2 compatibilty; it doesn't include the current directory on the load path anymore
+
+require File.join(File.dirname(__FILE__), %w[spec_helper])
+
+module ZMQ
+
+
+  describe Poller do
+
+    context "when initializing" do
+      include APIHelper
+
+      it "should allocate a PollItems instance" do
+        PollItems.should_receive(:new)
+        
+        Poller.new
+      end
+
+    end # context initializing
+    
+    
+    context "#register" do
+      
+      let(:poller) { Poller.new }
+      let(:socket) { mock('socket') }
+      
+      it "should return false when given a nil socket and no file descriptor" do
+        poller.register(nil, ZMQ::POLLIN, 0).should be_false
+      end
+      
+      it "should return false when given 0 for +events+ (e.g. no registration)" do
+        poller.register(socket, 0).should be_false
+      end
+      
+      it "should return the registered event value when given a nil socket and a valid non-zero file descriptor" do
+        poller.register(nil, ZMQ::POLLIN, 1).should == ZMQ::POLLIN
+      end
+      
+      it "should return the default registered event value when given a valid socket" do
+        poller.register(socket).should == (ZMQ::POLLIN | ZMQ::POLLOUT)
+      end
+      
+      it "should access the raw 0mq socket" do
+        raw_socket = FFI::MemoryPointer.new(4)
+        socket.should_receive(:kind_of?).with(ZMQ::Socket).and_return(true)
+        socket.should_receive(:socket).and_return(raw_socket)
+
+        poller.register(socket)
+      end
+    end
+    
+    
+    context "#delete" do
+      let(:poller) { Poller.new }
+      let(:socket) { mock('socket') }
+      let(:context) { Context.new }
+      
+      it "should return false for an unregistered socket (i.e. not found)" do
+        poller.delete(socket).should be_false
+      end
+      
+      it "returns true for a sucessfully deleted socket when only 1 is registered" do
+        socket1 = context.socket ZMQ::REP
+
+        poller.register socket1
+        poller.delete(socket1).should be_true
+      end
+      
+      it "returns true for a sucessfully deleted socket when more than 1 is registered" do
+        socket1 = context.socket ZMQ::REP
+        socket2 = context.socket ZMQ::REP
+
+        poller.register socket1
+        poller.register socket2
+        poller.delete(socket2).should be_true
+      end
+      
+    end
+
+
+  end # describe Poll
+
+
+end # module ZMQ

data/spec/pushpull_spec.rb

@@ -17,6 +17,7 @@ module ZMQ
         @pull.setsockopt ZMQ::LINGER, 0
         port = connect_to_random_tcp_port(@pull)
         @link = "tcp://127.0.0.1:#{port}"
+        #@link = "inproc://push_pull_test" # can't connect to inproc *before* bind
         @push.bind    @link
       end
 
@@ -30,6 +31,7 @@ module ZMQ
         @push.send_string string
         received = ''
         rc = @pull.recv_string received
+        assert_ok(rc)
         received.should == string
       end
 
@@ -63,11 +65,12 @@ module ZMQ
 
       if version2?
 
-        it "should receive a single message for each message sent on each socket listening, when an equal number pulls to messages" do
+        it "should receive a single message for each message sent on each socket listening, when an equal number pulls to messages and a unique socket per thread" do
           received = []
           threads  = []
           count    = 4
           @pull.close # close this one since we aren't going to use it below and we don't want it to receive a message
+          mutex = Mutex.new
 
           count.times do |i|
             threads << Thread.new do
@@ -78,7 +81,7 @@ module ZMQ
               buffer = ''
               rc = pull.recv_string buffer
               rc.should == 0
-              received << buffer
+              mutex.synchronize { received << buffer }
               pull.close
             end
             sleep 0.01 # give each thread time to spin up
@@ -91,6 +94,36 @@ module ZMQ
           received.find_all {|r| r == string}.length.should == count
         end
 
+        it "should receive a single message for each message sent on each socket listening, when an equal number pulls to messages and a single shared socket protected by a mutex" do
+          received = []
+          threads  = []
+          count    = 4
+          @pull.close # close this one since we aren't going to use it below and we don't want it to receive a message
+          pull = @context.socket ZMQ::PULL
+          rc = pull.setsockopt ZMQ::LINGER, 0
+          rc = pull.connect @link
+          rc.should == 0
+          mutex = Mutex.new
+
+          count.times do |i|
+            threads << Thread.new do
+              buffer = ''
+              rc = 0
+              mutex.synchronize { rc = pull.recv_string buffer }
+              rc.should == 0
+              mutex.synchronize { received << buffer }
+            end
+            sleep 0.01 # give each thread time to spin up
+          end
+
+          count.times { @push.send_string(string) }
+
+          threads.each {|t| t.join}
+          pull.close
+
+          received.find_all {|r| r == string}.length.should == count
+        end
+
       else # version3 or 4
 
         it "should receive a single message for each message sent on each socket listening, when an equal number pulls to messages" do

data/spec/socket_spec.rb

@@ -10,8 +10,6 @@ module ZMQ
       [ZMQ::REQ, ZMQ::REP, ZMQ::DEALER, ZMQ::ROUTER, ZMQ::PUB, ZMQ::SUB, ZMQ::PUSH, ZMQ::PULL, ZMQ::PAIR]
     elsif LibZMQ.version3?
       [ZMQ::REQ, ZMQ::REP, ZMQ::DEALER, ZMQ::ROUTER, ZMQ::PUB, ZMQ::SUB, ZMQ::PUSH, ZMQ::PULL, ZMQ::PAIR, ZMQ::XPUB, ZMQ::XSUB]
-    elsif LibZMQ.version4?
-      [ZMQ::REQ, ZMQ::REP, ZMQ::ROUTER, ZMQ::PUB, ZMQ::SUB, ZMQ::PUSH, ZMQ::PULL, ZMQ::PAIR, ZMQ::XPUB, ZMQ::XSUB]
     end
 
     context "when initializing" do

data/spec/spec_helper.rb

@@ -10,19 +10,15 @@ Thread.abort_on_exception = true
 # define some version guards so we can turn on/off specs based upon
 # the version of the 0mq library that is loaded
 def version2?
-  LibZMQ.version2?
+  ZMQ::LibZMQ.version2?
 end
 
 def version3?
-  LibZMQ.version3?
-end
-
-def version4?
-  LibZMQ.version4?
+  ZMQ::LibZMQ.version3?
 end
 
 
-NonBlockingFlag = (LibZMQ.version2? ? ZMQ::NOBLOCK : ZMQ::DONTWAIT) unless defined?(NonBlockingFlag)
+NonBlockingFlag = (ZMQ::LibZMQ.version2? ? ZMQ::NOBLOCK : ZMQ::DONTWAIT) unless defined?(NonBlockingFlag)
 
 
 module APIHelper

metadata

@@ -1,134 +1,156 @@
 --- !ruby/object:Gem::Specification 
 name: ffi-rzmq
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 9
-  - 0
-  version: 0.9.0
+  prerelease: 
+  version: 0.9.2
 platform: ruby
 authors: 
-- Chuck Remes
+  - Chuck Remes
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-09-14 00:00:00 -05:00
+date: 2011-11-30 00:00:00 -06:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: bones
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 5
-        - 4
-        version: 3.5.4
-  type: :development
-  version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: ffi
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 1.0.9
+    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:
   MRI 1.9.x, Rubinius and JRuby.
-email: cremes@mac.com
+email: 
+  - cremes@mac.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- AUTHORS.txt
-- History.txt
-- README.rdoc
-- examples/README.rdoc
-- version.txt
+extra_rdoc_files: []
+
 files: 
-- .bnsignore
-- History.txt
-- README.rdoc
-- Rakefile
-- examples/README.rdoc
-- 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/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
-- 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
-- spec/context_spec.rb
-- spec/device_spec.rb
-- spec/message_spec.rb
-- spec/multipart_spec.rb
-- spec/nonblocking_recv_spec.rb
-- spec/pushpull_spec.rb
-- spec/reqrep_spec.rb
-- spec/socket_spec.rb
-- spec/spec_helper.rb
-- version.txt
-- AUTHORS.txt
+  - .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
 has_rdoc: true
 homepage: http://github.com/chuckremes/ffi-rzmq
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --main
-- README.rdoc
+rdoc_options: []
+
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
 
 rubyforge_project: ffi-rzmq
-rubygems_version: 1.3.7
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: This gem wraps the ZeroMQ (0mq) networking library using Ruby FFI (foreign function interface).
-test_files: []
-
+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