celluloid 0.2.2 → 0.5.0

data/lib/celluloid/mailbox.rb

@@ -2,30 +2,31 @@ require 'thread'
 
 module Celluloid
   class MailboxError < StandardError; end # you can't message the dead
-  
+  class MailboxShutdown < StandardError; end # raised if the mailbox can no longer be used
+
   # Actors communicate with asynchronous messages. Messages are buffered in
   # Mailboxes until Actors can act upon them.
   class Mailbox
     include Enumerable
-    
+
     def initialize
       @messages = []
       @lock  = Mutex.new
-      @condition = ConditionVariable.new
       @dead = false
+      @condition = ConditionVariable.new
     end
-    
+
     # Add a message to the Mailbox
     def <<(message)
       @lock.synchronize do
         raise MailboxError, "dead recipient" if @dead
-        
+
         @messages << message
         @condition.signal
       end
       nil
     end
-    
+
     # Add a high-priority system event to the Mailbox
     def system_event(event)
       @lock.synchronize do
@@ -36,56 +37,68 @@ module Celluloid
       end
       nil
     end
-    
+
     # Receive a message from the Mailbox
-    def receive
+    def receive(&block)
       message = nil
-      
+
       @lock.synchronize do
         raise MailboxError, "attempted to receive from a dead mailbox" if @dead
-        
+
         begin
-          if block_given?
-            index = @messages.index do |msg|
-              yield(msg) || msg.is_a?(Celluloid::SystemEvent)
-            end
-
-            message = @messages.slice!(index, 1).first if index
-          else
-            message = @messages.shift
-          end
-          
-          raise message if message.is_a?(Celluloid::SystemEvent)
-          
+          message = next_message(&block)
           @condition.wait(@lock) unless message
         end until message
       end
-        
+
+      message
+    end
+
+    # Retrieve the next message in the mailbox
+    def next_message
+      message = nil
+
+      if block_given?
+        index = @messages.index do |msg|
+          yield(msg) || msg.is_a?(Celluloid::SystemEvent)
+        end
+
+        message = @messages.slice!(index, 1).first if index
+      else
+        message = @messages.shift
+      end
+
+      raise message if message.is_a?(Celluloid::SystemEvent)
       message
     end
-    
+
     # Shut down this mailbox and clean up its contents
     def shutdown
+      messages = nil
+
       @lock.synchronize do
-        @messages.each { |msg| msg.cleanup if msg.respond_to? :cleanup }
-        @messages.clear
+        messages = @messages
+        @messages = []
         @dead = true
       end
+
+      messages.each { |msg| msg.cleanup if msg.respond_to? :cleanup }
+      true
     end
-    
+
     # Cast to an array
     def to_a
       @lock.synchronize { @messages.dup }
     end
-    
+
     # Iterate through the mailbox
     def each(&block)
       to_a.each(&block)
     end
-    
+
     # Inspect the contents of the Mailbox
     def inspect
       "#<Celluloid::Mailbox:#{object_id} [#{map { |m| m.inspect }.join(', ')}]>"
     end
   end
-end
+end

data/lib/celluloid/registry.rb

@@ -25,9 +25,4 @@ module Celluloid
       end
     end
   end
-  
-  # Extend the actor module with the registry methods
-  module Actor
-    extend Registry
-  end
 end

data/lib/celluloid/rspec.rb

@@ -0,0 +1,2 @@
+require File.expand_path('../../../spec/support/actor_examples', __FILE__)
+require File.expand_path('../../../spec/support/mailbox_examples', __FILE__)

data/lib/celluloid/supervisor.rb

@@ -2,18 +2,18 @@ module Celluloid
   # Supervisors are actors that watch over other actors and restart them if
   # they crash
   class Supervisor
-    include Actor
+    include Celluloid
     trap_exit :restart_actor
     
     # Retrieve the actor this supervisor is supervising
     attr_reader :actor
     
     def self.supervise(klass, *args, &block)
-      spawn(nil, klass, *args, &block)
+      new(nil, klass, *args, &block)
     end
     
     def self.supervise_as(name, klass, *args, &block)
-      spawn(name, klass, *args, &block)
+      new(name, klass, *args, &block)
     end
     
     def initialize(name, klass, *args, &block)
@@ -22,7 +22,7 @@ module Celluloid
     end
     
     def start_actor
-      @actor = @klass.spawn_link(*@args, &@block)
+      @actor = @klass.new_link(*@args, &@block)
       Celluloid::Actor[@name] = @actor if @name
     end
     

data/lib/celluloid/tcp_server.rb

@@ -0,0 +1,32 @@
+require 'socket'
+
+module Celluloid
+  # A TCPServer that runs as an actor
+  class TCPServer
+    include Celluloid::IO
+
+    # Bind a TCP server to the given host and port
+    def initialize(host, port)
+      @server = ::TCPServer.new host, port
+      run!
+    end
+
+    # Run the TCP server event loop
+    def run
+      while true
+        wait_readable(@server) { on_connect @server.accept }
+      end
+    end
+
+    # Terminate this server
+    def terminate
+      @server.close
+      super
+    end
+
+    # Called whenever a new connection is opened
+    def on_connect(connection)
+      connection.close
+    end
+  end
+end

data/lib/celluloid/version.rb

@@ -1,4 +1,4 @@
 module Celluloid
-  VERSION = '0.2.2'
+  VERSION = '0.5.0'
   def self.version; VERSION; end
 end

metadata

@@ -1,92 +1,92 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: celluloid
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.5.0
   prerelease: 
-  version: 0.2.2
 platform: ruby
-authors: 
+authors:
 - Tony Arcieri
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-28 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-25 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70182211411320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70182211411320
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70182211410760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.3.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.7.0
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *70182211410760
 description: Celluloid is a concurrent object framework inspired by the Actor Model
-email: 
+email:
 - tony@medioh.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.md
 - lib/celluloid/actor.rb
+- lib/celluloid/actor_pool.rb
 - lib/celluloid/actor_proxy.rb
 - lib/celluloid/calls.rb
 - lib/celluloid/core_ext.rb
 - lib/celluloid/events.rb
 - lib/celluloid/future.rb
+- lib/celluloid/io/actor.rb
+- lib/celluloid/io/mailbox.rb
+- lib/celluloid/io/reactor.rb
+- lib/celluloid/io/waker.rb
+- lib/celluloid/io.rb
 - lib/celluloid/linking.rb
 - lib/celluloid/mailbox.rb
 - lib/celluloid/registry.rb
 - lib/celluloid/responses.rb
+- lib/celluloid/rspec.rb
 - lib/celluloid/signals.rb
 - lib/celluloid/supervisor.rb
+- lib/celluloid/tcp_server.rb
 - lib/celluloid/version.rb
 - lib/celluloid.rb
-has_rdoc: true
 homepage: https://github.com/tarcieri/celluloid
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Celluloid is a concurrent object framework inspired by the Actor Model
 test_files: []
-
+has_rdoc: