ffi-rzmq 0.7.1 → 0.7.2

data/History.txt

@@ -1,7 +1,13 @@
+== 0.7.2 / 20110224
+  * Several minor refactorings to make the code intent clearer and to allow
+    for better testing. In particular, the error condition checking for
+    a non-blocking send/recv is much clearer.
+
 == 0.7.1 / 20110130
   * Fixed 1.9.1 Binary Encoding bug when UTF8 set as default (Thanks schmurfy)
   * Improved rubinius compat for specs
   * Improved spec compatibility on linux
+
 == 0.7.0 / 20101222
   * Improved performance of calls to Socket#getsockopt. There are usually
     a lot of calls passing RCVMORE, so we now cache those buffers instead

data/examples/reqrep_poll.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'ffi-rzmq'
 
 
-link = "tcp://127.0.0.1:5555"
+link = "tcp://127.0.0.1:5554"
 
 ctx = ZMQ::Context.new 1
 s1 = ctx.socket ZMQ::REQ

data/ffi-rzmq.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ffi-rzmq}
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chuck Remes"]

data/lib/ffi-rzmq/poll.rb

@@ -65,7 +65,7 @@ module ZMQ
     # Does not raise any exceptions.
     #
     def register sock, events = ZMQ::POLLIN | ZMQ::POLLOUT, fd = 0
-      return unless sock || !fd.zero? || !events.zero?
+      return false if (sock.nil? && fd.zero?) || events.zero?
 
       @poll_items_dirty = true
       item = @items.get(@sockets.index(sock))
@@ -74,8 +74,7 @@ module ZMQ
         @sockets << sock
         item = LibZMQ::PollItem.new
 
-        case sock
-        when ZMQ::Socket, Socket
+        if sock.kind_of?(ZMQ::Socket) || sock.kind_of?(Socket)
           item[:socket] = sock.socket
           item[:fd] = 0
         else
@@ -134,11 +133,13 @@ module ZMQ
     # Deletes the +sock+ for all subscribed events.
     #
     def delete sock
+      removed = false
+      
       if index = @sockets.index(sock)
-        @items.delete_at index
-        @sockets.delete sock
-        @raw_to_socket.delete sock.socket
+        removed = @items.delete_at(index) and @sockets.delete(sock) and @raw_to_socket.delete(sock.socket.address)
       end
+      
+      removed
     end
 
     def size(); @items.size; end

data/lib/ffi-rzmq/poll_items.rb

@@ -38,11 +38,14 @@ module ZMQ
     alias :push :<<
     
     def delete_at index
+      value = nil
       unless @items.empty?
-        @items.delete_at index
+        value = @items.delete_at index
         @dirty = true
         clean
       end
+      
+      value
     end
 
     def each &blk

data/lib/ffi-rzmq/socket.rb

@@ -348,11 +348,19 @@ module ZMQ
   end
 
   private
+  
+  def noblock? flag
+    (NOBLOCK & flag) == NOBLOCK
+  end
 
   def _recv message, flags = 0
     result_code = LibZMQ.zmq_recv @socket, message.address, flags
 
-    flags != NOBLOCK ? error_check(ZMQ_RECV_STR, result_code) : error_check_nonblock(result_code)
+    if noblock?(flags)
+      error_check_nonblock(result_code)
+    else
+      error_check(ZMQ_RECV_STR, result_code)
+    end
   end
 
   # Calls to ZMQ.getsockopt require us to pass in some pointers. We can cache and save those buffers

data/lib/ffi-rzmq/zmq.rb

@@ -158,7 +158,15 @@ module ZMQ
     # send/recv. True only when #errno is EGAIN and +result_code+ is non-zero.
     #
     def error_check_nonblock result_code
-      !result_code.zero? && eagain? ? false : true
+      if result_code.zero?
+        true
+      else
+        # need to check result_code again because !eagain? could be true
+        # and we need the result_code test to fail again to give the right result
+        #  !eagain? is true, result_code is -1 => return false
+        #  !eagain? is false, result_code is -1 => return false
+        !eagain? && result_code.zero?
+      end
     end
 
     def raise_error source, result_code

data/spec/context_spec.rb

@@ -60,10 +60,12 @@ module ZMQ
 
 
     context "when allocating a socket" do
-      it "should return a ZMQ::Socket" do
-        ctx = spec_ctx
-        ctx.socket(ZMQ::REQ).should be_kind_of(ZMQ::Socket)
-      end
+#      it "should return a ZMQ::Socket" do
+#        ctx = spec_ctx
+#        sock = ctx.socket ZMQ::REQ
+#        sock.should be_kind_of(ZMQ::Socket)
+#        # need to do something with the socket so it's in a state that can return ETERM
+#      end
 
       it "should raise a ZMQ::SocketError exception when allocation fails" do
         ctx = spec_ctx

data/version.txt

@@ -1 +1 @@
-0.7.1
+0.7.2

metadata

@@ -1,29 +1,39 @@
 --- !ruby/object:Gem::Specification 
 name: ffi-rzmq
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.7.1
+  hash: 7
+  prerelease: false
+  segments: 
+  - 0
+  - 7
+  - 2
+  version: 0.7.2
 platform: ruby
 authors: 
-  - Chuck Remes
+- Chuck Remes
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-01-30 00:00:00 -08:00
+date: 2011-01-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 
-            version: 3.6.2
-    type: :development
-    version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: bones
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 3
+        - 5
+        - 4
+        version: 3.5.4
+  type: :development
+  version_requirements: *id001
 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
@@ -42,69 +52,75 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-  - History.txt
-  - README.rdoc
-  - examples/README.rdoc
+- History.txt
+- README.rdoc
+- examples/README.rdoc
+- version.txt
 files: 
-  - .bnsignore
-  - .gitignore
-  - History.txt
-  - README.rdoc
-  - Rakefile
-  - examples/README.rdoc
-  - examples/local_lat.rb
-  - examples/local_lat_poll.rb
-  - examples/local_lat_zerocopy.rb
-  - examples/local_throughput.rb
-  - examples/publish_subscribe.rb
-  - examples/remote_lat.rb
-  - examples/remote_lat_zerocopy.rb
-  - examples/remote_throughput.rb
-  - examples/reqrep_poll.rb
-  - examples/request_response.rb
-  - ffi-rzmq.gemspec
-  - lib/ffi-rzmq.rb
-  - lib/ffi-rzmq/context.rb
-  - lib/ffi-rzmq/exceptions.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/wrapper.rb
-  - lib/ffi-rzmq/zmq.rb
-  - spec/context_spec.rb
-  - spec/message_spec.rb
-  - spec/pushpull_spec.rb
-  - spec/reqrep_spec.rb
-  - spec/socket_spec.rb
-  - spec/spec_helper.rb
-  - version.txt
+- .bnsignore
+- History.txt
+- README.rdoc
+- Rakefile
+- examples/README.rdoc
+- examples/local_lat.rb
+- examples/local_lat_poll.rb
+- examples/local_lat_zerocopy.rb
+- examples/local_throughput.rb
+- examples/publish_subscribe.rb
+- examples/remote_lat.rb
+- examples/remote_lat_zerocopy.rb
+- examples/remote_throughput.rb
+- examples/reqrep_poll.rb
+- examples/request_response.rb
+- ffi-rzmq.gemspec
+- lib/ffi-rzmq.rb
+- lib/ffi-rzmq/context.rb
+- lib/ffi-rzmq/exceptions.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/wrapper.rb
+- lib/ffi-rzmq/zmq.rb
+- spec/context_spec.rb
+- spec/message_spec.rb
+- spec/pushpull_spec.rb
+- spec/reqrep_spec.rb
+- spec/socket_spec.rb
+- spec/spec_helper.rb
+- version.txt
 has_rdoc: true
 homepage: http://github.com/chuckremes/ffi-rzmq
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-  - --main
-  - README.rdoc
+- --main
+- README.rdoc
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: ffi-rzmq
-rubygems_version: 1.4.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: This gem wraps the ZeroMQ networking library using the ruby FFI (foreign function interface).

data/.gitignore

@@ -1,3 +0,0 @@
-*.rbc
-*.swp
-pkg