celluloid 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e245e48da91f90663b7d0ebc235c09e31ab2c4c8
-  data.tar.gz: 90be7b8790c63dfa656e9ddba3e7c97118b9c27c
+  metadata.gz: 2d074071245d3218d8e119b0bf9f12f05aab6c8f
+  data.tar.gz: 5b7fb44228ae18ed9d1d64f9a26ae82bc61acf6f
 SHA512:
-  metadata.gz: ab5dcbccea33be7e208ec0b83195351843760f45caf65f8b5505239f1822a9042f46c5071fbfd55eba8c0c8e6f01fb35b4849a7d539e9763f542bef2153c478d
-  data.tar.gz: f0d86887d99804ace8cb1e14e3b0c0285f4e31d56b1bcad73ebd68e1ac5a8d9c2420560b9ac62a5f15761b21faefc62dc4b94d3ac0293534bf0b089ae162ab37
+  metadata.gz: 2a006db60f84694c38e5ff90585c5890b1eed7b5b517f302d3d6e9a50552e6c5c44df07d50dce9bc6a2d87d7f91470c7d9a617d427e3f4e28426ecbb4affe3c6
+  data.tar.gz: 1969c4c6ba4fc4bdedc606b5009d5ab0aacf73d76a48c905a523f2774ca75696eb5e81b338702f07aa8da7c16bff6e5d6f1cb72ce77957258411d4cf0c94c3af

data/lib/celluloid.rb

@@ -8,7 +8,7 @@ if defined?(JRUBY_VERSION) && JRUBY_VERSION == "1.7.3"
 end
 
 module Celluloid
-  VERSION = '0.15.0'
+  VERSION = '0.15.1'
   Error = Class.new StandardError
 
   extend self # expose all instance methods as singleton methods

data/lib/celluloid/pool_manager.rb

@@ -91,6 +91,7 @@ module Celluloid
 
     # Provision a new worker
     def __provision_worker__
+      Task.current.guard_warnings = true
       while @idle.empty?
         # Wait for responses from one of the busy workers
         response = exclusive { receive { |msg| msg.is_a?(Response) } }

data/lib/celluloid/tasks.rb

@@ -25,7 +25,7 @@ module Celluloid
     end
 
     attr_reader :type, :meta, :status
-    attr_accessor :chain_id
+    attr_accessor :chain_id, :guard_warnings
 
     # Create a new task
     def initialize(type, meta)
@@ -35,12 +35,13 @@ module Celluloid
 
       @exclusive         = false
       @dangerous_suspend = @meta ? @meta.delete(:dangerous_suspend) : false
+      @guard_warnings    = false
 
       actor     = Thread.current[:celluloid_actor]
       @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]
+      guard "can't create tasks inside of tasks" if Thread.current[:celluloid_task]
 
       create do
         begin
@@ -93,7 +94,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]
+      guard "Cannot resume a task from inside of a task" if Thread.current[:celluloid_task]
       deliver(value)
       nil
     end
@@ -141,6 +142,14 @@ module Celluloid
     def inspect
       "#<#{self.class}:0x#{object_id.to_s(16)} @type=#{@type.inspect}, @meta=#{@meta.inspect}, @status=#{@status.inspect}>"
     end
+
+    def guard(message)
+      if @guard_warnings
+        Logger.warn message if $CELLULOID_DEBUG
+      else
+        raise message if $CELLULOID_DEBUG
+      end
+    end
   end
 end
 

data/spec/celluloid/pool_spec.rb

@@ -49,4 +49,11 @@ describe "Celluloid.pool" do
   it "terminates" do
     expect { subject.terminate }.to_not raise_exception
   end
+
+  it "handles many requests" do
+    futures = 10.times.map do
+      subject.future.process
+    end
+    futures.map(&:value)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: celluloid
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Tony Arcieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-04 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: timers