midi-eye 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2e358433961a90c2e113f2733e02b51f21c8c8f
-  data.tar.gz: 04839884db10a8c22e9f98a35002b8f8f88eced8
+  metadata.gz: 7e90eda3aee9f3edfbeb121e91a8de5332499ae1
+  data.tar.gz: 50cc2dc4499ca9f22c61183c0583ba4b98b9694d
 SHA512:
-  metadata.gz: 02ea3f3019522b72bdf2f81379cf3ea44f3ee3eb2b9f5d4cf39b41a9e7c20e48f9ddea50e9fe6789016aabf8dd0f16d1c93f2f625d371e8e7b2c78e916b15106
-  data.tar.gz: 4e0350fceca0351d8000af5d76cd4d81cd02826dcdd0ec31ba7ff9b635b70b97ece08d4192d1716acc2bb2f8aeaf94c775db71be34ddd243f345f35cec444391
+  metadata.gz: 91a4e30f101d2762dabb0d220fd4ca9d12591fbd7821ffe023c86e3aedba9810e2729625b8979aa129fa54943a374485d5e48ca3cfdd8b1f6e0a1581ddaa9dd1
+  data.tar.gz: b08bb9377641d90d296334000a76dfda3a5f70b2c45c33dec5c263a769ce332c2c251cac5fe26b02f7e6016205cb0053dc4cfbf687c2061e64c520d96fd88d99

data/lib/midi-eye.rb

@@ -2,9 +2,9 @@
 # midi-eye
 #
 # MIDI input event listener for Ruby
-# (c)2011-2014 Ari Russo 
-# Licensed under the Apache 2.0 License
-# 
+# (c)2011-2014 Ari Russo
+# Apache 2.0 License
+#
 
 # libs
 require "midi-message"
@@ -17,7 +17,7 @@ require "midi-eye/listener"
 require "midi-eye/source"
 
 module MIDIEye
-  
-  VERSION = "0.3.6"
-  
+
+  VERSION = "0.3.7"
+
 end

data/lib/midi-eye/listener.rb

@@ -1,25 +1,25 @@
 module MIDIEye
-  
+
   class Listener
-    
-    attr_reader :event 
+
+    attr_reader :event
     attr_accessor :sources
-        
+
     # @param [Array<UniMIDI::Input>, UniMIDI::Input] inputs Input(s) to add to the list of sources for this listener
     def initialize(inputs)
       @sources = []
       @event = Event.new
-  
+
       add_input(inputs)
     end
-    
+
     # Does this listener use the given input?
     # @param [UniMIDI::Input] input
     # @return [Boolean]
     def uses_input?(input)
       @sources.any? { |source| source.uses?(input) }
     end
-    
+
     # Add a MIDI source
     # @param [Array<UniMIDI::Input>, UniMIDI::Input] inputs Input(s) to add to the list of sources for this listener
     # @return [Array<MIDIEye::Source>] The updated list of sources for this listener
@@ -32,7 +32,7 @@ module MIDIEye
       @sources
     end
     alias_method :add_inputs, :add_input
-    
+
     # Remove a MIDI source
     # @param [Array<UniMIDI::Input>, UniMIDI::Input] inputs Input(s) to remove from the list of sources for this listener
     # @return [Array<MIDIEye::Source>] The updated list of sources for this listener
@@ -44,18 +44,18 @@ module MIDIEye
       @sources
     end
     alias_method :remove_inputs, :remove_input
-       
+
     # Start listening for MIDI messages
     # @params [Hash] options
     # @option options [Boolean] :background Run in a background thread
     # @return [MIDIEye::Listener] self
-    def run(options = {})      
+    def run(options = {})
       listen
       join unless !!options[:background]
       self
     end
     alias_method :start, :run
-    
+
     # Stop listening for MIDI messages.
     # @return [MIDIEye::Listener] self
     def close
@@ -69,9 +69,9 @@ module MIDIEye
     # Is the listener running?
     # @return [Boolean]
     def running?
-      !@listener.nil?
+      !@listener.nil? && @listener.alive?
     end
-    
+
     # Join the listener if it's being run in the background.
     # @return [MIDIEye::Listener] self
     def join
@@ -89,20 +89,20 @@ module MIDIEye
     # @return [Boolean]
     def delete_event(event_name)
       !@event.delete(event_name).nil?
-    end 
-    
+    end
+
     # Add an event to listen for
     # @param [Hash] options
     # @return [MIDIEye::Listener] self
     def listen_for(options = {}, &callback)
       raise "Listener must have a block" if callback.nil?
       @event.add(options, &callback)
-      self      
+      self
     end
     alias_method :on_message, :listen_for
     alias_method :listen, :listen_for
-    
-    # Poll the input source for new input. This will normally be done by the background thread 
+
+    # Poll the input source for new input. This will normally be done by the background thread
     def poll
       @sources.each do |input|
         input.poll do |objs|
@@ -113,7 +113,7 @@ module MIDIEye
                 data = { :message => message, :timestamp => batch[:timestamp] }
                 @event.enqueue_all(data)
               end
-            end 
+            end
           end
         end
       end
@@ -130,8 +130,8 @@ module MIDIEye
         sleep(interval)
       end
     end
-    
-    # Start the background listener thread    
+
+    # Start the background listener thread
     def listen
       @listener = Thread.new do
         begin
@@ -143,7 +143,7 @@ module MIDIEye
       @listener.abort_on_exception = true
       true
     end
-                            
-  end  
-  
+
+  end
+
 end

data/test/helper.rb

@@ -1,20 +1,23 @@
-#!/usr/bin/env ruby
-
 dir = File.dirname(File.expand_path(__FILE__))
-$LOAD_PATH.unshift dir + '/../lib'
+$LOAD_PATH.unshift(dir + "/../lib")
+
+require "test/unit"
+require "mocha/test_unit"
+require "shoulda-context"
 
-require 'test/unit'
-require 'midi-eye'
+require "midi-eye"
 
 module TestHelper
-  
-  def self.select_devices
+
+  extend self
+
+  def select_devices
     $test_device ||= {}
     { :input => UniMIDI::Input, :output => UniMIDI::Output }.each do |type, klass|
       $test_device[type] = klass.gets
     end
   end
-  
+
   def close_all(input, output, listener)
     listener.close
     input.clear_buffer
@@ -22,7 +25,7 @@ module TestHelper
     output.close
     sleep(0.1)
   end
-     
+
 end
 
-TestHelper.select_devices
+TestHelper.select_devices

data/test/listener_test.rb

@@ -2,153 +2,190 @@ require "helper"
 
 class ListenerTest < Test::Unit::TestCase
 
-  include MIDIEye
-  include MIDIMessage
-  include TestHelper
-  
-  def test_rapid_control_change_message
-    sleep(0.2)
-    output = $test_device[:output]
-    input = $test_device[:input]
-    listener = Listener.new(input)
-    @i = 0
-    listener.listen_for(:class => ControlChange) do |event|
-      @i += 1
-      if @i == 5 * 126
-        close_all(input, output, listener)
-        assert_equal(5 * 126, @i)
+  context "Listener" do
+
+    setup do
+      sleep(0.2)
+      @output = $test_device[:output]
+      @input = $test_device[:input]
+      @listener = MIDIEye::Listener.new(@input)
+    end
+
+    context "basic" do
+
+      setup do
+        @i = 0
+        @listener.listen_for do |event|
+          @i += 1
+          assert_equal(1, @i)
+          TestHelper.close_all(@input, @output, @listener)
+        end
+        @listener.start(:background => true)
+        sleep(0.5)
       end
+
+      should "receive messages" do
+        @output.puts(0x90, 0x40, 0x10)
+        @listener.join
+      end
+
     end
-    listener.start(:background => true)
-    sleep(0.5)
-    5.times do
-      126.times do |i|
-        output.puts(176, 1, i+1)
+
+    context "rapid control change" do
+
+      setup do
+        @i = 0
+        @listener.listen_for(:class => MIDIMessage::ControlChange) do |event|
+          @i += 1
+          if @i == 5 * 126
+            TestHelper.close_all(@input, @output, @listener)
+            assert_equal(5 * 126, @i)
+          end
+        end
+        @listener.start(:background => true)
+        sleep(0.5)
       end
