celluloid 0.12.2 → 0.12.3

data/lib/celluloid.rb

@@ -146,9 +146,16 @@ module Celluloid
     end
 
     # Trap errors from actors we're linked to when they exit
-    def trap_exit(callback)
-      @exit_handler = callback.to_sym
+    def exit_handler(callback = nil)
+      if callback
+        @exit_handler = callback.to_sym
+      elsif defined?(@exit_handler)
+        @exit_handler
+      elsif superclass.respond_to? :exit_handler
+        superclass.exit_handler
+      end
     end
+    alias_method :trap_exit, :exit_handler
 
     # Configure a custom mailbox factory
     def use_mailbox(klass = nil, &block)
@@ -202,7 +209,7 @@ module Celluloid
     def actor_options
       {
         :mailbox           => mailbox_factory,
-        :exit_handler      => @exit_handler,
+        :exit_handler      => exit_handler,
         :exclusive_methods => @exclusive_methods,
         :task_class        => task_class
       }

data/lib/celluloid/actor.rb

@@ -389,7 +389,7 @@ module Celluloid
 
     # Run a method inside a task unless it's exclusive
     def task(task_type, method_name = nil, &block)
-      if @exclusives && (@exclusives == :all || @exclusives.include?(method_name))
+      if @exclusives && (@exclusives == :all || @exclusives.include?(method_name.to_sym))
         exclusive { block.call }
       else
         @task_class.new(task_type, &block).resume

data/lib/celluloid/version.rb

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

data/spec/support/actor_examples.rb

@@ -285,6 +285,24 @@ shared_context "a Celluloid Actor" do |included_module|
       @charlie = actor_class.new "Charlie Sheen"
     end
 
+    let(:supervisor_class) do
+      Class.new do # like a boss
+        include included_module
+        trap_exit :lambaste_subordinate
+
+        def initialize(name)
+          @name = name
+          @subordinate_lambasted = false
+        end
+
+        def subordinate_lambasted?; @subordinate_lambasted; end
+
+        def lambaste_subordinate(actor, reason)
+          @subordinate_lambasted = true
+        end
+      end
+    end
+
     it "links to other actors" do
       @kevin.link @charlie
       @kevin.monitoring?(@charlie).should be_true
@@ -323,23 +341,20 @@ shared_context "a Celluloid Actor" do |included_module|
     end
 
     it "traps exit messages from other actors" do
-      boss = Class.new do # like a boss
-        include included_module
-        trap_exit :lambaste_subordinate
-
-        def initialize(name)
-          @name = name
-          @subordinate_lambasted = false
-        end
+      chuck = supervisor_class.new "Chuck Lorre"
+      chuck.link @charlie
 
-        def subordinate_lambasted?; @subordinate_lambasted; end
+      expect do
+        @charlie.crash
+      end.to raise_exception(ExampleCrash)
 
-        def lambaste_subordinate(actor, reason)
-          @subordinate_lambasted = true
-        end
-      end
+      sleep 0.1 # hax to prevent a race between exit handling and the next call
+      chuck.should be_subordinate_lambasted
+    end
 
-      chuck = boss.new "Chuck Lorre"
+    it "traps exit messages from other actors in subclasses" do
+      supervisor_subclass = Class.new(supervisor_class)
+      chuck = supervisor_subclass.new "Chuck Lorre"
       chuck.link @charlie
 
       expect do
@@ -418,7 +433,16 @@ shared_context "a Celluloid Actor" do |included_module|
     subject do
       Class.new do
         include included_module
-        def exclusive_example
+
+        attr_reader :tasks
+
+        def initialize
+          @tasks = []
+        end
+
+        def exclusive_example(input = nil, sleep = false)
+          sleep Celluloid::TIMER_QUANTUM if sleep
+          @tasks << input
           exclusive?
         end
         exclusive :exclusive_example
@@ -436,6 +460,13 @@ shared_context "a Celluloid Actor" do |included_module|
     it "remains in exclusive mode inside nested blocks" do
       subject.nested_exclusive_example.should be_true
     end
+
+    it "executes the method in an exclusive order" do
+      subject.exclusive_example! :one, true
+      subject.exclusive_example! :two
+      sleep Celluloid::TIMER_QUANTUM * 2
+      subject.tasks.should == [:one, :two]
+    end
   end
 
   context "exclusive classes" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: celluloid
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.12.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-10 00:00:00.000000000 Z
+date: 2012-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: timers
-  requirement: &70212079174880 !ruby/object:Gem::Requirement
+  requirement: &70118227807960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70212079174880
+  version_requirements: *70118227807960
 - !ruby/object:Gem::Dependency
   name: facter
-  requirement: &70212079174420 !ruby/object:Gem::Requirement
+  requirement: &70118227807500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.12
   type: :runtime
   prerelease: false
-  version_requirements: *70212079174420
+  version_requirements: *70118227807500
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70212079174040 !ruby/object:Gem::Requirement
+  requirement: &70118227807120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212079174040
+  version_requirements: *70118227807120
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70212079189940 !ruby/object:Gem::Requirement
+  requirement: &70118227806660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212079189940
+  version_requirements: *70118227806660
 - !ruby/object:Gem::Dependency
   name: benchmark_suite
-  requirement: &70212079189520 !ruby/object:Gem::Requirement
+  requirement: &70118227806240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212079189520
+  version_requirements: *70118227806240
 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: