Merge e05dd48 into 11abb6e

lib/celluloid.rb

@@ -221,7 +221,7 @@ def exclusive(*methods)
 
     # Mark methods as running blocks on the receiver
     def execute_block_on_receiver(*methods)
-      @receiver_block_executions ||= Set.new
+      @receiver_block_executions ||= Set.new([:after, :every, :receive])
       @receiver_block_executions.merge methods.map(&:to_sym)
     end
 
@@ -233,7 +233,7 @@ def actor_options
         :task_class        => task_class,
         :exit_handler      => exit_handler,
         :exclusive_methods => defined?(@exclusive_methods) ? @exclusive_methods : nil,
-        :receiver_block_executions => defined?(@receiver_block_executions) ? @receiver_block_executions : [:initialize, :after, :every, :receive]
+        :receiver_block_executions => defined?(@receiver_block_executions) ? @receiver_block_executions : nil
       }
     end
 

lib/celluloid/actor.rb

@@ -311,8 +311,13 @@ def handle_message(message)
         handle_system_event message
       when Call
         task(:call, message.method) {
-          if @receiver_block_executions && (message.method && @receiver_block_executions.include?(message.method.to_sym))
-            message.execute_block_on_receiver
+          if @receiver_block_executions && meth = message.method
+            if meth == :__send__
+              meth = message.arguments.first
+            end
+            if @receiver_block_executions.include?(meth.to_sym)
+              message.execute_block_on_receiver
+            end
           end
           message.dispatch(@subject)
         }