+
+      should "receive messages" do
+        5.times do
+          126.times do |i|
+            @output.puts(176, 1, i+1)
+          end
+        end
+        @listener.join
+      end
+
     end
-    listener.join    
-  end
-  
-  def test_control_change_message
-    sleep(0.2)
-    output = $test_device[:output]
-    input = $test_device[:input]
-    listener = Listener.new(input)
-    listener.listen_for(:class => ControlChange) do |event|
-      assert_equal(ControlChange, event[:message].class)
-      assert_equal(1, event[:message].index)      
-      assert_equal(35, event[:message].value)
-      assert_equal([176, 1, 35], event[:message].to_bytes)
-      close_all(input, output, listener)
+
+    context "control change" do
+
+      setup do
+        @listener.listen_for(:class => MIDIMessage::ControlChange) do |event|
+          assert_equal(MIDIMessage::ControlChange, event[:message].class)
+          assert_equal(1, event[:message].index)
+          assert_equal(35, event[:message].value)
+          assert_equal([176, 1, 35], event[:message].to_bytes)
+          TestHelper.close_all(@input, @output, @listener)
+        end
+        @listener.start(:background => true)
+        sleep(0.5)
+      end
+
+      should "receive messages" do
+        @output.puts(176, 1, 35)
+        @listener.join
+      end
     end
-    listener.start(:background => true)
-    sleep(0.5)
-    output.puts(176, 1, 35)
-    listener.join    
-  end
-  
-  def test_delete_event
-    sleep(0.2)
-    output = $test_device[:output]
-    input = $test_device[:input]
-    listener = Listener.new(input)
-    listener.listen_for(:listener_name => :test) do |event|
-      assert_equal(1, listener.event.count)
-      listener.delete_event(:test)
-      assert_equal(0, listener.event.count)
-      close_all(input, output, listener)
+
+    context "sysex" do
+
+      setup do
+        @listener.listen_for(:class => MIDIMessage::SystemExclusive::Command) do |event|
+          assert_equal(MIDIMessage::SystemExclusive::Command, event[:message].class)
+          assert_equal([0xF0, 0x41, 0x10, 0x42, 0x12, 0x40, 0x00, 0x7F, 0x00, 0x41, 0xF7], event[:message].to_byte_array)
+          TestHelper.close_all(@input, @output, @listener)
+        end
+        @listener.start(:background => true)
+        sleep(0.5)
+      end
+
+      should "receive messages" do
+        @output.puts(0xF0, 0x41, 0x10, 0x42, 0x12, 0x40, 0x00, 0x7F, 0x00, 0x41, 0xF7)
+        @listener.join
+      end
+
     end
-    listener.start(:background => true)
-    sleep(0.5)
-    output.puts(0x90, 0x70, 0x20)
-    listener.join 
-  end
-  
-  def test_uses_input
-    sleep(0.2)
-    output = $test_device[:output]
-    input = $test_device[:input]
-    listener = Listener.new(input)
-    assert_equal(true, listener.uses_input?(input))    
-  end
-  
-  def test_reject_dup_input
-    sleep(0.2)
-    output = $test_device[:output]
-    input = $test_device[:input]
-    listener = Listener.new(input)
-    listener.add_input(input)
-    assert_equal(1, listener.sources.size)     
-  end
-  
-  def test_remove_input
-    sleep(0.2)
-    output = $test_device[:output]
-    input = $test_device[:input]
-    listener = Listener.new(input)
-    assert_equal(1, listener.sources.size)
-    listener.remove_input(input)
-    assert_equal(0, listener.sources.size)  
-  end
-  
-  def test_recognize_input_class
-    sleep(0.2)
-    input = $test_device[:input]
-    output = $test_device[:output]
-    listener = Listener.new(input)
-    assert_equal(Source, listener.sources.first.class)
-    close_all(input, output, listener)
-  end
-  
-  def test_listen_for_basic
-    sleep(0.2)
-    @i = 0
-    output = $test_device[:output]
-    input = $test_device[:input]
-    listener = Listener.new(input)
-    listener.listen_for do |event|
-      @i += 1
-      assert_equal(1, @i)
-      close_all(input, output, listener)
+
+    context "note on" do
+
+      setup do
+        @listener.listen_for(:class => MIDIMessage::NoteOff) do |event|
+          assert_equal(MIDIMessage::NoteOff, event[:message].class)
+          assert_equal(0x50, event[:message].note)
+          assert_equal(0x40, event[:message].velocity)
+          assert_equal([0x80, 0x50, 0x40], event[:message].to_bytes)
+          TestHelper.close_all(@input, @output, @listener)
+        end
+        @listener.start(:background => true)
+        sleep(0.5)
+      end
+
+      should "receive messages" do
+        @output.puts(0x80, 0x50, 0x40)
+        @listener.join
+      end
+
     end
