celluloid 0.11.1 → 0.12.0

data/spec/support/actor_examples.rb

@@ -19,17 +19,34 @@ shared_context "a Celluloid Actor" do |included_module|
     end.should be_true
   end
 
-  it "handles synchronous calls" do
+  it "can be stored in hashes" do
+    actor = actor_class.new "Troy McClure"
+    actor.hash.should_not == Kernel.hash
+    actor.object_id.should_not == Kernel.object_id
+  end
+
+  it "supports synchronous calls" do
     actor = actor_class.new "Troy McClure"
     actor.greet.should == "Hi, I'm Troy McClure"
   end
 
-  it "handles futures for synchronous calls" 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 "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
@@ -54,6 +71,12 @@ shared_context "a Celluloid Actor" do |included_module|
     actor.first.should be == :bar
   end
 
+  it "properly handles respond_to with include_private" do
+    actor = actor_class.new "Method missing privates"
+    actor.respond_to?(:zomg_private).should be_false
+    actor.respond_to?(:zomg_private, true).should be_true
+  end
+
   it "raises NoMethodError when a nonexistent method is called" do
     actor = actor_class.new "Billy Bob Thornton"
 
@@ -119,19 +142,31 @@ 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 method! syntax for asynchronous calls to itself" do
+    actor = actor_class.new "Troy McClure"
+    actor.change_name_with_a_bang "Charlie Sheen"
+    actor.greet.should == "Hi, I'm Charlie Sheen"
+  end
+
+  it "supports async.method syntax for 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"
@@ -193,15 +228,15 @@ shared_context "a Celluloid Actor" do |included_module|
       actor = actor_class.new "Arnold Schwarzenegger"
       actor.should be_alive
       actor.terminate
-      actor.join
+      Celluloid::Actor.join(actor)
       actor.should_not be_alive
     end
 
     it "kills" do
       actor = actor_class.new "Woody Harrelson"
       actor.should be_alive
-      actor.kill
-      actor.join
+      Celluloid::Actor.kill(actor)
+      Celluloid::Actor.join(actor)
       actor.should_not be_alive
     end
 
@@ -213,6 +248,15 @@ shared_context "a Celluloid Actor" do |included_module|
         actor.greet
       end.to raise_exception(Celluloid::DeadActorError)
     end
+
+    it "raises the right DeadActorError if terminate! called after terminated" do
+      actor = actor_class.new "Arnold Schwarzenegger"
+      actor.terminate
+
+      expect do
+        actor.terminate!
+      end.to raise_exception(Celluloid::DeadActorError, "actor already terminated")
+    end
   end
 
   context :current_actor do
@@ -236,16 +280,39 @@ shared_context "a Celluloid Actor" do |included_module|
 
     it "links to other actors" do
       @kevin.link @charlie
-      @kevin.linked_to?(@charlie).should be_true
-      @charlie.linked_to?(@kevin).should be_true
+      @kevin.monitoring?(@charlie).should be_true
+      @kevin.linked_to?(@charlie).should  be_true
+      @charlie.monitoring?(@kevin).should be_true
+      @charlie.linked_to?(@kevin).should  be_true
     end
 
     it "unlinks from other actors" do
       @kevin.link @charlie
       @kevin.unlink @charlie
 
-      @kevin.linked_to?(@charlie).should be_false
-      @charlie.linked_to?(@kevin).should be_false
+      @kevin.monitoring?(@charlie).should be_false
+      @kevin.linked_to?(@charlie).should  be_false
+      @charlie.monitoring?(@kevin).should be_false
+      @charlie.linked_to?(@kevin).should  be_false
+    end
+
+    it "monitors other actors unidirectionally" do
+      @kevin.monitor @charlie
+
+      @kevin.monitoring?(@charlie).should be_true
+      @kevin.linked_to?(@charlie).should  be_false
+      @charlie.monitoring?(@kevin).should be_false
+      @charlie.linked_to?(@kevin).should  be_false
+    end
+
+    it "unmonitors other actors" do
+      @kevin.monitor @charlie
+      @kevin.unmonitor @charlie
+
+      @kevin.monitoring?(@charlie).should be_false
+      @kevin.linked_to?(@charlie).should  be_false
+      @charlie.monitoring?(@kevin).should be_false
+      @charlie.linked_to?(@kevin).should  be_false
     end
 
     it "traps exit messages from other actors" do
@@ -325,7 +392,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
@@ -357,6 +423,38 @@ shared_context "a Celluloid Actor" do |included_module|
     end
   end
 
+  context "exclusive classes" do
+    subject do
+      Class.new do
+        include included_module
+        exclusive
+
+        attr_reader :tasks
+
+        def initialize
+          @tasks = []
+        end
+
+        def eat_donuts
+          sleep Celluloid::TIMER_QUANTUM
+          @tasks << 'donuts'
+        end
+
+        def drink_coffee
+          @tasks << 'coffee'
+        end
+      end
+    end
+
+    it "executes two methods in an exclusive order" do
+      actor = subject.new
+      actor.eat_donuts!
+      actor.drink_coffee!
+      sleep Celluloid::TIMER_QUANTUM * 2
+      actor.tasks.should == ['donuts', 'coffee']
+    end
+  end
+
   context :receiving do
     before do
       @receiver = Class.new do
