celluloid 0.12.0.pre2 → 0.12.0.pre3

data/lib/celluloid.rb

@@ -143,8 +143,16 @@ module Celluloid
     end
 
     # Define the default task type for this class
-    def task_class(klass)
-      @task_class = klass
+    def task_class(klass = nil)
+      if klass
+        @task_class = klass
+      elsif defined?(@task_class)
+        @task_class
+      elsif superclass.respond_to? :task_class
+        superclass.task_class
+      else
+        Celluloid.task_class
+      end
     end
 
     # Mark methods as running exclusively
@@ -174,7 +182,7 @@ module Celluloid
         :mailbox           => mailbox_factory,
         :exit_handler      => @exit_handler,
         :exclusive_methods => @exclusive_methods,
-        :task_class        => @task_class
+        :task_class        => task_class
       }
     end
 
@@ -364,13 +372,21 @@ module Celluloid
   end
 
   # Handle async calls within an actor itself
-  def async(meth, *args, &block)
-    Actor.async Thread.current[:actor].mailbox, meth, *args, &block
+  def async(meth = nil, *args, &block)
+    if meth
+      Actor.async Thread.current[:actor].mailbox, meth, *args, &block
+    else
+      Thread.current[:actor].proxy.async
+    end
   end
 
   # Handle calls to future within an actor itself
-  def future(meth, *args, &block)
-    Actor.future Thread.current[:actor].mailbox, meth, *args, &block
+  def future(meth = nil, *args, &block)
+    if meth
+      Actor.future Thread.current[:actor].mailbox, meth, *args, &block
+    else
+      Thread.current[:actor].proxy.future
+    end
   end
 end
 

data/lib/celluloid/proxies/actor_proxy.rb

@@ -6,6 +6,9 @@ module Celluloid
 
     def initialize(actor)
       @mailbox, @thread, @klass = actor.mailbox, actor.thread, actor.subject.class.to_s
+
+      @async_proxy  = AsyncProxy.new(actor)
+      @future_proxy = FutureProxy.new(actor)
     end
 
     def class
@@ -59,7 +62,7 @@ module Celluloid
       if method_name
         Actor.async @mailbox, method_name, *args, &block
       else
-        AsyncProxy.new(@mailbox, @klass)
+        @async_proxy
       end
     end
 
@@ -68,7 +71,7 @@ module Celluloid
       if method_name
         Actor.future @mailbox, method_name, *args, &block
       else
-        FutureProxy.new(@mailbox, @klass)
+        @future_proxy
       end
     end
 

data/lib/celluloid/proxies/async_proxy.rb

@@ -3,8 +3,8 @@ module Celluloid
   class AsyncProxy < AbstractProxy
     attr_reader :mailbox
 
-    def initialize(mailbox, klass)
-      @mailbox, @klass = mailbox, klass
+    def initialize(actor)
+      @mailbox, @klass = actor.mailbox, actor.subject.class.to_s
     end
 
     def inspect

data/lib/celluloid/proxies/future_proxy.rb

@@ -3,8 +3,8 @@ module Celluloid
   class FutureProxy < AbstractProxy
     attr_reader :mailbox
 
-    def initialize(mailbox, klass)
-      @mailbox, @klass = mailbox, klass
+    def initialize(actor)
+      @mailbox, @klass = actor.mailbox, actor.subject.class.to_s
     end
 
     def inspect

data/lib/celluloid/tasks/task_fiber.rb

@@ -59,7 +59,7 @@ module Celluloid
 
     # Nicer string inspect for tasks
     def inspect
-      "<Celluloid::Task:0x#{object_id.to_s(16)} @type=#{@type.inspect}, @status=#{@status.inspect}>"
+      "<Celluloid::TaskFiber:0x#{object_id.to_s(16)} @type=#{@type.inspect}, @status=#{@status.inspect}>"
     end
   end
 end

data/lib/celluloid/tasks/task_thread.rb

@@ -73,7 +73,7 @@ module Celluloid
 
     # Nicer string inspect for tasks
     def inspect
-      "<Celluloid::Task:0x#{object_id.to_s(16)} @type=#{@type.inspect}, @status=#{@status.inspect}>"
+      "<Celluloid::TaskThread:0x#{object_id.to_s(16)} @type=#{@type.inspect}, @status=#{@status.inspect}>"
     end
   end
 end

data/lib/celluloid/version.rb

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

data/spec/support/actor_examples.rb

@@ -160,7 +160,13 @@ shared_context "a Celluloid Actor" do |included_module|
     actor.greet.should == "Hi, I'm Charlie Sheen"
   end
 
