mmplayer 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fed9ad028c5f486dafc21121e361ebba0891d1d
-  data.tar.gz: 5305dd407a4542789cb8ebda7b5f57962e66cbf3
+  metadata.gz: 22ba4c7203b98702ef6771a78b984d725e563b53
+  data.tar.gz: 677cc0a18786f01cbb6de3d832e5d86f41628818
 SHA512:
-  metadata.gz: 2413f416a0e7b22a7985cf90fe536da6e4758265e8e5dfe77435c2877bf92c67b52edea0c954e3fefe948e8f71410a84dba2f1b59f8dfd5151eae0949f440f5b
-  data.tar.gz: 879d06f34a5770b915fa141bf53bcab43c367d3e6c310c3c444d092d6669c928600a75dee183d38df47e34a722a1ead26eee7ac0390702c09c01ac504b349896
+  metadata.gz: 4348a42a44f4d0a9b0a9619bc06fef9d8464cb166d725a1a81dd9f3bbe999265e04e90891b2e3da2cc39ef324b4e3bd290b12639c33e370e8e3179332c0bcbea
+  data.tar.gz: 4f87d5c157d78f51bceaf11cf1a210534261245f0178904daa391bc9c9800f947efe2e5ec669ed9105536444192473dc449e512df244e78a6951b972cdbe2f28

data/lib/mmplayer/instructions/midi.rb

@@ -22,19 +22,19 @@ module MMPlayer
       alias_method :system, :on_system
 
       # Assign a callback for a given MIDI note
-      # @param [Fixnum, String] note A MIDI note eg 64 "F4"
+      # @param [Fixnum, String] note A MIDI note eg 64 "F4" or nil for all
       # @param [Proc] callback The callback to execute when a matching message is received
       # @return [Hash]
-      def on_note(note, &callback)
+      def on_note(note = nil, &callback)
         @midi.add_note_callback(note, &callback)
       end
       alias_method :note, :on_note
 
       # Assign a callback for the given MIDI control change
-      # @param [Fixnum] index The MIDI control change index to assign the callback for
+      # @param [Fixnum] index The MIDI control change index to assign the callback for or nil for all
       # @param [Proc] callback The callback to execute when a matching message is received
       # @return [Hash]
-      def on_cc(index, &callback)
+      def on_cc(index = nil, &callback)
         @midi.add_cc_callback(index, &callback)
       end
       alias_method :cc, :on_cc

data/lib/mmplayer/message_handler.rb

@@ -13,9 +13,9 @@ module MMPlayer
       }
     end
 
-    # Add a callback for a given MIDI system message type
+    # Add a callback for a given MIDI message type
     # @param [Symbol] type The MIDI message type (eg :note, :cc)
-    # @param [String, Symbol] key
+    # @param [Fixnum, String] key The ID of the message eg note number/cc index
     # @param [Proc] callback The callback to execute when the given MIDI command is received
     # @return [Hash]
     def add_callback(type, key, &callback)
@@ -23,6 +23,16 @@ module MMPlayer
       @callback[type]
     end
 
+    # Add a callback for a given MIDI note
+    # @param [Symbol] type The MIDI message type (eg :note, :cc)
+    # @param [Fixnum, String] note
+    # @param [Proc] callback The callback to execute when the given MIDI command is received
+    # @return [Hash]
+    def add_note_callback(note, &callback)
+      note = MIDIMessage::Constant.value(:note, note) if note.kind_of?(String)
+      add_callback(:note, note, &callback)
+    end
+
     # Process a message for the given channel
     # @param [Fixnum, nil] channel
     # @param [MIDIMessage] message
@@ -39,7 +49,8 @@ module MMPlayer
     # @param [MIDIMessage] message
     # @return [Boolean, nil]
     def note_message(message)
-      unless (callback = @callback[:note][message.note] || @callback[:note][message.name]).nil?
+      callback = callback = @callback[:note][message.note] || @callback[:note][nil]
+      unless callback.nil?
         callback.call(message.velocity)
         true
       end
@@ -49,7 +60,8 @@ module MMPlayer
     # @param [MIDIMessage] message
     # @return [Boolean, nil]
     def cc_message(message)
-      unless (callback = @callback[:cc][message.index] || @callback[:cc][message.name]).nil?
+      callback = @callback[:cc][message.index] || @callback[:cc][nil]
+      unless callback.nil?
         callback.call(message.value)
         true
       end

data/lib/mmplayer/midi.rb

@@ -23,15 +23,15 @@ module MMPlayer
     end
 
     # Add a callback for a given MIDI note
-    # @param [Fixnum, String] note The MIDI note to add a callback for eg 64 "E4"
+    # @param [Fixnum, String, nil] note The MIDI note to add a callback for eg 64 "E4"
     # @param [Proc] callback The callback to execute when the given MIDI note is received
     # @return [Hash]
     def add_note_callback(note, &callback)
-      @message_handler.add_callback(:note, note, &callback)
+      @message_handler.add_note_callback(note, &callback)
     end
 
     # Add a callback for a given MIDI control change
-    # @param [Fixnum] index The MIDI control change index to add a callback for eg 10
+    # @param [Fixnum, nil] index The MIDI control change index to add a callback for eg 10
     # @param [Proc] callback The callback to execute when the given MIDI control change is received
     # @return [Hash]
     def add_cc_callback(index, &callback)

data/lib/mmplayer.rb

@@ -24,7 +24,7 @@ require "mmplayer/player"
 
 module MMPlayer
 
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 
   # Shortcut to Context constructor
   def self.new(*args, &block)

data/test/message_handler_test.rb

@@ -27,16 +27,54 @@ class MMPlayer::MessageHandlerTest < Minitest::Test
           @callback.unstub(:call)
         end
 
-        should "call callback" do
-          assert @handler.send(:note_message, @message)
+        context "has catch-all callback" do
+
+          setup do
+            @var2 = nil
+            @catchall = proc { |vel| @var2 = vel }
+            @handler.add_callback(:note, nil, &@catchall)
+            @catchall.expects(:call).never
+          end
+
+          should "call specific callback" do
+            assert @handler.send(:note_message, @message)
+          end
+
+        end
+
+        context "no catch-all callback" do
+
+          should "call specific callback" do
+            assert @handler.send(:note_message, @message)
+          end
+
         end
 
       end
 
       context "callback doesn't exist" do
 
-        should "do nothing" do
-          refute @handler.send(:note_message, @message)
+        context "has catch-all callback" do
+
+          setup do
+            @var = nil
+            @callback = proc { |vel| @var = vel }
+            @handler.add_callback(:note, nil, &@callback)
+            @callback.expects(:call).once
+          end
+
+          should "call callback" do
+            assert @handler.send(:note_message, @message)
+          end
+
+        end
+
+        context "no catch-all callback" do
+
+          should "do nothing" do
+            refute @handler.send(:note_message, @message)
+          end
+
         end
 
       end
@@ -70,8 +108,27 @@ class MMPlayer::MessageHandlerTest < Minitest::Test
 
       context "callback doesn't exist" do
 
-        should "do nothing" do
-          refute @handler.send(:cc_message, @message)
+        context "has catch-all callback" do
+
+          setup do
+            @var = nil
+            @callback = proc { |vel| @var = vel }
+            @handler.add_callback(:cc, nil, &@callback)
+            @callback.expects(:call).once
+          end
+
+          should "call callback" do
+            assert @handler.send(:cc_message, @message)
+          end
+
+        end
+
+        context "no catch-all callback" do
+
+          should "do nothing" do
+            refute @handler.send(:cc_message, @message)
+          end
+
         end
 
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mmplayer
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ari Russo