midi-eye 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2944fec81520048f22479d8fa72484928e3dcf65
-  data.tar.gz: bcab4013133af07447f36d6731e8840e9023b0d2
+  metadata.gz: 524bf91e8dbac58feee07b0f696a61ac76d7fb4b
+  data.tar.gz: 7441878d91eedc9e9ebaa08a53667e4e58c9d8cf
 SHA512:
-  metadata.gz: 4b91db15538087d57aa6ab1d7fd250f69ff5f09d12ebfd5c7200813fc6e6db38815d45563cc5d5c5b50ddf7a22ce3b6b17990b398c255f19b53eaa9fce270ccb
-  data.tar.gz: 1c4f0fa96f717e7f179ad4fbdf9608d8ccb76e17d30d08f96d4a75590a7e2f409ff8d29598424bcc853dd17983f570c67aecc979d248f763c89190f38b9bb994
+  metadata.gz: 9ec47d24161b7c87e59f54bb0250a288e93cff135fcfc5e0dd958c21aacdd618b5f462be17c50835c51491053b2e9a2dedf6108b7c3c5f00c07d7e7e77c7e055
+  data.tar.gz: e33ed2441cc4bebef9e79695345d313d222f8f152a8cad368654383c2e02f84d0c8334624d896308aea36b33d69718cbee8dbcc4db9c805a9aa930c8afa40aa9

data/lib/midi-eye.rb

@@ -7,16 +7,17 @@
 # 
 
 # libs
-require 'midi-message'
-require 'nibbler'
-require 'unimidi'
+require "midi-message"
+require "nibbler"
+require "unimidi"
 
 # classes
-require 'midi-eye/listener'
-require 'midi-eye/source'
+require "midi-eye/event"
+require "midi-eye/listener"
+require "midi-eye/source"
 
 module MIDIEye
   
-  VERSION = "0.3.1"
+  VERSION = "0.3.3"
   
 end

data/lib/midi-eye/event.rb

@@ -0,0 +1,93 @@
+module MIDIEye
+  
+  class Event
+
+    def initialize
+      @event = []
+      @queue = []
+    end
+
+    # Delete an event by name
+    # @param [String, Symbol] name
+    def delete(name)
+      @event.delete_if { |event| event[:listener_name].to_s == name.to_s }
+    end
+
+    def clear
+      @event.clear
+      @queue.clear
+    end
+
+    def add(options = {}, &callback)
+      name = options[:listener_name]
+      options.delete(:listener_name)
+      event = { 
+        :conditions => options, 
+        :proc => callback, 
+        :listener_name => name 
+      }
+      @event << event
+      event
+    end
+
+    # Trigger all enqueued events
+    def trigger_enqueued
+      counter = 0
+      while !@queue.empty? do
+        counter += 1
+        trigger(@queue.shift)
+      end
+      counter
+    end
+
+    def enqueue_all(message)
+      @event.each { |name| enqueue(name, message) }
+    end
+
+    # Add an event to the trigger queue 
+    def enqueue(action, message)  
+      event = { 
+        :action => action, 
+        :message => message 
+      }
+      @queue << event
+    end
+
+    def count
+      @event.count
+    end
+
+    private
+
+    # Does the given message meet the given conditions?
+    def meets_conditions?(conditions, message)
+      results = conditions.map do |key, value|
+        if message.respond_to?(key)
+          if value.kind_of?(Array)
+            value.include?(message.send(key))
+          else
+            value.eql?(message.send(key))
+          end
+        else
+          false
+        end
+      end
+      results.all?
+    end
+
+    # Trigger an event
+    def trigger(event)
+      action = event[:action]
+      conditions = action[:conditions]
+      if conditions.nil? || meets_conditions?(conditions, event[:message][:message])
+        begin
+          action[:proc].call(event[:message])
+        rescue Exception => exception
+          Thread.main.raise exception
+        end
+      end
+    end
+    
+  end
+
+end

data/lib/midi-eye/listener.rb

@@ -2,14 +2,13 @@ module MIDIEye
   
   class Listener
     
-    attr_reader :events 
+    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_queue = []
-      @events = []
+      @event = Event.new
   
       add_input(inputs)
     end
@@ -45,12 +44,7 @@ module MIDIEye
       @sources
     end
     alias_method :remove_inputs, :remove_input
