tribe 0.0.9 → 0.0.10

data/README.md

@@ -36,13 +36,13 @@ Or install it yourself as:
       end
       
       def exception_handler(e)
-        puts concat_e("MyActor (#{identifier}) died.", e)
         super
+        puts concat_e("MyActor (#{identifier}) died.", e)
       end
       
       def shutdown_handler(event)
-        puts "MyActor (#{identifier}) is shutting down.  Put cleanup code here."
         super
+        puts "MyActor (#{identifier}) is shutting down.  Put cleanup code here."
       end
     end
     

data/lib/tribe/actable.rb

@@ -42,17 +42,15 @@ module Tribe
       while (event = @mailbox.shift)
         case event.command
         when :shutdown
+          cleanup
           shutdown_handler(event)
-          @pool.shutdown if @dedicated
-          @mailbox.synchronize { @alive = false }
         else
           process_event(event)
         end
       end
 
     rescue Exception => e
-      @alive = false
-      @pool.shutdown if @dedicated
+      cleanup
       exception_handler(e)
     ensure
       @mailbox.release do
@@ -62,13 +60,24 @@ module Tribe
       return nil
     end
 
+    def cleanup
+      @pool.shutdown if @dedicated
+      @mailbox.synchronize { @alive = false }
+      @registry.unregister(self)
+
+      return nil
+    end
+
+    # Override and call super as necessary.
     def process_event(event)
       send("on_#{event.command}", event)
     end
 
+    # Override and call super as necessary.
     def exception_handler(e)
     end
 
+    # Override and call super as necessary.
     def shutdown_handler(event)
     end
   end

data/lib/tribe/dedicated_actor.rb

@@ -1,5 +1,7 @@
 module Tribe
   class DedicatedActor < Tribe::Actor
+    private
+
     def initialize(options = {})
       options[:dedicated] = true
 

data/lib/tribe/registry.rb

@@ -3,30 +3,26 @@ module Tribe
     def initialize
       @mutex = Mutex.new
       @actors_by_name = {}
+      @actors_by_oid = {}
     end
 
     def register(actor)
       @mutex.synchronize do
-        return false unless actor.name
+        raise("Actor already exists (#{actor.name}).") if @actors_by_name.key?(actor.name)
 
-        if @actors_by_name[actor.name]
-          raise "Actor already exists (#{actor.name})."
-        else
-          @actors_by_name[actor.name] = actor
-        end
+        @actors_by_name[actor.name] = actor if actor.name
+        @actors_by_oid[actor.object_id] = actor
 
-        return true
+        return nil
       end
     end
 
     def unregister(actor)
       @mutex.synchronize do
-        return false unless actor.name
-        return false unless @actors_by_name[actor.name]
+        @actors_by_name.delete(actor.name) if actor.name
+        @actors_by_oid.delete(actor.object_id)
 
-        @actors_by_name.delete(actor.name)
-
-        return true
+        return nil
       end
     end
 
@@ -39,6 +35,15 @@ module Tribe
     def dispose
       @mutex.synchronize do
         @actors_by_name.clear
+        @actors_by_oid.clear
+
+        return nil
+      end
+    end
+
+    def inspect
+      @mutex.synchronize do
+        return "#<#{self.class.to_s}:0x#{(object_id << 1).to_s(16)} oid_count=#{@actors_by_oid.count}, named_count=#{@actors_by_name.count}>"
       end
     end
   end

data/lib/tribe/version.rb

@@ -1,3 +1,3 @@
 module Tribe
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

data/tribe.gemspec

@@ -15,5 +15,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Tribe::VERSION
 
-  gem.add_dependency('workers', '0.0.6')
+  gem.add_dependency('workers', '0.0.8')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tribe
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.8
 description: Tribe is a Ruby gem that implements event-driven actors.
 email:
 - chad@remesch.com