-  it "supports asynchronous calls to itself" do
+  it "supports method! syntax for asynchronous calls to itself" do
+    actor = actor_class.new "Troy McClure"
+    actor.change_name_with_a_bang "Charlie Sheen"
+    actor.greet.should == "Hi, I'm Charlie Sheen"
+  end
+
+  it "supports async.method syntax for asynchronous calls to itself" do
     actor = actor_class.new "Troy McClure"
     actor.change_name_async "Charlie Sheen"
     actor.greet.should == "Hi, I'm Charlie Sheen"
@@ -675,8 +681,13 @@ shared_context "a Celluloid Actor" do |included_module|
       end
     end
 
-    it "uses user-specified tasks" do
+    it "overrides the task class" do
       subject.new.tasks.first.should be_a ExampleTask
     end
+
+    it "retains custom task classes when subclassed" do
+      subclass = Class.new(subject)
+      subclass.new.tasks.first.should be_a ExampleTask
+    end
   end
 end

data/spec/support/example_actor_class.rb

@@ -13,10 +13,14 @@ module ExampleActorClass
         @name = new_name
       end
 
-      def change_name_async(new_name)
+      def change_name_with_a_bang(new_name)
         change_name! new_name
       end
 
+      def change_name_async(new_name)
+        async.change_name new_name
+      end
+
       def greet
         "Hi, I'm #{@name}"
       end

metadata

@@ -1,61 +1,62 @@
 --- !ruby/object:Gem::Specification
 name: celluloid
 version: !ruby/object:Gem::Version
+  version: 0.12.0.pre3
   prerelease: 7
-  version: 0.12.0.pre2
 platform: ruby
 authors:
 - Tony Arcieri
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-03 00:00:00.000000000Z
+date: 2012-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: timers
-  version_requirements: &2056 !ruby/object:Gem::Requirement
+  requirement: &70304033561060 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
-    none: false
-  requirement: *2056
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *70304033561060
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: &2074 !ruby/object:Gem::Requirement
+  requirement: &70304033560520 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  requirement: *2074
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *70304033560520
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &2092 !ruby/object:Gem::Requirement
+  requirement: &70304033559840 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  requirement: *2092
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *70304033559840
 - !ruby/object:Gem::Dependency
   name: benchmark_suite
-  version_requirements: &2108 !ruby/object:Gem::Requirement
+  requirement: &70304033559280 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  requirement: *2108
-  prerelease: false
   type: :development
-description: Celluloid enables people to build concurrent programs out of concurrent objects just as easily as they build sequential programs out of sequential objects
+  prerelease: false
+  version_requirements: *70304033559280
+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:
 - tony.arcieri@gmail.com
 executables: []
@@ -63,7 +64,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
-- lib/celluloid.rb
 - lib/celluloid/actor.rb
 - lib/celluloid/boot.rb
 - lib/celluloid/calls.rb
@@ -79,6 +79,10 @@ files:
 - lib/celluloid/method.rb
 - lib/celluloid/notifications.rb
 - lib/celluloid/pool_manager.rb
+- lib/celluloid/proxies/abstract_proxy.rb
+- lib/celluloid/proxies/actor_proxy.rb
+- lib/celluloid/proxies/async_proxy.rb
+- lib/celluloid/proxies/future_proxy.rb
 - lib/celluloid/receivers.rb
 - lib/celluloid/registry.rb
 - lib/celluloid/responses.rb
@@ -88,15 +92,12 @@ files:
 - lib/celluloid/supervisor.rb
 - lib/celluloid/system_events.rb
 - lib/celluloid/task.rb
+- lib/celluloid/tasks/task_fiber.rb
+- lib/celluloid/tasks/task_thread.rb
 - lib/celluloid/thread_handle.rb
 - lib/celluloid/uuid.rb
 - lib/celluloid/version.rb
-- lib/celluloid/proxies/abstract_proxy.rb
-- lib/celluloid/proxies/actor_proxy.rb
-- lib/celluloid/proxies/async_proxy.rb
-- lib/celluloid/proxies/future_proxy.rb
-- lib/celluloid/tasks/task_fiber.rb
-- lib/celluloid/tasks/task_thread.rb
+- lib/celluloid.rb
 - spec/support/actor_examples.rb
 - spec/support/example_actor_class.rb
 - spec/support/mailbox_examples.rb
@@ -104,28 +105,26 @@ files:
 homepage: https://github.com/celluloid/celluloid
 licenses:
 - MIT
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
-  none: false
 requirements: []
-rubyforge_project:
-rubygems_version: 1.8.15
-signing_key:
+rubyforge_project: 
+rubygems_version: 1.8.17
+signing_key: 
 specification_version: 3
 summary: Actor-based concurrent object framework for Ruby
 test_files: []
-has_rdoc:
-...