celluloid-zmq 0.8.0 → 0.9.0

data/CHANGES.md

@@ -1,3 +1,10 @@
+0.9.0
+-----
+* New 0MQ APIs which wrap ffi-rzmq's
+* Terminate the 0MQ context at shutdown
+* Use Celluloid::IO 0.9.0's reactor injection support so we no longer have to
+  subclass Celluloid::IO::Mailbox
+
 0.8.0
 -----
 * Update to match internals of celluloid-io

data/celluloid-zmq.gemspec

@@ -11,13 +11,13 @@ Gem::Specification.new do |gem|
   gem.name          = "celluloid-zmq"
   gem.version       = Celluloid::ZMQ::VERSION
 
-  gem.add_dependency "celluloid",    "~> 0.8.0"
-  gem.add_dependency "celluloid-io", "~> 0.8.0"
+  gem.add_dependency "celluloid",    "~> 0.9.0"
+  gem.add_dependency "celluloid-io", "~> 0.9.0"
   gem.add_dependency "ffi"
   gem.add_dependency "ffi-rzmq"
 
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "rspec", ">= 2.7.0"
+  gem.add_development_dependency "rspec"
 
   # Files
   ignores = File.read(".gitignore").split(/\r?\n/).reject{ |f| f =~ /^(#.+|\s*)$/ }.map {|f| Dir[f] }.flatten

data/lib/celluloid/zmq.rb

@@ -1,8 +1,8 @@
 require 'ffi-rzmq'
 
 require 'celluloid/io'
-require 'celluloid/zmq/mailbox'
 require 'celluloid/zmq/reactor'
+require 'celluloid/zmq/sockets'
 require 'celluloid/zmq/version'
 require 'celluloid/zmq/waker'
 
@@ -15,19 +15,22 @@ module Celluloid
       # Included hook to pull in Celluloid
       def included(klass)
         klass.send :include, ::Celluloid
-        klass.use_mailbox Celluloid::ZMQ::Mailbox
+        klass.use_mailbox { Celluloid::IO::Mailbox.new ZMQ::Reactor.new }
       end
 
       # Obtain a 0MQ context (or lazily initialize it)
-      def context
-        @context ||= ::ZMQ::Context.new(1)
+      def context(threads = 1)
+        return @context if @context
+        @context = ::ZMQ::Context.new(threads)
+        at_exit { @context.terminate }
+        @context
       end
+      alias_method :init, :context
     end
 
     extend Forwardable
 
     # Wait for the given IO object to become readable/writeable
-    def_delegators 'current_actor.mailbox.reactor',
-      :wait_readable, :wait_writeable
+    def_delegators 'current_actor.mailbox.reactor', :wait_readable, :wait_writeable
   end
 end

data/lib/celluloid/zmq/sockets.rb

@@ -0,0 +1,130 @@
+module Celluloid
+  module ZMQ
+    class Socket
+      # Create a new socket
+      def initialize(type)
+        @socket = Celluloid::ZMQ.context.socket ::ZMQ.const_get(type.to_s.upcase)
+      end
+
+      # Connect to the given 0MQ address
+      # Address should be in the form: tcp://1.2.3.4:5678/
+      def connect(addr)
+        puts "zomg connecting"
+        unless ::ZMQ::Util.resultcode_ok? @socket.connect addr
+          raise IOError, "error connecting to #{addr}: #{::ZMQ::Util.error_string}"
+        end
+        true
+      end
+
+      # Bind to the given 0MQ address
+      # Address should be in the form: tcp://1.2.3.4:5678/
+      def bind(addr)
+        unless ::ZMQ::Util.resultcode_ok? @socket.setsockopt(::ZMQ::LINGER, 0)
+          @socket.close
+          raise IOError, "couldn't set ZMQ::LINGER: #{::ZMQ::Util.error_string}"
+        end
+
+        unless ::ZMQ::Util.resultcode_ok? @socket.bind(addr)
+          raise IOError, "couldn't bind to #{addr}: #{::ZMQ::Util.error_string}"
+        end
+      end
+
+      # Close the socket
+      def close
+        @socket.close
+      end
+
+      # Does the 0MQ socket support evented operation?
+      def evented?
+        actor = Thread.current[:actor]
+        return unless actor
+
+        mailbox = actor.mailbox
+        mailbox.is_a?(Celluloid::IO::Mailbox) && mailbox.reactor.is_a?(Celluloid::ZMQ::Reactor)
+      end
+
+      # Hide ffi-rzmq internals
+      alias_method :inspect, :to_s
+    end
+
+    # Readable 0MQ sockets have a read method
+    module ReadableSocket
+      # Read a message from the socket
+      def read(buffer = '')
+        Celluloid.current_actor.wait_readable(@socket) if evented?
+
+        unless ::ZMQ::Util.resultcode_ok? @socket.recv_string buffer
+          raise IOError, "error receiving ZMQ string: #{::ZMQ::Util.error_string}"
+        end
+        buffer
+      end
+    end
+
+    # Writable 0MQ sockets have a send method
+    module WritableSocket
+      # Send a message to the socket
+      def send(message)
+        unless ::ZMQ::Util.resultcode_ok? @socket.send_string message
+          raise IOError, "error sending 0MQ message: #{::ZMQ::Util.error_string}"
+        end
+
+        message
+      end
+      alias_method :<<, :send
+    end
+
+    # ReqSockets are the counterpart of RepSockets (REQ/REP)
+    class ReqSocket < Socket
+      include ReadableSocket
+
+      def initialize
+        super :req
+      end
+    end
+
+    # RepSockets are the counterpart of ReqSockets (REQ/REP)
+    class RepSocket < Socket
+      include WritableSocket
+
+      def initialize
+        super :rep
+      end
+    end
+
+    # PushSockets are the counterpart of PullSockets (PUSH/PULL)
+    class PushSocket < Socket
+      include WritableSocket
+
+      def initialize
+        super :push
+      end
+    end
+
+    # PullSockets are the counterpart of PushSockets (PUSH/PULL)
+    class PullSocket < Socket
+      include ReadableSocket
+
+      def initialize
+        super :pull
+      end
+    end
+
+    # PubSockets are the counterpart of SubSockets (PUB/SUB)
+    class PubSocket < Socket
+      include WritableSocket
+
+      def initialize
+        super :pub
+      end
+    end
+
+    # SubSockets are the counterpart of PubSockets (PUB/SUB)
+    class SubSocket < Socket
+      include ReadableSocket
+
+      def initialize
+        super :sub
+      end
+    end
+  end
+end

data/lib/celluloid/zmq/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: celluloid-zmq
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-24 00:00:00.000000000 Z
+date: 2012-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
-  requirement: &70168804718540 !ruby/object:Gem::Requirement
+  requirement: &70214687519820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70168804718540
+  version_requirements: *70214687519820
 - !ruby/object:Gem::Dependency
   name: celluloid-io
-  requirement: &70168804717900 !ruby/object:Gem::Requirement
+  requirement: &70214687517520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70168804717900
+  version_requirements: *70214687517520
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &70168804717360 !ruby/object:Gem::Requirement
+  requirement: &70214687516960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70168804717360
+  version_requirements: *70214687516960
 - !ruby/object:Gem::Dependency
   name: ffi-rzmq
-  requirement: &70168804716260 !ruby/object:Gem::Requirement
+  requirement: &70214687516180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70168804716260
+  version_requirements: *70214687516180
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70168804715840 !ruby/object:Gem::Requirement
+  requirement: &70214687515760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,18 +65,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70168804715840
+  version_requirements: *70214687515760
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70168804715220 !ruby/object:Gem::Requirement
+  requirement: &70214687551620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70168804715220
+  version_requirements: *70214687551620
 description: Celluloid bindings to the ffi-rzmq library
 email:
 - tony.arcieri@gmail.com
@@ -87,17 +87,17 @@ files:
 - celluloid-zmq.gemspec
 - CHANGES.md
 - Gemfile
-- lib/celluloid/zmq/mailbox.rb
 - lib/celluloid/zmq/reactor.rb
+- lib/celluloid/zmq/sockets.rb
 - lib/celluloid/zmq/version.rb
 - lib/celluloid/zmq/waker.rb
 - lib/celluloid/zmq.rb
 - pkg/celluloid-zmq-0.0.4.gem
 - pkg/celluloid-zmq-0.7.0.gem
+- pkg/celluloid-zmq-0.8.0.gem
 - Rakefile
 - README.md
 - spec/celluloid/zmq/actor_spec.rb
-- spec/celluloid/zmq/mailbox_spec.rb
 - spec/spec_helper.rb
 - .gitignore
 homepage: http://github.com/tarcieri/dcell
@@ -127,7 +127,6 @@ summary: Celluloid::ZMQ provides concurrent Celluloid actors that can listen for
   events
 test_files:
 - spec/celluloid/zmq/actor_spec.rb
-- spec/celluloid/zmq/mailbox_spec.rb
 - spec/spec_helper.rb
 - .gitignore
 has_rdoc: 

data/lib/celluloid/zmq/mailbox.rb

@@ -1,13 +0,0 @@
-module Celluloid
-  module ZMQ
-    # 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
-        @reactor = Reactor.new
-      end
-    end
-  end
-end

data/spec/celluloid/zmq/mailbox_spec.rb

@@ -1,6 +0,0 @@
-require 'spec_helper'
-require 'celluloid/rspec'
-
-describe Celluloid::ZMQ::Mailbox do
-  it_behaves_like "a Celluloid Mailbox"
-end