midi-eye 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2897d59e2db3e4f1cbe6c485d2e0e8ea0d75aee5
-  data.tar.gz: 9337eef0af176b3e749bcd12aecf536872b5a7ea
+  metadata.gz: df1b8c5bbb797b25f58dfe308f5a30b97d3d7897
+  data.tar.gz: 6bdc24368840613721fc897b1e64d3892042c8d7
 SHA512:
-  metadata.gz: a02acd381abb2e9e92aa0049508d90f1052969974ada2fae9ca815e0a186af4d9445f4cf39800fcf4f2fc95559bc41d533d536b217aeb6e69beb90396b81e44f
-  data.tar.gz: 19116b5b9d606a59541411936aa4d35afac2ffa9f49986748d2c4d594ddd6c4fbb1ecde347e5e3122834fd4ee64d5d63da91de866a7103818edc4fda34dcb1c8
+  metadata.gz: fba1db63b3c1d8399eb9f6443a976e8be5ef9e75959d8ec693c4206f8b28d0ffc9b7c7146db2755367cbdfcf2d2477e755b2e685fe7d30db85a1c595c2eee6e1
+  data.tar.gz: 8d23fb30ed11046561b6bf3b6833e78a49042e6ae0c4aaf27b362070a3e46ba7faf8cc37427ef52212273e0663dc9e85ba8f728b394f549378582f2b1f7f30bf

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2011-2014 Ari Russo
+Copyright 2011-2017 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

@@ -1,15 +1,15 @@
 # MIDI EYE
 
-MIDI input event listener for Ruby 
+MIDI input event listener for Ruby
 
 ## Install
 
 `gem install midi-eye`
-  
+
 or using Bundler, add this to your Gemfile
 
 `gem "midi-eye"`
-	
+
 ## Usage
 
 ```ruby
@@ -17,17 +17,17 @@ require 'midi-eye'
 ```
 
 The following is an example that takes any note messages received from a unimidi input, transposes them up one octave and then sends them to an output  
-  
+
 First, pick some MIDI IO ports
 
-```ruby 
+```ruby
 @input = UniMIDI::Input.gets
 @output = UniMIDI::Output.gets
 ```
 
 Then create a listener for the input port
 
-```ruby 
+```ruby
 transpose = MIDIEye::Listener.new(@input)
 ```
 
@@ -39,23 +39,23 @@ In this example, we specify that the listener listens for note on/off messages,
 
 ```ruby
 transpose.listen_for(:class => [MIDIMessage::NoteOn, MIDIMessage::NoteOff]) do |event|
-   
+
   # raise the note value by an octave
   event[:message].note += 12
-    
-  # send the altered note message to the output you chose earlier 
+
+  # send the altered note message to the output you chose earlier
   @output.puts(event[:message])
-  
+
 end
 ```
 
 There is also the option of leaving out the parameters altogether and including using conditional if/unless/case/etc statements in the callback.
-  
+
 You can bind as many events to a listener as you wish by repeatedly calling `Listener#listen_for`
 
 Once all the events are bound, start the listener
 
-```ruby    
+```ruby
 transpose.run
 ```
 
@@ -63,7 +63,7 @@ A listener can also be run in a background thread by passing in `:background =>
 
 ```ruby
 transpose.run(:background => true)
-  
+
 transpose.join # join the background thread later
 ```
 