-   
-    # @param [Symbol] name
-    def delete_event(name)
-      @events.delete_if { |event| event[:listener_name] == name }
-    end
-    
+       
     # Start listening for MIDI messages
     # @params [Hash] options
     # @option options [Boolean] :background Run in a background thread
@@ -65,39 +59,44 @@ module MIDIEye
     # Stop listening for MIDI messages.
     # @return [MIDIEye::Listener] self
     def close
-      @listener.kill unless @listener.nil?
-      @events.clear
+      @listener.kill if running?
+      @event.clear
       @sources.clear
-      @event_queue.clear
       self
     end
     alias_method :stop, :close
+
+    # Is the listener running?
+    # @return [Boolean]
+    def running?
+      !@listener.nil?
+    end
     
     # Join the listener if it's being run in the background.
     # @return [MIDIEye::Listener] self
     def join
       begin
         @listener.join
-      rescue SystemExit, Interrupt
+      rescue Exception => exception
         @listener.kill
-        raise
+        raise exception
       end
       self
     end
+
+    # Deletes the event with the given name (for backwards compat)
+    # @param [String, Symbol] event_name
+    # @return [Boolean]
+    def delete_event(event_name)
+      !@event.delete(event_name).nil?
+    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?
-      name = options[:listener_name]
-      options.delete(:listener_name)
-      event = { 
-        :conditions => options, 
-        :proc => callback, 
-        :listener_name => name 
-      }
-      @events << event
+      @event.add(options, &callback)
       self      
     end
     alias_method :on_message, :listen_for
@@ -112,7 +111,7 @@ module MIDIEye
             messages.each do |message|
               unless message.nil?
                 data = { :message => message, :timestamp => batch[:timestamp] }
-                @events.each { |name| queue_event(name, data) }
+                @event.enqueue_all(data)
               end
             end 
           end
@@ -127,61 +126,18 @@ module MIDIEye
       interval = 1.0/1000
       loop do
         poll
-        trigger_queued_events unless @event_queue.empty?
+        @event.trigger_enqueued
         sleep(interval)
       end
     end
     
     # Start the background listener thread    
     def listen
-      @listener = Thread.new { listen_loop }       
+      @listener = Thread.new { listen_loop }      
       @listener.abort_on_exception = true
       true
     end
-    
-    # Trigger all queued events
-    def trigger_queued_events
-      @event_queue.length.times { trigger_event(@event_queue.shift) }
-    end
-    
-    # Does the given message meet the given conditions?
-    def meets_conditions?(conditions, message)
-      results = conditions.map do |key, value|
-        if message.respond_to?(key)
-          if value.kind_of?(Array)
-            value.include?(message.send(key))
-          else
-            value.eql?(message.send(key))
-          end
-        else
-          false
-        end
-      end
-      results.all?
-    end
-    
-    # Trigger an event
-    def trigger_event(event)
-      action = event[:action]
-      conditions = action[:conditions]
-      if conditions.nil? || meets_conditions?(conditions, event[:message][:message])
-        begin
-          action[:proc].call(event[:message])
-        rescue
-          # help
-        end
-      end
-    end
-    
-    # Add an event to the trigger queue 
-    def queue_event(action, message)  
-      event = { 
-        :action => action, 
-        :message => message 
-      }
-      @event_queue << event
-    end
-                
+                            
   end  
   
 end

data/test/listener_test.rb

@@ -53,9 +53,9 @@ class ListenerTest < Test::Unit::TestCase
     input = $test_device[:input]
     listener = Listener.new(input)
     listener.listen_for(:listener_name => :test) do |event|
-      assert_equal(1, listener.events.size)
+      assert_equal(1, listener.event.count)
       listener.delete_event(:test)
-      assert_equal(0, listener.events.size)
+      assert_equal(0, listener.event.count)
       close_all(input, output, listener)
     end
     listener.start(:background => true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: midi-eye
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Ari Russo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-30 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: midi-message
@@ -62,6 +62,7 @@ files:
 - LICENSE
 - README.md
 - lib/midi-eye.rb
+- lib/midi-eye/event.rb
 - lib/midi-eye/listener.rb
 - lib/midi-eye/source.rb
 - test/helper.rb