Change Abstract actor class to a ActorContext module

Author: pitr-ch

lib/concurrent/actress.rb

@@ -119,10 +119,16 @@ def initialize(parent, name, actress_class, *args, &block)
         @terminated      = Event.new
         @mutex           = Mutex.new
 
-        @actress_class = Child! actress_class, Abstract
+        @actress_class = Child! actress_class, ActorContext
         schedule_execution do
           parent_core.add_child reference if parent_core
-          @actress = actress_class.new self, *args, &block # FIXME it may fail
+          begin
+            @actress = actress_class.new *args, &block
+            @actress.send :initialize_core, self
+          rescue => ex
+            puts "#{ex} (#{ex.class})\n#{ex.backtrace.join("\n")}"
+            terminate! # TODO test that this is ok
+          end
         end
       end
 
@@ -156,6 +162,7 @@ def terminate!
         guard!
         @terminated.set
         parent_core.remove_child reference if parent_core
+        # TODO terminate all children
       end
 
       def guard!
@@ -227,21 +234,14 @@ def reject_envelope(envelope)
       end
     end
 
-    class Abstract
+    module ActorContext
       include Algebrick::TypeCheck
       extend Algebrick::TypeCheck
       include Algebrick::Matching
       include CoreDelegations
 
       attr_reader :core
 
-      def self.new(core, *args, &block)
-        allocate.tap do |actress|
-          actress.__send__ :pre_initialize, core
-          actress.__send__ :initialize, *args, &block
-        end
-      end
-
       def on_message(message)
         raise NotImplementedError
       end
@@ -271,7 +271,7 @@ def terminate!
 
       private
 
-      def pre_initialize(core)
+      def initialize_core(core)
         @core = Type! core, Core
       end
 
@@ -280,7 +280,8 @@ def envelope
       end
     end
 
-    class Root < Abstract
+    class Root
+      include ActorContext
       def on_message(message)
         # ignore
       end

spec/concurrent/actress_spec.rb

@@ -8,7 +8,8 @@ module Concurrent
     Child     = Algebrick.atom
     Terminate = Algebrick.atom
 
-    class Ping < Actress::Abstract
+    class Ping
+      include Actress::ActorContext
 
       def initialize(queue)
         @queue = queue