-    listener.start(:background => true)
-    sleep(0.5)
-    output.puts(0x90, 0x40, 0x10)
-    listener.join
-  end
 
-  def test_listen_for_sysex
-    sleep(0.2)
-    output = $test_device[:output]
-    input = $test_device[:input]
-    listener = Listener.new(input)
-    listener.listen_for(:class => SystemExclusive::Command) do |event|
-      assert_equal(SystemExclusive::Command, event[:message].class)
-      assert_equal([0xF0, 0x41, 0x10, 0x42, 0x12, 0x40, 0x00, 0x7F, 0x00, 0x41, 0xF7], event[:message].to_byte_array)
-      close_all(input, output, listener)
+    context "#delete_event" do
+
+      setup do
+        @listener.listen_for(:listener_name => :test) do |event|
+          assert_equal(1, @listener.event.count)
+          @listener.delete_event(:test)
+          assert_equal(0, @listener.event.count)
+          TestHelper.close_all(@input, @output, @listener)
+        end
+        @listener.start(:background => true)
+        sleep(0.5)
+      end
+
+      should "receive messages" do
+        @output.puts(0x90, 0x70, 0x20)
+        @listener.join
+      end
+
     end
-    listener.start(:background => true)
-    sleep(0.5)
-    output.puts(0xF0, 0x41, 0x10, 0x42, 0x12, 0x40, 0x00, 0x7F, 0x00, 0x41, 0xF7)
-    listener.join
-  end
-  
-  def test_listen_for_note_on
-    sleep(0.2)
-    output = $test_device[:output]
-    input = $test_device[:input]
-    listener = Listener.new(input)
-    listener.listen_for(:class => NoteOff) do |event|
-      assert_equal(NoteOff, event[:message].class)
-      assert_equal(0x50, event[:message].note)      
-      assert_equal(0x40, event[:message].velocity)
-      assert_equal([0x80, 0x50, 0x40], event[:message].to_bytes)
-      close_all(input, output, listener)
+
+    context "#uses_input?" do
+
+      should "acknowledge input" do
+        assert @listener.uses_input?(@input)
+      end
+
     end
-    listener.start(:background => true)
-    sleep(0.5)
-    output.puts(0x80, 0x50, 0x40)
-    listener.join
+
+    context "#add_input" do
+
+      should "ignore redundant input" do
+        num_sources = @listener.sources.size
+        @listener.add_input(@input)
+        assert_equal num_sources, @listener.sources.size
+        assert_equal MIDIEye::Source, @listener.sources.last.class
+      end
+
+    end
+
+    context "#remove_input" do
+
+      should "remove input" do
+        num_sources = @listener.sources.size
+        assert num_sources > 0
+        @listener.remove_input(@input)
+        assert_equal num_sources - 1, @listener.sources.size
+      end
+
+    end
+
+    context "#close" do
+
+      setup do
+        @listener.listen_for(:class => MIDIMessage::NoteOff) do |event|
+          TestHelper.close_all(@input, @output, @listener)
+        end
+        @listener.start(:background => true)
+        sleep(0.5)
+        @output.puts(0x80, 0x50, 0x40)
+        @listener.join
+      end
+
+      should "close" do
+        assert @listener.close
+        refute @listener.running?
+      end
+
+    end
+
   end
-  
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: midi-eye
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Ari Russo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-18 00:00:00.000000000 Z
+date: 2014-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: midi-message