@@ -71,7 +71,7 @@ transpose.join # join the background thread later
 
 * [examples](http://github.com/arirusso/midi-eye/tree/master/examples)
 * [rdoc](http://rdoc.info/gems/midi-eye)
-    
+
 ## Author
 
 * [Ari Russo](http://github.com/arirusso) <ari.russo at gmail.com>
@@ -80,4 +80,4 @@ transpose.join # join the background thread later
 
 Apache 2.0, See the file LICENSE
 
-Copyright (c) 2011-2014 Ari Russo
+Copyright (c) 2011-2017 [Ari Russo](http://arirusso.com)

data/lib/midi-eye.rb

@@ -1,12 +1,14 @@
 #
 # midi-eye
-#
 # MIDI input event listener for Ruby
-# (c)2011-2014 Ari Russo
+# https://github.com/arirusso/midi-eye
+#
+# (c)2011-2017 Ari Russo
 # Apache 2.0 License
 #
 
 # libs
+require "forwardable"
 require "midi-message"
 require "nibbler"
 require "unimidi"
@@ -18,6 +20,6 @@ require "midi-eye/source"
 
 module MIDIEye
 
-  VERSION = "0.3.9"
+  VERSION = "0.3.10"
 
 end

data/lib/midi-eye/event.rb

@@ -1,11 +1,15 @@
 module MIDIEye
-  
+
   # User defined callbacks for input events
   class Event
 
+    extend Forwardable
+
+    def_delegators :@event, :count
+
     def initialize
       @event = []
-      @queue = []
+      @queue = Queue.new
     end
 
     # Delete an event by name
@@ -29,10 +33,10 @@ module MIDIEye
     def add(options = {}, &callback)
       name = options[:listener_name]
       options.delete(:listener_name)
-      event = { 
-        :conditions => options, 
-        :proc => callback, 
-        :listener_name => name 
+      event = {
+        :conditions => options,
+        :proc => callback,
+        :listener_name => name
       }
       @event << event
       event
@@ -57,21 +61,15 @@ module MIDIEye
 
     # Add an event to the trigger queue
     # @return [Hash]
-    def enqueue(action, message)  
-      event = { 
-        :action => action, 
-        :message => message 
+    def enqueue(action, message)
+      event = {
+        :action => action,
+        :message => message
       }
       @queue << event
       event
     end
 
-    # The number of events
-    # @return [Fixnum]
-    def count
-      @event.count
-    end
-
     private
 
     # Does the given message meet the given conditions?
@@ -98,11 +96,11 @@ module MIDIEye
         begin
           action[:proc].call(event[:message])
         rescue Exception => exception
-          Thread.main.raise exception
+          Thread.main.raise(exception)
         end
       end
     end
-    
+
   end
 
 end

data/lib/midi-eye/listener.rb

@@ -2,6 +2,8 @@ module MIDIEye
 
   class Listener
 
+    LISTEN_INTERVAL = 1.0 / 1000
+
     attr_reader :event
     attr_accessor :sources
 
@@ -25,10 +27,8 @@ module MIDIEye
     # @return [Array<MIDIEye::Source>] The updated list of sources for this listener
     def add_input(inputs)
       inputs = [inputs].flatten.compact
-      new_sources = inputs.map do |input|
-        Source.new(input) unless uses_input?(input)
-      end
-      @sources += new_sources.compact
+      input_sources = inputs.reject { |input| uses_input?(input) }
+      @sources += input_sources.map { |input| Source.new(input) }
       @sources
     end
     alias_method :add_inputs, :add_input
@@ -100,7 +100,6 @@ module MIDIEye
       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
     def poll
@@ -109,10 +108,11 @@ module MIDIEye
           objs.each do |batch|
             messages = [batch[:messages]].flatten.compact
             messages.each do |message|
-              unless message.nil?
-                data = { :message => message, :timestamp => batch[:timestamp] }
-                @event.enqueue_all(data)
-              end
+              data = {
+                :message => message,
+                :timestamp => batch[:timestamp]
+              }
+              @event.enqueue_all(data)
             end
           end
         end
@@ -123,11 +123,10 @@ module MIDIEye
 
     # A loop that runs while the listener is active
     def listen_loop
-      interval = 1.0/1000
       loop do
         poll
         @event.trigger_enqueued
-        sleep(interval)
+        sleep(LISTEN_INTERVAL)
       end
     end
 

data/lib/midi-eye/source.rb

@@ -1,44 +1,46 @@
 module MIDIEye
-  
+
   # Retrieves new messages from a unimidi input buffer
   class Source
-    
+
     attr_reader :device, :pointer
-    
+
+    # Whether the given object is a UniMIDI input
+    # @param [Object] input
+    # @return [Boolean]
+    def self.compatible?(input)
+      input.respond_to?(:gets) && input.respond_to?(:buffer)
+    end
+
     # @param [UniMIDI::Input] input
-    def initialize(input)   
+    def initialize(input)
       @parser = Nibbler.new
       @pointer = 0
       @device = input
     end
-    
+
     # Grabs new messages from the input buffer
     def poll(&block)
       messages = @device.buffer.slice(@pointer, @device.buffer.length - @pointer)
       @pointer = @device.buffer.length
-      messages.each do |raw_message| 
-        unless raw_message.nil?
-          parsed_messages = @parser.parse(raw_message[:data], :timestamp => raw_message[:timestamp]) rescue nil
-          objects = [parsed_messages].flatten.compact
-          yield(objects)
+      messages.compact.each do |raw_message|
+        parsed_messages = begin
+          @parser.parse(raw_message[:data], :timestamp => raw_message[:timestamp])
+        rescue
+          nil
         end
-      end    
-    end
-    
-    # Whether the given object is a UniMIDI input
-    # @param [Object] input
-    # @return [Boolean]
-    def self.compatible?(input)
-      input.respond_to?(:gets) && input.respond_to?(:buffer)
+        objects = [parsed_messages].flatten.compact
+        yield(objects)
+      end
     end
-    
+
     # If this source was created from the given input
     # @param [UniMIDI::Input] input
     # @return [Boolean]
     def uses?(input)
       @device == input
     end
-        
+
   end
-            
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: midi-eye
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors:
 - Ari Russo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-31 00:00:00.000000000 Z
+date: 2017-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -167,7 +167,7 @@ files:
 - test/listener_test.rb
 homepage: http://github.com/arirusso/midi-eye
 licenses:
-- Apache 2.0
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -185,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: midi-eye
-rubygems_version: 2.2.2
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: MIDI event listener for Ruby