celluloid 0.12.0.pre3 → 0.12.0

data/lib/celluloid/actor.rb

@@ -191,7 +191,7 @@ module Celluloid
     def run
       begin
         while @running
-          if message = @mailbox.receive(timeout)
+          if message = @mailbox.receive(timeout_interval)
             handle_message message
           else
             # No message indicates a timeout
@@ -277,7 +277,7 @@ module Celluloid
     end
 
     # How long to wait until the next timer fires
-    def timeout
+    def timeout_interval
       i1 = @timers.wait_interval
       i2 = @receivers.wait_interval
 

data/lib/celluloid/rspec.rb

@@ -2,5 +2,7 @@ require File.expand_path('../../../spec/support/example_actor_class', __FILE__)
 require File.expand_path('../../../spec/support/actor_examples', __FILE__)
 require File.expand_path('../../../spec/support/mailbox_examples', __FILE__)
 
-# Timer accuracy enforced by the tests (50ms)
-TIMER_QUANTUM = 0.05
+module Celluloid
+  # Timer accuracy enforced by the tests (50ms)
+  TIMER_QUANTUM = 0.05
+end

data/lib/celluloid/tasks/task_thread.rb

@@ -17,16 +17,15 @@ module Celluloid
 
       @thread = InternalPool.get do
         begin
-          value = @resume_queue.pop
-          raise value if value.is_a?(Task::TerminatedError)
+          unless @resume_queue.pop.is_a?(Task::TerminatedError)
+            @status = :running
+            Thread.current[:actor]   = actor
+            Thread.current[:mailbox] = mailbox
+            Thread.current[:task]    = self
+            actor.tasks << self
 
-          @status = :running
-          Thread.current[:actor]   = actor
-          Thread.current[:mailbox] = mailbox
-          Thread.current[:task]    = self
-          actor.tasks << self
-
-          yield
+            yield
+          end
         rescue Task::TerminatedError
           # Task was explicitly terminated
         ensure

data/lib/celluloid/version.rb

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

data/spec/support/actor_examples.rb

@@ -436,7 +436,7 @@ shared_context "a Celluloid Actor" do |included_module|
         end
 
         def eat_donuts
-          sleep Q
+          sleep Celluloid::TIMER_QUANTUM
           @tasks << 'donuts'
         end
 
@@ -450,7 +450,7 @@ shared_context "a Celluloid Actor" do |included_module|
       actor = subject.new
       actor.eat_donuts!
       actor.drink_coffee!
-      sleep Q * 2
+      sleep Celluloid::TIMER_QUANTUM * 2
       actor.tasks.should == ['donuts', 'coffee']
     end
   end
@@ -484,7 +484,7 @@ shared_context "a Celluloid Actor" do |included_module|
       started_at = Time.now
 
       receiver.receive(interval) { false }.should be_nil
-      (Time.now - started_at).should be_within(Q).of interval
+      (Time.now - started_at).should be_within(Celluloid::TIMER_QUANTUM).of interval
     end
   end
 
@@ -526,7 +526,7 @@ shared_context "a Celluloid Actor" do |included_module|
 
       # Sleep long enough to ensure we're actually seeing behavior when asleep
       # but not so long as to delay the test suite unnecessarily
-      interval = Q * 10
+      interval = Celluloid::TIMER_QUANTUM * 10
       started_at = Time.now
 
       future = actor.future(:do_sleep, interval)
@@ -534,49 +534,49 @@ shared_context "a Celluloid Actor" do |included_module|
       actor.should be_sleeping
 
       future.value
-      (Time.now - started_at).should be_within(Q).of interval
+      (Time.now - started_at).should be_within(Celluloid::TIMER_QUANTUM).of interval
     end
 
     it "schedules timers which fire in the future" do
       actor = @klass.new
 
-      interval = Q * 10
+      interval = Celluloid::TIMER_QUANTUM * 10
       started_at = Time.now
 
       timer = actor.fire_after(interval)
       actor.should_not be_fired
 
-      sleep(interval + Q) # wonky! #/
+      sleep(interval + Celluloid::TIMER_QUANTUM) # wonky! #/
       actor.should be_fired
     end
 
     it "schedules recurring timers which fire in the future" do
       actor = @klass.new
 
-      interval = Q * 10
+      interval = Celluloid::TIMER_QUANTUM * 10
       started_at = Time.now
 
       timer = actor.fire_every(interval)
       actor.fired.should be == 0
 
-      sleep(interval + Q) # wonky! #/
+      sleep(interval + Celluloid::TIMER_QUANTUM) # wonky! #/
       actor.fired.should be == 1
 
-      2.times { sleep(interval + Q) } # wonky! #/
+      2.times { sleep(interval + Celluloid::TIMER_QUANTUM) } # wonky! #/
       actor.fired.should be == 3
     end
 
     it "cancels timers before they fire" do
       actor = @klass.new
 
-      interval = Q * 10
+      interval = Celluloid::TIMER_QUANTUM * 10
       started_at = Time.now
 
       timer = actor.fire_after(interval)
       actor.should_not be_fired
       timer.cancel
 
-      sleep(interval + Q) # wonky! #/
+      sleep(interval + Celluloid::TIMER_QUANTUM) # wonky! #/
       actor.should_not be_fired
     end
   end

data/spec/support/mailbox_examples.rb

@@ -35,6 +35,6 @@ shared_context "a Celluloid Mailbox" do
     started_at = Time.now
 
     subject.receive(interval) { false }
-    (Time.now - started_at).should be_within(TIMER_QUANTUM).of interval
+    (Time.now - started_at).should be_within(Celluloid::TIMER_QUANTUM).of interval
   end
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: celluloid
 version: !ruby/object:Gem::Version
-  version: 0.12.0.pre3
-  prerelease: 7
+  version: 0.12.0
+  prerelease: 
 platform: ruby
 authors:
 - Tony Arcieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-03 00:00:00.000000000 Z
+date: 2012-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: timers
-  requirement: &70304033561060 !ruby/object:Gem::Requirement
+  requirement: &70127789999080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70304033561060
+  version_requirements: *70127789999080
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70304033560520 !ruby/object:Gem::Requirement
+  requirement: &70127789997960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70304033560520
+  version_requirements: *70127789997960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70304033559840 !ruby/object:Gem::Requirement
+  requirement: &70127789997400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70304033559840
+  version_requirements: *70127789997400
 - !ruby/object:Gem::Dependency
   name: benchmark_suite
-  requirement: &70304033559280 !ruby/object:Gem::Requirement
+  requirement: &70127789996720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70304033559280
+  version_requirements: *70127789996720
 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:
@@ -123,8 +123,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Actor-based concurrent object framework for Ruby
 test_files: []
+has_rdoc: