midi-topaz 0.0.7 → 0.0.8

data/lib/topaz.rb

@@ -18,6 +18,6 @@ require 'topaz/tempo'
 
 module Topaz
   
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
   
 end

data/lib/topaz/tempo.rb

@@ -60,14 +60,22 @@ module Topaz
       @actions[:stop] = block
     end
     
-    # pass in a callback which will 
+    # pass in a callback which will stop the clock if it evaluates to true 
     def stop_when(&block)
-      @actions[:stop_when] = block
+      proc = Proc.new do
+        if yield
+          stop
+          true
+        else
+          false
+        end 
+      end
+      @actions[:stop_when] = proc
     end
     
     # pass in a callback which will be fired on each tick
     def on_tick(&block)
-      proc = Proc.new do |dests|
+      proc = Proc.new do
         @destinations.each { |d| d.send(:tick) if d.respond_to?(:tick) }
         yield
       end
@@ -104,14 +112,22 @@ module Topaz
     # accepts MIDISyncOutput or another Tempo object
     def add_destination(tempo)
       @destinations << tempo
+      @start_time.nil? ? tempo.stop : tempo.start
     end
     alias_method :<<, :add_destination
+    alias_method :sync_from, :add_destination
     
     # sync to another Tempo object
     def sync_to(tempo)
       tempo.add_destination(self)
     end
     
+    # remove all sync connections to <em>tempo</em>
+    def unsync(tempo)
+      @destinations.delete(tempo)
+      tempo.unsync(self)
+    end
+    
     protected
     
     def tick

data/test/test_internal_tempo.rb

@@ -18,12 +18,12 @@ class InternalTempoTest < Test::Unit::TestCase
     assert_equal(count_to, i)
   end
   
-  def test_change_on_click
+  def test_change_on_tick
     i = 0
     count_to = 5
     
     tempo = Tempo.new(120) { i += 1 }
-    tempo.stop_when { i.eql?(count_to) }
+    tempo.stop_when { i == count_to }
     tempo.start
     
     assert_equal(count_to, i)
@@ -32,7 +32,7 @@ class InternalTempoTest < Test::Unit::TestCase
     count_to = 1000
     
     tempo.on_tick { i += 100 }
-    tempo.stop_when { i.eql?(count_to) }
+    tempo.stop_when { i == count_to }
     tempo.start
     
     assert_equal(count_to, i)

metadata

@@ -2,7 +2,7 @@
 name: midi-topaz
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Ari Russo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-26 00:00:00 -04:00
+date: 2011-06-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency