celluloid 0.12.0.pre → 0.12.0.pre2

data/lib/celluloid.rb

@@ -133,10 +133,15 @@ module Celluloid
       if block
         @mailbox_factory = block
       else
-        @mailbox_factory = proc { klass.new }
+        mailbox_class(klass)
       end
     end
 
+    # Define the mailbox class for this class
+    def mailbox_class(klass)
+      @mailbox_factory = proc { klass.new }
+    end
+
     # Define the default task type for this class
     def task_class(klass)
       @task_class = klass
@@ -166,10 +171,10 @@ module Celluloid
     # Configuration options for Actor#new
     def actor_options
       {
-        :mailbox => mailbox_factory,
-        :exit_handler => @exit_handler,
+        :mailbox           => mailbox_factory,
+        :exit_handler      => @exit_handler,
         :exclusive_methods => @exclusive_methods,
-        :task_class => @task_class,
+        :task_class        => @task_class
       }
     end
 
@@ -370,7 +375,7 @@ module Celluloid
 end
 
 require 'celluloid/version'
-require 'celluloid/actor_proxy'
+
 require 'celluloid/calls'
 require 'celluloid/core_ext'
 require 'celluloid/cpu_counter'
@@ -390,6 +395,11 @@ require 'celluloid/task'
 require 'celluloid/thread_handle'
 require 'celluloid/uuid'
 
+require 'celluloid/proxies/abstract_proxy'
+require 'celluloid/proxies/actor_proxy'
+require 'celluloid/proxies/async_proxy'
+require 'celluloid/proxies/future_proxy'
+
 require 'celluloid/actor'
 require 'celluloid/future'
 require 'celluloid/pool_manager'

data/lib/celluloid/future.rb

@@ -35,6 +35,11 @@ module Celluloid
       receiver << @call
     end
 
+    # Check if this future has a value yet
+    def ready?
+      @ready
+    end
+
     # Obtain the value for this Future
     def value(timeout = nil)
       ready = result = nil
@@ -91,9 +96,6 @@ module Celluloid
     end
     alias_method :<<, :signal
 
-    # Is the future ready yet?
-    def ready?; @ready; end
-
     # Inspect this Celluloid::Future
     alias_method :inspect, :to_s
 

data/lib/celluloid/proxies/abstract_proxy.rb

@@ -0,0 +1,17 @@
+module Celluloid
+  # Base class of all Celluloid proxies
+  class AbstractProxy < BasicObject
+    # Needed for storing proxies in data structures
+    needed = [:object_id, :__id__, :hash] - instance_methods
+    if needed.any?
+      include ::Kernel.dup.module_eval {
+        undef_method *(instance_methods - needed)
+        self
+      }
+
+      # rubinius bug?  These methods disappear when we include hacked kernel
+      define_method :==, ::BasicObject.instance_method(:==) unless instance_methods.include?(:==)
+      alias_method(:equal?, :==) unless instance_methods.include?(:equal?)
+    end
+  end
+end

data/lib/celluloid/{actor_proxy.rb → proxies/actor_proxy.rb}

@@ -1,33 +1,25 @@
 module Celluloid
-  # A proxy object returned from Celluloid::Actor.spawn/spawn_link which
-  # dispatches calls and casts to normal Ruby objects which are running inside
-  # of their own threads.
-  class ActorProxy < BasicObject
+  # A proxy object returned from Celluloid::Actor.new/new_link which converts
+  # the normal Ruby method protocol into an inter-actor message protocol
+  class ActorProxy < AbstractProxy
     attr_reader :mailbox, :thread
 
     def initialize(actor)
       @mailbox, @thread, @klass = actor.mailbox, actor.thread, actor.subject.class.to_s
     end
 
-    def _send_(meth, *args, &block)
-      Actor.call @mailbox, :__send__, meth, *args, &block
+    def class
+      Actor.call @mailbox, :__send__, :class
     end
 
-    # Needed for storing proxies in data structures
-    needed = [:object_id, :__id__, :hash] - instance_methods
-    if needed.any?
-      include ::Kernel.dup.module_eval {
-        undef_method *(instance_methods - needed)
-        self
-      }
-
-      # rubinius bug?  These methods disappear when we include hacked kernel
-      define_method :==, ::BasicObject.instance_method(:==) unless instance_methods.include?(:==)
-      alias_method(:equal?, :==) unless instance_methods.include?(:equal?)
+    def _send_(meth, *args, &block)
+      Actor.call @mailbox, :__send__, meth, *args, &block
     end
 
-    def class
-      Actor.call @mailbox, :__send__, :class
+    def inspect
+      Actor.call @mailbox, :inspect
+    rescue DeadActorError
+      "#<Celluloid::Actor(#{@klass}) dead>"
     end
 
     def name
@@ -62,21 +54,22 @@ module Celluloid
       Actor.call @mailbox, :to_s
     end
 
-    def inspect
-      Actor.call @mailbox, :inspect
-    rescue DeadActorError
-      "#<Celluloid::Actor(#{@klass}) dead>"
-    end
-
-    # Make an asynchronous call to an actor, for those who don't like the
-    # predicate syntax. TIMTOWTDI!
-    def async(method_name, *args, &block)
-      Actor.async @mailbox, method_name, *args, &block
+    # Obtain an async proxy or explicitly invoke a named async method
+    def async(method_name = nil, *args, &block)
+      if method_name
+        Actor.async @mailbox, method_name, *args, &block
+      else
+        AsyncProxy.new(@mailbox, @klass)
+      end
     end
 
-    # Create a Celluloid::Future which calls a given method
-    def future(method_name, *args, &block)
-      Actor.future @mailbox, method_name, *args, &block
+    # Obtain a future proxy or explicitly invoke a named future method
+    def future(method_name = nil, *args, &block)
+      if method_name
+        Actor.future @mailbox, method_name, *args, &block
+      else
+        FutureProxy.new(@mailbox, @klass)
+      end
     end
 
     # Terminate the associated actor

data/lib/celluloid/proxies/async_proxy.rb

@@ -0,0 +1,19 @@
+module Celluloid
+  # A proxy which sends asynchronous calls to an actor
+  class AsyncProxy < AbstractProxy
+    attr_reader :mailbox
+
+    def initialize(mailbox, klass)
+      @mailbox, @klass = mailbox, klass
+    end
+
+    def inspect
+      "#<Celluloid::AsyncProxy(#{@klass})>"
+    end
+
+    # method_missing black magic to call bang predicate methods asynchronously
+    def method_missing(meth, *args, &block)
+      Actor.async @mailbox, meth, *args, &block
+    end
+  end
+end

data/lib/celluloid/proxies/future_proxy.rb

@@ -0,0 +1,19 @@
+module Celluloid
+  # A proxy which creates future calls to an actor
+  class FutureProxy < AbstractProxy
+    attr_reader :mailbox
+
+    def initialize(mailbox, klass)
+      @mailbox, @klass = mailbox, klass
+    end
+
+    def inspect
+      "#<Celluloid::FutureProxy(#{@klass})>"
+    end
+
+    # method_missing black magic to call bang predicate methods asynchronously
+    def method_missing(meth, *args, &block)
+      Actor.future @mailbox, meth, *args, &block
+    end
+  end
+end

data/lib/celluloid/tasks/task_thread.rb

@@ -7,27 +7,32 @@ module Celluloid
     def initialize(type)
       @type   = type
       @status = :new
-      @yield  = Queue.new
-      @resume = Queue.new
+
+      @resume_queue = Queue.new
+      @yield_mutex  = Mutex.new
+      @yield_cond   = ConditionVariable.new
 
       actor, mailbox = Thread.current[:actor], Thread.current[:mailbox]
       raise NotActorError, "can't create tasks outside of actors" unless actor
 
       @thread = InternalPool.get do
-        @status = :running
-        Thread.current[:actor]   = actor
-        Thread.current[:mailbox] = mailbox
-        Thread.current[:task]    = self
-        actor.tasks << self
-
         begin
-          @yield.push(yield(@resume.pop))
+          value = @resume_queue.pop
+          raise value if value.is_a?(Task::TerminatedError)
+
+          @status = :running
+          Thread.current[:actor]   = actor
+          Thread.current[:mailbox] = mailbox
+          Thread.current[:task]    = self
+          actor.tasks << self
+
+          yield
         rescue Task::TerminatedError
           # Task was explicitly terminated
         ensure
           @status = :dead
           actor.tasks.delete self
-          @waiter.run if @waiter
+          @yield_cond.signal
         end
       end
     end
@@ -35,20 +40,24 @@ module Celluloid
     # Suspend the current task, changing the status to the given argument
     def suspend(status)
       @status = status
-      @yield.push(nil)
-      result = @resume.pop
+      @yield_cond.signal
+      value = @resume_queue.pop
 
-      raise result if result.is_a?(Task::TerminatedError)
+      raise value if value.is_a?(Task::TerminatedError)
       @status = :running
 
-      result
+      value
     end
 
     # Resume a suspended task, giving it a value to return if needed
     def resume(value = nil)
       raise DeadTaskError, "cannot resume a dead task" unless @thread.alive?
-      @resume.push(value)
-      @yield.pop
+
+      @yield_mutex.synchronize do
+        @resume_queue.push(value)
+        @yield_cond.wait(@yield_mutex)
+      end
+
       nil
     rescue ThreadError
       raise DeadTaskError, "cannot resume a dead task"

data/lib/celluloid/version.rb

@@ -1,4 +1,4 @@
 module Celluloid
-  VERSION = '0.12.0.pre'
+  VERSION = '0.12.0.pre2'
   def self.version; VERSION; end
 end

data/spec/support/actor_examples.rb

@@ -25,22 +25,28 @@ shared_context "a Celluloid Actor" do |included_module|
     actor.object_id.should_not == Kernel.object_id
   end
 
-  it "handles synchronous calls" do
+  it "supports synchronous calls" do
     actor = actor_class.new "Troy McClure"
     actor.greet.should == "Hi, I'm Troy McClure"
   end
 
-  it "handles synchronous calls via #method" do
+  it "supports synchronous calls via #method" do
     method = actor_class.new("Troy McClure").method(:greet)
     method.call.should == "Hi, I'm Troy McClure"
   end
 
-  it "handles futures for synchronous calls" do
+  it "supports future(:method) syntax for synchronous future calls" do
     actor = actor_class.new "Troy McClure"
     future = actor.future :greet
     future.value.should == "Hi, I'm Troy McClure"
   end
 
+  it "supports future.method syntax for synchronous future calls" do
+    actor = actor_class.new "Troy McClure"
+    future = actor.future.greet
+    future.value.should == "Hi, I'm Troy McClure"
+  end
+
   it "handles circular synchronous calls" do
     klass = Class.new do
       include included_module
@@ -136,19 +142,25 @@ shared_context "a Celluloid Actor" do |included_module|
     end.to raise_exception(Celluloid::DeadActorError)
   end
 
-  it "handles asynchronous calls" do
+  it "supports method! syntax for asynchronous calls" do
     actor = actor_class.new "Troy McClure"
     actor.change_name! "Charlie Sheen"
     actor.greet.should == "Hi, I'm Charlie Sheen"
   end
 
-  it "handles asynchronous calls via #async" do
+  it "supports async(:method) syntax for asynchronous calls" do
     actor = actor_class.new "Troy McClure"
     actor.async :change_name, "Charlie Sheen"
     actor.greet.should == "Hi, I'm Charlie Sheen"
   end
 
-  it "handles asynchronous calls to itself" do
+  it "supports async.method syntax for asynchronous calls" do
+    actor = actor_class.new "Troy McClure"
+    actor.async.change_name "Charlie Sheen"
+    actor.greet.should == "Hi, I'm Charlie Sheen"
+  end
+
+  it "supports asynchronous calls to itself" do
     actor = actor_class.new "Troy McClure"
     actor.change_name_async "Charlie Sheen"
     actor.greet.should == "Hi, I'm Charlie Sheen"
@@ -374,7 +386,6 @@ shared_context "a Celluloid Actor" do |included_module|
       obj.should be_signaled
     end
 
-    # FIXME: This is deadlocking on Travis, and may still have issues
     it "sends values along with signals" do
       obj = @signaler.new
       obj.should_not be_signaled
@@ -472,8 +483,6 @@ shared_context "a Celluloid Actor" do |included_module|
   end
 
   context :timers do
-    # Level of accuracy enforced by the tests (50ms)
-    Q = 0.05
 
     before do
       @klass = Class.new do
@@ -636,6 +645,26 @@ shared_context "a Celluloid Actor" do |included_module|
     end
   end
 
+  context :mailbox_class do
+    class ExampleMailbox < Celluloid::Mailbox; end
+
+    subject do
+      Class.new do
+        include included_module
+        mailbox_class ExampleMailbox
+      end
+    end
+
+    it "overrides the mailbox class" do
+      subject.new.mailbox.should be_a ExampleMailbox
+    end
+
+    it "retains custom mailboxes when subclassed" do
+      subclass = Class.new(subject)
+      subclass.new.mailbox.should be_a ExampleMailbox
+    end
+  end
+
   context :task_class do
     class ExampleTask < Celluloid::TaskFiber; end
 

metadata

@@ -1,62 +1,61 @@
 --- !ruby/object:Gem::Specification
 name: celluloid
 version: !ruby/object:Gem::Version
-  version: 0.12.0.pre
   prerelease: 7
+  version: 0.12.0.pre2
 platform: ruby
 authors:
 - Tony Arcieri
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-09-01 00:00:00.000000000 Z
+date: 2012-09-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: timers
-  requirement: &70213085365480 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: &2056 !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
-  type: :runtime
+    none: false
+  requirement: *2056
   prerelease: false
-  version_requirements: *70213085365480
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70213085364540 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: &2074 !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+    none: false
+  requirement: *2074
   prerelease: false
-  version_requirements: *70213085364540
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70213085363780 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: &2092 !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+    none: false
+  requirement: *2092
   prerelease: false
-  version_requirements: *70213085363780
+  type: :development
 - !ruby/object:Gem::Dependency
   name: benchmark_suite
-  requirement: &70213085363200 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: &2108 !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+    none: false
+  requirement: *2108
   prerelease: false
-  version_requirements: *70213085363200
-description: Celluloid enables people to build concurrent programs out of concurrent
-  objects just as easily as they build sequential programs out of sequential objects
+  type: :development
+description: Celluloid enables people to build concurrent programs out of concurrent objects just as easily as they build sequential programs out of sequential objects
 email:
 - tony.arcieri@gmail.com
 executables: []
@@ -64,8 +63,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
+- lib/celluloid.rb
 - lib/celluloid/actor.rb
-- lib/celluloid/actor_proxy.rb
 - lib/celluloid/boot.rb
 - lib/celluloid/calls.rb
 - lib/celluloid/core_ext.rb
@@ -89,12 +88,15 @@ files:
 - lib/celluloid/supervisor.rb
 - lib/celluloid/system_events.rb
 - lib/celluloid/task.rb
-- lib/celluloid/tasks/task_fiber.rb
-- lib/celluloid/tasks/task_thread.rb
 - lib/celluloid/thread_handle.rb
 - lib/celluloid/uuid.rb
 - lib/celluloid/version.rb
-- lib/celluloid.rb
+- lib/celluloid/proxies/abstract_proxy.rb
+- lib/celluloid/proxies/actor_proxy.rb
+- lib/celluloid/proxies/async_proxy.rb
+- lib/celluloid/proxies/future_proxy.rb
+- lib/celluloid/tasks/task_fiber.rb
+- lib/celluloid/tasks/task_thread.rb
 - spec/support/actor_examples.rb
 - spec/support/example_actor_class.rb
 - spec/support/mailbox_examples.rb
@@ -102,27 +104,28 @@ files:
 homepage: https://github.com/celluloid/celluloid
 licenses:
 - MIT
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: 1.9.2
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
+  none: false
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.10
-signing_key: 
+rubyforge_project:
+rubygems_version: 1.8.15
+signing_key:
 specification_version: 3
 summary: Actor-based concurrent object framework for Ruby
 test_files: []
-has_rdoc: 
+has_rdoc:
+...