@@ -386,13 +484,11 @@ shared_context "a Celluloid Actor" do |included_module|
       started_at = Time.now
 
       receiver.receive(interval) { false }.should be_nil
-      (Time.now - started_at).should be_within(Q).of interval
+      (Time.now - started_at).should be_within(Celluloid::TIMER_QUANTUM).of interval
     end
   end
 
   context :timers do
-    # Level of accuracy enforced by the tests (50ms)
-    Q = 0.05
 
     before do
       @klass = Class.new do
@@ -430,7 +526,7 @@ shared_context "a Celluloid Actor" do |included_module|
 
       # Sleep long enough to ensure we're actually seeing behavior when asleep
       # but not so long as to delay the test suite unnecessarily
-      interval = Q * 10
+      interval = Celluloid::TIMER_QUANTUM * 10
       started_at = Time.now
 
       future = actor.future(:do_sleep, interval)
@@ -438,49 +534,49 @@ shared_context "a Celluloid Actor" do |included_module|
       actor.should be_sleeping
 
       future.value
-      (Time.now - started_at).should be_within(Q).of interval
+      (Time.now - started_at).should be_within(Celluloid::TIMER_QUANTUM).of interval
     end
 
     it "schedules timers which fire in the future" do
       actor = @klass.new
 
-      interval = Q * 10
+      interval = Celluloid::TIMER_QUANTUM * 10
       started_at = Time.now
 
       timer = actor.fire_after(interval)
       actor.should_not be_fired
 
-      sleep(interval + Q) # wonky! #/
+      sleep(interval + Celluloid::TIMER_QUANTUM) # wonky! #/
       actor.should be_fired
     end
 
     it "schedules recurring timers which fire in the future" do
       actor = @klass.new
 
-      interval = Q * 10
+      interval = Celluloid::TIMER_QUANTUM * 10
       started_at = Time.now
 
       timer = actor.fire_every(interval)
       actor.fired.should be == 0
 
-      sleep(interval + Q) # wonky! #/
+      sleep(interval + Celluloid::TIMER_QUANTUM) # wonky! #/
       actor.fired.should be == 1
 
-      2.times { sleep(interval + Q) } # wonky! #/
+      2.times { sleep(interval + Celluloid::TIMER_QUANTUM) } # wonky! #/
       actor.fired.should be == 3
     end
 
     it "cancels timers before they fire" do
       actor = @klass.new
 
-      interval = Q * 10
+      interval = Celluloid::TIMER_QUANTUM * 10
       started_at = Time.now
 
       timer = actor.fire_after(interval)
       actor.should_not be_fired
       timer.cancel
 
-      sleep(interval + Q) # wonky! #/
+      sleep(interval + Celluloid::TIMER_QUANTUM) # wonky! #/
       actor.should_not be_fired
     end
   end
@@ -526,7 +622,7 @@ shared_context "a Celluloid Actor" do |included_module|
       tasks.size.should == 2
 
       blocking_task = tasks.find { |t| t.status != :running }
-      blocking_task.should be_a Celluloid::Task
+      blocking_task.should be_a Celluloid.task_class
       blocking_task.status.should == :callwait
 
       actor.blocker.unblock
@@ -534,4 +630,64 @@ shared_context "a Celluloid Actor" do |included_module|
       actor.tasks.size.should == 1
     end
   end
+
+  context :use_mailbox do
+    class ExampleMailbox < Celluloid::Mailbox; end
+
+    subject do
+      Class.new do
+        include included_module
+        use_mailbox ExampleMailbox
+      end
+    end
+
+    it "uses user-specified mailboxes" 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 :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
+
+    subject do
+      Class.new do
+        include included_module
+        task_class ExampleTask
+      end
+    end
+
+    it "overrides the task class" do
+      subject.new.tasks.first.should be_a ExampleTask
+    end
+
+    it "retains custom task classes when subclassed" do
+      subclass = Class.new(subject)
+      subclass.new.tasks.first.should be_a ExampleTask
+    end
+  end
 end

data/spec/support/example_actor_class.rb

@@ -13,10 +13,14 @@ module ExampleActorClass
         @name = new_name
       end
 
-      def change_name_async(new_name)
+      def change_name_with_a_bang(new_name)
         change_name! new_name
       end
 
+      def change_name_async(new_name)
+        async.change_name new_name
+      end
+
       def greet
         "Hi, I'm #{@name}"
       end
@@ -55,7 +59,7 @@ module ExampleActorClass
         end
       end
 
-      def respond_to?(method_name)
+      def respond_to?(method_name, include_private = false)
         super || delegates?(method_name)
       end
 

data/spec/support/mailbox_examples.rb

@@ -1,9 +1,4 @@
 shared_context "a Celluloid Mailbox" do
-  # Level of timer accuracy enforced by the tests (50ms)
-  Q = 0.05
-
-  class TestEvent < Celluloid::SystemEvent; end
-
   it "receives messages" do
     message = :ohai
 
@@ -11,22 +6,12 @@ shared_context "a Celluloid Mailbox" do
     subject.receive.should == message
   end
 
-  it "raises system events when received" do
-    subject.system_event TestEvent.new("example")
-
-    expect do
-      subject.receive
-    end.to raise_exception(TestEvent)
-  end
-
   it "prioritizes system events over other messages" do
     subject << :dummy1
     subject << :dummy2
-    subject.system_event TestEvent.new("example")
 
-    expect do
-      subject.receive
-    end.to raise_exception(TestEvent)
+    subject << Celluloid::SystemEvent.new
+    subject.receive.should be_a(Celluloid::SystemEvent)
   end
 
   it "selectively receives messages with a block" do
@@ -50,6 +35,6 @@ shared_context "a Celluloid Mailbox" do
     started_at = Time.now
 
     subject.receive(interval) { false }
-    (Time.now - started_at).should be_within(Q).of interval
+    (Time.now - started_at).should be_within(Celluloid::TIMER_QUANTUM).of interval
   end
 end

data/spec/support/task_examples.rb

@@ -0,0 +1,36 @@
+shared_context "a Celluloid Task" do |task_class|
+  class MockActor
+    attr_reader :tasks
+
+    def initialize
+      @tasks = []
+    end
+  end
+
+  let(:task_type)     { :foobar }
+  let(:suspend_state) { :doing_something }
+  let(:actor)         { MockActor.new }
+
+  subject { task_class.new(task_type) { Celluloid::Task.suspend(suspend_state) } }
+
+  before :each do
+    Thread.current[:actor] = actor
+  end
+
+  after :each do
+    Thread.current[:actor] = nil
+  end
+
+  it "begins with status :new" do
+    subject.status.should == :new
+  end
+
+  it "resumes" do
+    subject.should be_running
+    subject.resume
+    subject.status.should == suspend_state
+    subject.resume
+    subject.should_not be_running
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: celluloid
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-17 00:00:00.000000000 Z
+date: 2012-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: timers
-  requirement: &70167227984140 !ruby/object:Gem::Requirement
+  requirement: &70127789999080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70167227984140
+  version_requirements: *70127789999080
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70167227983760 !ruby/object:Gem::Requirement
+  requirement: &70127789997960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70167227983760
+  version_requirements: *70127789997960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70167227983300 !ruby/object:Gem::Requirement
+  requirement: &70127789997400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70167227983300
+  version_requirements: *70127789997400
 - !ruby/object:Gem::Dependency
   name: benchmark_suite
-  requirement: &70167227982880 !ruby/object:Gem::Requirement
+  requirement: &70127789996720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70167227982880
+  version_requirements: *70127789996720
 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:
@@ -65,11 +65,10 @@ extra_rdoc_files: []
 files:
 - README.md
 - lib/celluloid/actor.rb
-- lib/celluloid/actor_proxy.rb
+- lib/celluloid/boot.rb
 - lib/celluloid/calls.rb
 - lib/celluloid/core_ext.rb
 - lib/celluloid/cpu_counter.rb
-- lib/celluloid/events.rb
 - lib/celluloid/fiber.rb
 - lib/celluloid/fsm.rb
 - lib/celluloid/future.rb
@@ -77,8 +76,13 @@ files:
 - lib/celluloid/links.rb
 - lib/celluloid/logger.rb
 - lib/celluloid/mailbox.rb
+- lib/celluloid/method.rb
 - lib/celluloid/notifications.rb
 - lib/celluloid/pool_manager.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/receivers.rb
 - lib/celluloid/registry.rb
 - lib/celluloid/responses.rb
@@ -86,7 +90,10 @@ files:
 - lib/celluloid/signals.rb
 - lib/celluloid/supervision_group.rb
 - 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
@@ -94,6 +101,7 @@ files:
 - spec/support/actor_examples.rb
 - spec/support/example_actor_class.rb
 - spec/support/mailbox_examples.rb
+- spec/support/task_examples.rb
 homepage: https://github.com/celluloid/celluloid
 licenses:
 - MIT
@@ -106,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/celluloid/events.rb

@@ -1,26 +0,0 @@
-module Celluloid
-  # Exceptional system events which need to be processed out of band
-  class SystemEvent < Exception; end
-
-  # An actor has exited for the given reason
-  class ExitEvent < SystemEvent
-    attr_reader :actor, :reason
-
-    def initialize(actor, reason = nil)
-      @actor, @reason = actor, reason
-      super reason.to_s
-    end
-  end
-
-  # Name an actor at the time it's registered
-  class NamingRequest < SystemEvent
-    attr_reader :name
-
-    def initialize(name)
-      @name = name
-    end
-  end
-
-  # Request for an actor to terminate
-  class TerminationRequest < SystemEvent; end
-end