asynchro 0.1.4 → 0.1.5

data/README.rdoc

@@ -29,28 +29,28 @@ then use the `async_state` method:
     include Asynchro::Extensions
     ran = [ ]
     
-    async_state do
-      start do
+    async_state do |state|
+      state.start do
         ran << :start
-        state1!
+        state.state1!
       end
 
-      state1 do
+      state.state1 do
         ran << :state1
-        state2!
+        state.state2!
       end
 
-      state2 do
+      state.state2 do
         ran << :state2
-        state3!
+        state.state3!
       end
 
-      state3 do
+      state.state3 do
         ran << :state3
-        finish!
+        state.finish!
       end
   
-      finish do
+      state.finish do
         ran << :finish
       end
     end
@@ -83,18 +83,18 @@ confirm that they have all completed before moving on. An example is:
     include Asynchro::Extensions
     success = false
 
-    async_tracker do
-      perform do |done|
+    async_tracker do |tracker|
+      tracker.perform do |done|
         done.call
       end
 
-      perform(4) do |done|
+      tracker.perform(4) do |done|
         4.times do
           done.call
         end
       end
   
-      finish do
+      tracker.finish do
         success = true
       end
     end

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/asynchro.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "asynchro"
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Tadman"]
-  s.date = "2011-09-26"
+  s.date = "2011-09-27"
   s.description = "Provides a number of tools to help make developing and testing asynchronous applications more manageable."
   s.email = "github@tadman.ca"
   s.extra_rdoc_files = [

data/lib/asynchro/extensions.rb

@@ -1,6 +1,6 @@
 module Asynchro::Extensions
   def async_tracker(&block)
-    Asynchro::Tracker.new(self, &block)
+    Asynchro::Tracker.new(&block)
   end
 
   def async_state(&block)

data/lib/asynchro/tracker.rb

@@ -1,12 +1,12 @@
 class Asynchro::Tracker
   # Creates a new tracker. If a block is given, this block is called with
   # the new instance as an argument, and the tracker is automatically run.
-  def initialize(context = self)
+  def initialize
     @sequence = 0
-    @context = context
     
     if (block_given?)
-      instance_eval(&Proc.new)
+      yield(self)
+
       self.run!
     end
   end
@@ -15,7 +15,11 @@ class Asynchro::Tracker
   # called if this object is initialized without a supplied block as in that
   # case, this would have been called already.
   def run!
-    @procs and @procs.each { |proc| @context.instance_eval { proc.call } }
+    if (@procs)
+      @procs.each(&:call)
+    else
+      @finish and @finish.each(&:call)
+    end
   end
   
   # Executes this block when all the actions to be performed have checked in
@@ -25,6 +29,12 @@ class Asynchro::Tracker
     @finish << block
   end
   
+  # Returns true if this tracker has completed all supplied blocks, or false
+  # otherwise.
+  def finished?
+    !@blocks or @blocks.empty?
+  end
+  
   # Performs an action. The supplied block will be called with a callback
   # tracking Proc that should be triggered with `call` as many times as
   # are specified in the `count` argument. When the correct number of calls
@@ -41,8 +51,8 @@ class Asynchro::Tracker
           @blocks.delete(_sequence)
         end
       
-        if (@blocks.empty?)
-          @finish and @finish.each { |proc| @context.instance_eval { proc.call } }
+        if (self.finished?)
+          @finish and @finish.each(&:call)
         end
       end
     }

data/test/test_asynchro_extensions.rb

@@ -3,23 +3,25 @@ require 'helper'
 class TestAsynchroExtensions < Test::Unit::TestCase
   include Asynchro::Extensions
 
-  def test_async_tracker_implicit
-    tracker = nil
+  def test_async_tracker
+    @context = nil
     finished = false
     
-    async_tracker do
-      perform do |callback|
-        tracker = self
+    async_tracker do |tracker|
+      tracker.perform do |callback|
+        @context = self
         callback.call
       end
       
-      finish do
+      tracker.finish do
         finished = true
       end
     end
     
-    assert_equal Asynchro::Tracker, tracker.class
-    assert_equal true, finished
+    assert_eventually(1) do
+      assert_equal TestAsynchroExtensions, @context.class
+      assert_equal true, finished
+    end
   end
 
   def test_async_state_explicit

data/test/test_asynchro_tracker.rb

@@ -1,12 +1,25 @@
 require 'helper'
 
 class TestAsynchroTracker < Test::Unit::TestCase
-  def test_async_chain_explicit
+  def test_defaults
+    finished = false
+    
+    tracker = Asynchro::Tracker.new do |tracker|
+      tracker.finish do
+        finished = true
+      end
+    end
+    
+    assert_equal true, finished
+    assert_equal true, tracker.finished?
+  end
+  
+  def test_simple_tracker
     count = 0
     
-    Asynchro::Tracker.new do |chain|
-      chain.perform do |done|
-        chain.perform do |done|
+    Asynchro::Tracker.new do |tracker|
+      tracker.perform do |done|
+        tracker.perform do |done|
           count += 2
           done.call
         end
@@ -15,14 +28,14 @@ class TestAsynchroTracker < Test::Unit::TestCase
         done.call
       end
       
-      chain.perform(4) do |done|
+      tracker.perform(4) do |done|
         4.times do
           count += 1
           done.call
         end
       end
       
-      chain.finish do
+      tracker.finish do
         success = true
       end
     end
@@ -31,22 +44,4 @@ class TestAsynchroTracker < Test::Unit::TestCase
       count == 7
     end
   end
-
-  def test_async_chain_implicit
-    success = false
-    
-    Asynchro::Tracker.new do
-      perform do |done|
-        done.call
-      end
-      
-      finish do
-        success = true
-      end
-    end
-    
-    assert_eventually(5) do
-      success
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asynchro
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-26 00:00:00.000000000Z
+date: 2011-09-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2155053420 !ruby/object:Gem::Requirement
+  requirement: &2154668920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155053420
+  version_requirements: *2154668920
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2155052560 !ruby/object:Gem::Requirement
+  requirement: &2154668040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155052560
+  version_requirements: *2154668040
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2155051700 !ruby/object:Gem::Requirement
+  requirement: &2154657980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155051700
+  version_requirements: *2154657980
 description: Provides a number of tools to help make developing and testing asynchronous
   applications more manageable.
 email: github@tadman.ca