celluloid-zmq 0.7.0 → 0.8.0

data/CHANGES.md

@@ -1,3 +1,7 @@
+0.8.0
+-----
+* Update to match internals of celluloid-io
+
 0.7.0
 -----
 * Use celluloid-io gem

data/celluloid-zmq.gemspec

@@ -11,8 +11,8 @@ Gem::Specification.new do |gem|
   gem.name          = "celluloid-zmq"
   gem.version       = Celluloid::ZMQ::VERSION
 
-  gem.add_dependency "celluloid",    ">= 0.7.0"
-  gem.add_dependency "celluloid-io", ">= 0.7.0"
+  gem.add_dependency "celluloid",    "~> 0.8.0"
+  gem.add_dependency "celluloid-io", "~> 0.8.0"
   gem.add_dependency "ffi"
   gem.add_dependency "ffi-rzmq"
 

data/lib/celluloid/zmq.rb

@@ -24,15 +24,10 @@ module Celluloid
       end
     end
 
-    # Wait for the given IO object to become readable
-    def wait_readable(socket)
-      # Law of demeter be damned!
-      current_actor.mailbox.reactor.wait_readable(socket)
-    end
+    extend Forwardable
 
-    # Wait for the given IO object to become writeable
-    def wait_writeable(socket)
-      current_actor.mailbox.reactor.wait_writeable(socket)
-    end
+    # Wait for the given IO object to become readable/writeable
+    def_delegators 'current_actor.mailbox.reactor',
+      :wait_readable, :wait_writeable
   end
 end

data/lib/celluloid/zmq/mailbox.rb

@@ -6,8 +6,7 @@ module Celluloid
         # More APIs and less monkeypatching would be useful here
         @messages = []
         @lock    = Mutex.new
-        @waker   = Waker.new
-        @reactor = Reactor.new(@waker)
+        @reactor = Reactor.new
       end
     end
   end

data/lib/celluloid/zmq/reactor.rb

@@ -3,8 +3,13 @@ module Celluloid
     # React to incoming 0MQ and Celluloid events. This is kinda sorta supposed
     # to resemble the Reactor design pattern.
     class Reactor
-      def initialize(waker)
-        @waker = waker
+      extend Forwardable
+
+      def_delegator :@waker, :signal, :wakeup
+      def_delegator :@waker, :cleanup, :shutdown
+
+      def initialize
+        @waker = Waker.new
         @poller = ::ZMQ::Poller.new
         @readers = {}
         @writers = {}
@@ -30,13 +35,12 @@ module Celluloid
         if set.has_key? socket
           raise ArgumentError, "another method is already waiting on #{socket.inspect}"
         else
-          set[socket] = Fiber.current
+          set[socket] = Task.current
         end
 
         @poller.register socket, type
-        Fiber.yield
 
-        @poller.deregister socket, type
+        Task.suspend :zmqwait
         socket
       end
 
@@ -57,16 +61,28 @@ module Celluloid
 
         @poller.readables.each do |sock|
           if sock == @waker.socket
-            yield
+            @waker.wait
           else
-            fiber = @readers.delete sock
-            fiber.resume if fiber
+            task = @readers.delete sock
+            @poller.deregister sock, ::ZMQ::POLLIN
+
+            if task
+              task.resume
+            else
+              Celluloid::Logger.debug "ZMQ error: got read event without associated reader"
+            end
           end
         end
 
         @poller.writables.each do |sock|
-          fiber = @writers.delete sock
-          fiber.resume if fiber
+          task = @writers.delete sock
+          @poller.deregister sock, ::ZMQ::POLLOUT
+
+          if task
+            task.resume
+          else
+            Celluloid::Logger.debug "ZMQ error: got write event without associated reader"
+          end
         end
       end
     end

data/lib/celluloid/zmq/version.rb

@@ -1,5 +1,5 @@
 module Celluloid
   module ZMQ
-    VERSION = "0.7.0"
+    VERSION = "0.8.0"
   end
 end

data/lib/celluloid/zmq/waker.rb

@@ -1,6 +1,7 @@
 module Celluloid
   module ZMQ
-    class DeadWakerError < Celluloid::IO::DeadWakerError; end # You can't wake the dead
+    # You can't wake the dead
+    DeadWakerError = Class.new IOError
 
     # Wakes up sleepy threads so that they can check their mailbox
     # Works like a ConditionVariable, except it's implemented as a ZMQ socket

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: celluloid-zmq
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-29 00:00:00.000000000 Z
+date: 2012-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
-  requirement: &70174602938680 !ruby/object:Gem::Requirement
+  requirement: &70168804718540 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70174602938680
+  version_requirements: *70168804718540
 - !ruby/object:Gem::Dependency
   name: celluloid-io
-  requirement: &70174602938180 !ruby/object:Gem::Requirement
+  requirement: &70168804717900 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70174602938180
+  version_requirements: *70168804717900
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &70174602937780 !ruby/object:Gem::Requirement
+  requirement: &70168804717360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70174602937780
+  version_requirements: *70168804717360
 - !ruby/object:Gem::Dependency
   name: ffi-rzmq
-  requirement: &70174602937280 !ruby/object:Gem::Requirement
+  requirement: &70168804716260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70174602937280
+  version_requirements: *70168804716260
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70174602936840 !ruby/object:Gem::Requirement
+  requirement: &70168804715840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174602936840
+  version_requirements: *70168804715840
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70174602936280 !ruby/object:Gem::Requirement
+  requirement: &70168804715220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70174602936280
+  version_requirements: *70168804715220
 description: Celluloid bindings to the ffi-rzmq library
 email:
 - tony.arcieri@gmail.com
@@ -93,6 +93,7 @@ files:
 - lib/celluloid/zmq/waker.rb
 - lib/celluloid/zmq.rb
 - pkg/celluloid-zmq-0.0.4.gem
+- pkg/celluloid-zmq-0.7.0.gem
 - Rakefile
 - README.md
 - spec/celluloid/zmq/actor_spec.rb
@@ -129,3 +130,4 @@ test_files:
 - spec/celluloid/zmq/mailbox_spec.rb
 - spec/spec_helper.rb
 - .gitignore
+has_rdoc: