celluloid-zmq 0.10.0 → 0.12.0

data/CHANGES.md

@@ -1,3 +1,7 @@
+0.12.0
+------
+* Tracking release for Celluloid 0.12.0
+
 0.10.0
 ------
 * Factor celluloid-zmq into its own gem

data/README.md

@@ -58,7 +58,7 @@ class Server
   end
 
   def run
-    while true; handle_message! @socket.read; end
+    loop { handle_message! @socket.read }
   end
 
   def handle_message(message)

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.10.0"
-  gem.add_dependency "celluloid-io", "~> 0.10.0"
+  gem.add_dependency "celluloid",    "~> 0.12.0"
+  gem.add_dependency "celluloid-io", "~> 0.12.0"
   gem.add_dependency "ffi"
   gem.add_dependency "ffi-rzmq"
 

data/lib/celluloid/zmq.rb

@@ -19,13 +19,15 @@ module Celluloid
       end
 
       # Obtain a 0MQ context (or lazily initialize it)
-      def context(threads = 1)
+      def context(worker_threads = 1)
         return @context if @context
-        @context = ::ZMQ::Context.new(threads)
-        at_exit { @context.terminate }
-        @context
+        @context = ::ZMQ::Context.new(worker_threads)
       end
       alias_method :init, :context
+
+      def terminate
+        @context.terminate
+      end
     end
 
     extend Forwardable

data/lib/celluloid/zmq/sockets.rb

@@ -1,13 +1,12 @@
 module Celluloid
   module ZMQ
-    attr_reader :linger
-
     class Socket
       # Create a new socket
       def initialize(type)
         @socket = Celluloid::ZMQ.context.socket ::ZMQ.const_get(type.to_s.upcase)
         @linger = 0
       end
+      attr_reader :linger
 
       # Connect to the given 0MQ address
       # Address should be in the form: tcp://1.2.3.4:5678/
@@ -79,19 +78,21 @@ module Celluloid
     # 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
+      def write(*messages)
+        unless ::ZMQ::Util.resultcode_ok? @socket.send_strings messages.flatten
           raise IOError, "error sending 0MQ message: #{::ZMQ::Util.error_string}"
         end
 
-        message
+        messages
       end
-      alias_method :<<, :send
+      alias_method :<<, :write
+      alias_method :send, :write # deprecated
     end
 
     # ReqSockets are the counterpart of RepSockets (REQ/REP)
     class ReqSocket < Socket
       include ReadableSocket
+      include WritableSocket
 
       def initialize
         super :req
@@ -100,6 +101,7 @@ module Celluloid
 
     # RepSockets are the counterpart of ReqSockets (REQ/REP)
     class RepSocket < Socket
+      include ReadableSocket
       include WritableSocket
 
       def initialize
@@ -141,6 +143,18 @@ module Celluloid
       def initialize
         super :sub
       end
+
+      def subscribe(topic)
+        unless ::ZMQ::Util.resultcode_ok? @socket.setsockopt(::ZMQ::SUBSCRIBE, topic)
+          raise IOError, "couldn't set subscribe: #{::ZMQ::Util.error_string}"
+        end
+      end
+
+      def unsubscribe(topic)
+        unless ::ZMQ::Util.resultcode_ok? @socket.setsockopt(::ZMQ::UNSUBSCRIBE, topic)
+          raise IOError, "couldn't set unsubscribe: #{::ZMQ::Util.error_string}"
+        end
+      end
     end
   end
 end

data/lib/celluloid/zmq/version.rb

@@ -1,5 +1,5 @@
 module Celluloid
   module ZMQ
-    VERSION = "0.10.0"
+    VERSION = "0.12.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: celluloid-zmq
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.12.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-02 00:00:00.000000000 Z
+date: 2012-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
-  requirement: &70300524096260 !ruby/object:Gem::Requirement
+  requirement: &70254147601380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70300524096260
+  version_requirements: *70254147601380
 - !ruby/object:Gem::Dependency
   name: celluloid-io
-  requirement: &70300524095640 !ruby/object:Gem::Requirement
+  requirement: &70254147600120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70300524095640
+  version_requirements: *70254147600120
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &70300524095260 !ruby/object:Gem::Requirement
+  requirement: &70254147599660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70300524095260
+  version_requirements: *70254147599660
 - !ruby/object:Gem::Dependency
   name: ffi-rzmq
-  requirement: &70300524094760 !ruby/object:Gem::Requirement
+  requirement: &70254147598820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70300524094760
+  version_requirements: *70254147598820
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70300551724880 !ruby/object:Gem::Requirement
+  requirement: &70254147597640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300551724880
+  version_requirements: *70254147597640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70300551724460 !ruby/object:Gem::Requirement
+  requirement: &70254147596600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300551724460
+  version_requirements: *70254147596600
 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
 - logo.png
+- pkg/celluloid-zmq-0.10.0.gem
 - Rakefile
 - README.md
 - spec/celluloid/zmq/actor_spec.rb
@@ -118,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Celluloid::ZMQ provides concurrent Celluloid actors that can listen for 0MQ
@@ -127,3 +128,4 @@ test_files:
 - spec/celluloid/zmq/actor_spec.rb
 - spec/spec_helper.rb
 - .gitignore
+has_rdoc: