celluloid-zmq 0.0.3 → 0.0.4

data/CHANGES.md

@@ -1,3 +1,11 @@
+0.0.4
+-----
+* Fix bugs in 0MQ polling (timeouts were being processed 1000x too fast)
+
+0.0.3
+-----
+* Fix botched dependencies (celluloid-zmq does not depend on redis)
+
 0.0.2
 -----
 * Pure blocking 0MQ reactor using a ZMQ::PAIR socket as the waker

data/lib/celluloid/zmq/mailbox.rb

@@ -3,9 +3,10 @@ module Celluloid
     # A Celluloid mailbox for Actors that wait on 0MQ sockets
     class Mailbox < Celluloid::IO::Mailbox
       def initialize
+        # More APIs and less monkeypatching would be useful here
         @messages = []
-        @lock  = Mutex.new
-        @waker = Celluloid::ZMQ::Waker.new
+        @lock    = Mutex.new
+        @waker   = Waker.new
         @reactor = Reactor.new(@waker)
       end
     end

data/lib/celluloid/zmq/reactor.rb

@@ -43,7 +43,12 @@ module Celluloid
       # Run the reactor, waiting for events, and calling the given block if
       # the reactor is awoken by the waker
       def run_once(timeout = nil)
-        timeout ||= :blocking
+        if timeout
+          timeout *= 1000 # Poller uses millisecond increments
+        else
+          timeout = :blocking
+        end
+
         rc = @poller.poll(timeout)
 
         unless ::ZMQ::Util.resultcode_ok? rc

data/lib/celluloid/zmq/version.rb

@@ -1,5 +1,5 @@
 module Celluloid
   module ZMQ
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/lib/celluloid/zmq/waker.rb

@@ -36,11 +36,11 @@ module Celluloid
       # Wait for another thread to signal this Waker
       def wait
         message = ''
-  	    rc = @receiver.recv_string message
+        rc = @receiver.recv_string message
 
-  	    unless ::ZMQ::Util.resultcode_ok? rc and message == PAYLOAD
-  	      raise DeadWakerError, "error receiving ZMQ string: #{::ZMQ::Util.error_string}"
-  	    end
+        unless ::ZMQ::Util.resultcode_ok? rc and message == PAYLOAD
+          raise DeadWakerError, "error receiving ZMQ string: #{::ZMQ::Util.error_string}"
+        end
       end
 
       # Clean up the IO objects associated with this waker

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: celluloid-zmq
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-13 00:00:00.000000000 Z
+date: 2011-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
-  requirement: &70277234241760 !ruby/object:Gem::Requirement
+  requirement: &70327771453460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *70277234241760
+  version_requirements: *70327771453460
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &70277234241260 !ruby/object:Gem::Requirement
+  requirement: &70327771452820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70277234241260
+  version_requirements: *70327771452820
 - !ruby/object:Gem::Dependency
   name: ffi-rzmq
-  requirement: &70277234240780 !ruby/object:Gem::Requirement
+  requirement: &70327771450760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70277234240780
+  version_requirements: *70327771450760
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70277234240360 !ruby/object:Gem::Requirement
+  requirement: &70327771450140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70277234240360
+  version_requirements: *70327771450140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70277234239840 !ruby/object:Gem::Requirement
+  requirement: &70327771449480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70277234239840
+  version_requirements: *70327771449480
 description: Celluloid bindings to the ffi-rzmq library
 email:
 - tony.arcieri@gmail.com