celluloid 0.14.0.pre → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e34a9a2d8dc0a227e68e1d8e5a7e4de3a6a99a5a
-  data.tar.gz: 784898577b1163ff5a7756bd8fb4558e105b075c
+  metadata.gz: 14c9f61bd8924c3c5ab4265d3a7ca3d6c43e0fcc
+  data.tar.gz: 65e57a0119a677575a6fbf1663717812f3ca5e1c
 SHA512:
-  metadata.gz: e1af2a80fa4944959773aac6b1b3c800d28a64810264e6e08b1d794ec46d40752efd8d144f7c63715acd40e8a5a9576aedc3bad6c8a59a7e4b336c0c37585373
-  data.tar.gz: 0215cc3ab5bb87b222c9483563c4a4c89aac8ec78f6361715cb3dd2088a4908860aafaed8ec4e519f973ba29bbdaede4722973a0c4be3e177b42997aad5401d6
+  metadata.gz: 0f92f13dde36f666893891344073856a4283c402bf259bffa6d076aec33d3c607805ca84373fba854d198b17fe27415eee41283485b7cc4957f715aff00e9f06
+  data.tar.gz: 4b1cd7b742b028163e9a1af68343b5f3489997ced697383ae9e1737d01f0d9b4f16bc3406e8ea22f8c8668533e4a1ca2cb5a3184ce4b0b5cd7481b3e33e0944d

data/lib/celluloid/supervision_group.rb

@@ -129,13 +129,11 @@ module Celluloid
         # when it is a pool, then we don't splat the args
         # and we need to extract the pool size if set
         if @pool
-          options = {:args => @args}.tap do |hash|
-            hash[:size] = @pool_size if @pool_size
-          end
-          @actor = @klass.send(@method, options, &@block)
-        else
-          @actor = @klass.send(@method, *@args, &@block)
+          options = {:args => @args}
+          options[:size] = @pool_size if @pool_size
+          @args = [options]
         end
+        @actor = @klass.send(@method, *@args, &@block)
         @registry[@name] = @actor if @name
       end
 

data/lib/celluloid/thread.rb

@@ -12,9 +12,6 @@ module Celluloid
       :celluloid_chain_id
     ]
 
-    # A roundabout way to avoid purging :celluloid_queue
-    EPHEMERAL_CELLULOID_LOCALS = CELLULOID_LOCALS - [:celluloid_queue]
-
     def celluloid?
       true
     end
@@ -45,38 +42,51 @@ module Celluloid
 
     # Obtain an actor-local value
     def [](key)
-      if CELLULOID_LOCALS.include?(key)
+      actor = super(:celluloid_actor)
+      if !actor || CELLULOID_LOCALS.include?(key)
         super(key)
       else
-        actor = super(:celluloid_actor)
-        actor.locals[key] if actor
+        actor.locals[key]
       end
     end
 
     # Set an actor-local value
     def []=(key, value)
-      if CELLULOID_LOCALS.include?(key)
+      actor = self[:celluloid_actor]
+      if !actor || CELLULOID_LOCALS.include?(key)
         super(key, value)
       else
-        self[:celluloid_actor].locals[key] = value
+        actor.locals[key] = value
       end
     end
 
     # Obtain the keys to all actor-locals
     def keys
       actor = self[:celluloid_actor]
-      actor.locals.keys if actor
+      if actor
+        actor.locals.keys
+      else
+        super
+      end
     end
 
     # Is the given actor local set?
     def key?(key)
       actor = self[:celluloid_actor]
-      actor.locals.has_key?(key) if actor
+      if actor
+        actor.locals.has_key?(key)
+      else
+        super
+      end
     end
 
     # Clear thread state so it can be reused via thread pools
     def recycle
-      EPHEMERAL_CELLULOID_LOCALS.each { |local| self[local] = nil }
+      # This thread local mediates access to the others, so we must clear it first
+      self[:celluloid_actor] = nil
+
+      # Clearing :celluloid_queue would break the thread pool!
+      keys.each { |key| self[key] = nil unless key == :celluloid_queue }
     end
   end
 end

data/lib/celluloid/version.rb

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

data/spec/support/actor_examples.rb

@@ -336,6 +336,12 @@ shared_examples "Celluloid::Actor examples" do |included_module, task_klass|
         def value
           Thread.current[:example_thread_local]
         end
+
+        def deferred_value
+          defer do
+            Thread.current[:example_thread_local]
+          end
+        end
       end
     end
 
@@ -345,6 +351,11 @@ shared_examples "Celluloid::Actor examples" do |included_module, task_klass|
       actor = example_class.new(example_value)
       actor.value.should eq example_value
     end
+
+    it "isolates thread locals in defer blocks" do
+      actor = example_class.new(example_value)
+      actor.deferred_value.should eq nil
+    end
   end
 
   context :linking do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: celluloid
 version: !ruby/object:Gem::Version
-  version: 0.14.0.pre
+  version: 0.14.0
 platform: ruby
 authors:
 - Tony Arcieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2013-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: timers