celluloid 0.15.0.pre2 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cb300092f64efcf674f30d6c086f4d007f57c24
-  data.tar.gz: c00b421edd82f1acd76e806673a6f9c4a697a613
+  metadata.gz: e245e48da91f90663b7d0ebc235c09e31ab2c4c8
+  data.tar.gz: 90be7b8790c63dfa656e9ddba3e7c97118b9c27c
 SHA512:
-  metadata.gz: b9b3e8d806a7cc0bcef413ebbab6c2687ec08a7bf00ecc5bc6505513972705ff8f82f2ea18f47d32afe41163e04252de0cfbbb42c95aae1601618d805c32d1be
-  data.tar.gz: 145c065574c7e372bc2da20c7141a5372b5c529db75ade1fcbeb44efcbd605287a5cf66d773cb4c731415731ba9060f452b98b4e64d8482045381448185046e9
+  metadata.gz: ab5dcbccea33be7e208ec0b83195351843760f45caf65f8b5505239f1822a9042f46c5071fbfd55eba8c0c8e6f01fb35b4849a7d539e9763f542bef2153c478d
+  data.tar.gz: f0d86887d99804ace8cb1e14e3b0c0285f4e31d56b1bcad73ebd68e1ac5a8d9c2420560b9ac62a5f15761b21faefc62dc4b94d3ac0293534bf0b089ae162ab37

data/lib/celluloid.rb

@@ -8,7 +8,7 @@ if defined?(JRUBY_VERSION) && JRUBY_VERSION == "1.7.3"
 end
 
 module Celluloid
-  VERSION = '0.15.0.pre2'
+  VERSION = '0.15.0'
   Error = Class.new StandardError
 
   extend self # expose all instance methods as singleton methods
@@ -416,16 +416,9 @@ module Celluloid
 
   # Timeout on task suspension (eg Sync calls to other actors)
   def timeout(duration)
-    bt = caller
-    task = Task.current
-    timer = after(duration) do
-      exception = Task::TimeoutError.new
-      exception.set_backtrace bt
-      task.resume exception
-    end
-    yield
-  ensure
-    timer.cancel if timer
+    Thread.current[:celluloid_actor].timeout(duration) do
+      yield
+    end
   end
 
   # Run given block in an exclusive mode: all synchronous calls block the whole

data/lib/celluloid/actor.rb

@@ -268,6 +268,19 @@ module Celluloid
       @timers.every(interval) { task(:timer, &block) }
     end
 
+    def timeout(duration)
+      bt = caller
+      task = Task.current
+      timer = @timers.after(duration) do
+        exception = Task::TimeoutError.new("execution expired")
+        exception.set_backtrace bt
+        task.resume exception
+      end
+      yield
+    ensure
+      timer.cancel if timer
+    end
+
     class Sleeper
       def initialize(timers, interval)
         @timers = timers

data/lib/celluloid/tasks.rb

@@ -40,6 +40,7 @@ module Celluloid
       @chain_id = CallChain.current_id
 
       raise NotActorError, "can't create tasks outside of actors" unless actor
+      raise "can't create tasks inside of tasks" if Thread.current[:celluloid_task]
 
       create do
         begin
@@ -67,6 +68,7 @@ module Celluloid
     # Suspend the current task, changing the status to the given argument
     def suspend(status)
       raise "Cannot suspend while in exclusive mode" if exclusive?
+      raise "Cannot suspend a task from outside of itself" unless Task.current == self
 
       @status = status
 
@@ -91,6 +93,7 @@ module Celluloid
 
     # Resume a suspended task, giving it a value to return if needed
     def resume(value = nil)
+      raise "Cannot resume a task from inside of a task" if Thread.current[:celluloid_task]
       deliver(value)
       nil
     end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: celluloid
 version: !ruby/object:Gem::Version
-  version: 0.15.0.pre2
+  version: 0.15.0
 platform: ruby
 authors:
 - Tony Arcieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-30 00:00:00.000000000 Z
+date: 2013-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: timers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement