midi-topaz 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b2a41127c5fd6c25dda6df2e606bea863e93071
-  data.tar.gz: dbe6b8cfbc54472a0b1793d6679319aac5101b37
+  metadata.gz: 6b9cba48a0b78793392c1fae95b1e3076efe30ac
+  data.tar.gz: 6af1e277ed9207f1f4f371a664e04006d8b12e0e
 SHA512:
-  metadata.gz: a56f09007e305f98015ee8dfbd5eb126ce3c181be06173a5ee24622f1d64b92c7ca2d9afe409ffa1e9a75fe9378376fd718fd92f99b14c64cdd1b64518aa31d7
-  data.tar.gz: 9abd49224fcac0a11c11687c478068e1aaee68e6aea4eb15ef18651b1b2435235ef9c4368edfcb177bf12d60453b2308810084ca2750a17a2ea10e3974d5c4d1
+  metadata.gz: 730961e16d0f611f3050a055ea75707745ab506104a7acb8785eede167097cc0ad5de9db9a2be2b8d7670d6b452c77091c28d7ab5628ef247322d40f06d76e01
+  data.tar.gz: 7130706af9d7f3c4eeb1f758cb94e54a0f884f807889169506e5c6c95b3d053d48e46419d34018171555a8b74e376fd940a6edd8fd7d04ac47efe67c0bbb2a95

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2011-2014 Ari Russo
+Copyright 2011-2015 Ari Russo
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/README.md

@@ -7,10 +7,10 @@ MIDI syncable tempo in Ruby
 ## Installation
 
 `gem install midi-topaz`
-  
+
   or with Bundler, add this to your Gemfile
-  
-`gem "midi-topaz"` 
+
+`gem "midi-topaz"`
 
 ## Usage
 
@@ -22,14 +22,14 @@ For demonstration purposes, here's a mock sequencer class and object
 
 ```ruby
 class Sequencer
-    
+
   def step
     @i ||= 0
     puts "step #{@i+=1}"
   end
-      
+
 end
-  
+
 sequencer = Sequencer.new
 ```
 
@@ -39,19 +39,19 @@ The Topaz clock can now be used to step that sequencer.  Timed by Topaz, the pas
 @clock = Topaz::Clock.new(130) { sequencer.step }
 ```
 
-A MIDI device can be used to time and control the tempo.  To accomplish this, pass a [unimidi](https://github.com/arirusso/unimidi) input to the Clock constructor   
+A MIDI device can be used to time and control the tempo.  To accomplish this, pass a [unimidi](https://github.com/arirusso/unimidi) input to the Clock constructor
 
 ```ruby
-@input = UniMIDI::Input.gets # select a midi input 
-  
+@input = UniMIDI::Input.gets # select a midi input
+
 @clock = Topaz::Clock.new(@input) { sequencer.step }
 ```
-        
+
 Topaz can also act as a MIDI master clock. If a MIDI output is passed to Topaz, MIDI clock messages will automatically be sent to that output at the appropriate time
 
 ```ruby
-@output = UniMIDI::Output.gets # select a midi output 
-  
+@output = UniMIDI::Output.gets # select a midi output
+
 @clock = Topaz::Clock.new(120, :midi => @output) do
   sequencer.step
 end
@@ -60,7 +60,7 @@ end
 Input and multiple outputs can be used simultaneously, for MIDI thru
 
 ```ruby
-@clock = Topaz::Clock.new(@input, :midi => [@output1, @output2]) do 
+@clock = Topaz::Clock.new(@input, :midi => [@output1, @output2]) do
   sequencer.step
 end
 ```
@@ -78,20 +78,20 @@ Topaz will run in a background thread if the option `:background => true` is pas
 ```
 
 If you are syncing to an external MIDI source, this will start the listener waiting for MIDI clock messages.
-  
+
 You can view the current tempo:
 
 ```ruby
 @clock.tempo
   => 132.422000
 ```
-  
+
 Pass in a block that will stop the clock when it evaluates to true
 
 ```ruby
 @clock.trigger.stop { @i == 20 }
 ```
-    
+
 ## Documentation
 
 * [examples](http://github.com/arirusso/topaz/tree/master/examples)
@@ -105,4 +105,4 @@ Pass in a block that will stop the clock when it evaluates to true
 
 Apache 2.0, See the file LICENSE
 
-Copyright (c) 2011-2014 Ari Russo
+Copyright (c) 2011-2015 [Ari Russo](http://arirusso.com)

data/lib/topaz/midi_clock_input.rb

@@ -1,14 +1,14 @@
 module Topaz
-  
+
   # Trigger an event based on received midi clock messages
   class MIDIClockInput
-      
+
     include Pausable
 
     attr_reader :clock, :listening, :running
     alias_method :listening?, :listening
     alias_method :running?, :running
-  
+
     # @param [UniMIDI::Input] input
     # @param [Hash] options
     # @option options [Clock::Event] :event
@@ -23,26 +23,28 @@ module Topaz
 
       initialize_listener(input)
     end
-    
+
     # This will return a calculated tempo
     # @return [Fixnum]
     def tempo
       @tempo_calculator.calculate
     end
-    
+
     # Start the listener
     # @param [Hash] options
     # @option options [Boolean] :background Whether to run the listener in a background process
     # @option options [Boolean] :focus (or :blocking) Whether to run the listener in a foreground process
     # @return [MIDIInputClock] self
-    def start(options = {})  
+    def start(options = {})
       @listening = true
       blocking = options[:focus] || options[:blocking]
-      background = options[:background] || blocking.nil? || blocking.eql?(false)
+      background = !blocking unless blocking.nil?
+      background = options[:background] if background.nil?
+      background = false if background.nil?
       @listener.start(:background => background)
       self
     end
-    
+
     # Stop the listener
     # @return [MIDIInputClock] self
     def stop(*a)
@@ -50,17 +52,17 @@ module Topaz
       @listener.stop
       self
     end
-    
+
     # Join the listener thread
     # @return [MIDIInputClock] self
     def join
       @listener.join
       self
     end
-        
+
     # Change the clock interval
     # Defaults to 4, which means click once every 24 ticks or one quarter note (per MIDI spec).
-    # Therefore, to fire the on_tick event twice as often, pass 8 
+    # Therefore, to fire the on_tick event twice as often, pass 8
     #
     #   1 = whole note
     #   2 = half note
@@ -75,13 +77,13 @@ module Topaz
     def interval=(interval)
       @tick_threshold = interval_to_ticks(interval)
     end
-    
+
     # Return the interval at which the tick event is fired
     # @return [Fixnum]
     def interval
       ticks_to_interval(@tick_threshold)
     end
-    
+
     private
 
     # Convert a note interval to number of ticks
@@ -99,14 +101,14 @@ module Topaz
       note_value = 24 / ticks
       4 * note_value
     end
-    
+
     # Initialize the MIDI input listener
     # @param [UniMIDI::Input] input
     # @return [MIDIEye::Listener]
     def initialize_listener(input)
       @listener = MIDIEye::Listener.new(input)
-      @listener.listen_for(:name => "Clock") { |message| handle_clock_message(message) }     
-      @listener.listen_for(:name => "Start") { handle_start_message } 
+      @listener.listen_for(:name => "Clock") { |message| handle_clock_message(message) }
+      @listener.listen_for(:name => "Start") { handle_start_message }
       @listener.listen_for(:name => "Stop") { handle_stop_message }
       @listener
     end
@@ -178,9 +180,9 @@ module Topaz
     # Should the tick event be fired given the current state?
     # @return [Boolean]
     def tick?
-      @tick_counter >= (@tick_threshold - 1)
+      @tick_counter >= @tick_threshold - 1
     end
-    
+
   end
-  
+
 end

data/lib/topaz.rb

@@ -1,6 +1,9 @@
 #
-# MIDI syncable tempo module in Ruby
-# (c)2011-2014 Ari Russo and licensed under the Apache 2.0 License
+# Topaz
+# MIDI syncable tempo in Ruby
+#
+# (c)2011-2015 Ari Russo
+# Apache 2.0 License
 #
 
 # libs
@@ -23,6 +26,6 @@ require "topaz/timer"
 
 module Topaz
 
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 
 end

data/test/tempo_calculator_test.rb

@@ -25,10 +25,10 @@ class Topaz::TempoCalculatorTest < Minitest::Test
       end
 
       should "express tempo" do
-        5.times { |i| @calc.timestamps << Time.now.to_f; sleep(1.0 / 24.0) }
+        5.times { |i| @calc.timestamps << i * (1.0 / 24.0) }
         result = @calc.calculate
         refute_nil result
-        assert (58..62).include?(result)
+        assert_equal 60, result
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: midi-topaz
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Ari Russo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-03 00:00:00.000000000 Z
+date: 2015-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest