celluloid 0.12.0 → 0.12.1.pre

data/lib/celluloid.rb

@@ -6,7 +6,11 @@ require 'set'
 module Celluloid
   extend self # expose all instance methods as singleton methods
 
-  SHUTDOWN_TIMEOUT = 120 # How long actors have to terminate
+  # How long actors have to terminate
+  SHUTDOWN_TIMEOUT = 120
+
+  # Warning message added to Celluloid objects accessed outside their actors
+  BARE_OBJECT_WARNING_MESSAGE = "WARNING: BARE CELLULOID OBJECT "
 
   class << self
     attr_accessor :logger     # Thread-safe logger class
@@ -194,15 +198,24 @@ module Celluloid
   # These are methods we don't want added to the Celluloid singleton but to be
   # defined on all classes that use Celluloid
   module InstanceMethods
-    # Obtain the Ruby object the actor is wrapping. This should ONLY be used
-    # for a limited set of use cases like runtime metaprogramming. Interacting
-    # directly with the wrapped object foregoes any kind of thread safety that
+    # Obtain the bare Ruby object the actor is wrapping. This is useful for
+    # only a limited set of use cases like runtime metaprogramming. Interacting
+    # directly with the bare object foregoes any kind of thread safety that
     # Celluloid would ordinarily provide you, and the object is guaranteed to
     # be shared with at least the actor thread. Tread carefully.
-    def wrapped_object; self; end
+    #
+    # Bare objects can be identified via #inspect output:
+    #
+    #     >> actor
+    #      => #<Celluloid::Actor(Foo:0x3fefcb77c194)>
+    #     >> actor.bare_object
+    #      => #<WARNING: BARE CELLULOID OBJECT (Foo:0x3fefcb77c194)>
+    #
+    def bare_object; self; end
+    alias_method :wrapped_object, :bare_object
 
     def inspect
-      str = "#<Celluloid::Actor(#{self.class}:0x#{object_id.to_s(16)})"
+      str = "#<#{Celluloid::BARE_OBJECT_WARNING_MESSAGE}(#{self.class}:0x#{object_id.to_s(16)})"
       ivars = instance_variables.map do |ivar|
         "#{ivar}=#{instance_variable_get(ivar).inspect}"
       end
@@ -240,11 +253,6 @@ module Celluloid
   # directly inside of all classes that include Celluloid
   #
 
-  # Is this actor alive?
-  def alive?
-    Thread.current[:actor].alive?
-  end
-
   # Raise an exception in caller context, but stay running
   def abort(cause)
     cause = case cause

data/lib/celluloid/pool_manager.rb

@@ -76,6 +76,10 @@ module Celluloid
       _send_ :inspect
     end
 
+    def size
+      @size
+    end
+
     # Provision a new worker
     def __provision_worker
       while @idle.empty?

data/lib/celluloid/proxies/actor_proxy.rb

@@ -1,7 +1,7 @@
 module Celluloid
   # A proxy object returned from Celluloid::Actor.new/new_link which converts
   # the normal Ruby method protocol into an inter-actor message protocol
-  class ActorProxy < AbstractProxy
+  class ActorProxy
     attr_reader :mailbox, :thread
 
     def initialize(actor)
@@ -20,7 +20,7 @@ module Celluloid
     end
 
     def inspect
-      Actor.call @mailbox, :inspect
+      Actor.call(@mailbox, :inspect).sub(::Celluloid::BARE_OBJECT_WARNING_MESSAGE, "Celluloid::Actor")
     rescue DeadActorError
       "#<Celluloid::Actor(#{@klass}) dead>"
     end

data/lib/celluloid/version.rb

@@ -1,4 +1,4 @@
 module Celluloid
-  VERSION = '0.12.0'
+  VERSION = '0.12.1.pre'
   def self.version; VERSION; end
 end

data/spec/support/actor_examples.rb

@@ -207,6 +207,13 @@ shared_context "a Celluloid Actor" do |included_module|
     actor.wrapped_object.should be_a actor_class
   end
 
+  it "warns about leaked wrapped objects via #inspect" do
+    actor = actor_class.new "Troy McClure"
+
+    actor.inspect.should_not include Celluloid::BARE_OBJECT_WARNING_MESSAGE
+    actor.wrapped_object.inspect.should include Celluloid::BARE_OBJECT_WARNING_MESSAGE
+  end
+
   describe 'mocking methods' do
     let(:actor) { actor_class.new "Troy McClure" }
 

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: celluloid
 version: !ruby/object:Gem::Version
-  version: 0.12.0
-  prerelease: 
+  version: 0.12.1.pre
+  prerelease: 7
 platform: ruby
 authors:
 - Tony Arcieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-04 00:00:00.000000000 Z
+date: 2012-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: timers
-  requirement: &70127789999080 !ruby/object:Gem::Requirement
+  requirement: &70119222902540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70127789999080
+  version_requirements: *70119222902540
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70127789997960 !ruby/object:Gem::Requirement
+  requirement: &70119222902160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70127789997960
+  version_requirements: *70119222902160
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70127789997400 !ruby/object:Gem::Requirement
+  requirement: &70119222901700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70127789997400
+  version_requirements: *70119222901700
 - !ruby/object:Gem::Dependency
   name: benchmark_suite
-  requirement: &70127789996720 !ruby/object:Gem::Requirement
+  requirement: &70119222901280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70127789996720
+  version_requirements: *70119222901280
 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: