mmplayer 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22ba4c7203b98702ef6771a78b984d725e563b53
-  data.tar.gz: 677cc0a18786f01cbb6de3d832e5d86f41628818
+  metadata.gz: a60391f734494cf22b9e343379660079567721e8
+  data.tar.gz: 4d75bfe1d744172b82fc9866ef9e4af6735d68e4
 SHA512:
-  metadata.gz: 4348a42a44f4d0a9b0a9619bc06fef9d8464cb166d725a1a81dd9f3bbe999265e04e90891b2e3da2cc39ef324b4e3bd290b12639c33e370e8e3179332c0bcbea
-  data.tar.gz: 4f87d5c157d78f51bceaf11cf1a210534261245f0178904daa391bc9c9800f947efe2e5ec669ed9105536444192473dc449e512df244e78a6951b972cdbe2f28
+  metadata.gz: 64d867081ec9fb0b087076da7981aa978b7cc7ca704f01f7c6c8b4d0fa440c40383ecdc93171370e87ba91d0282d4bb6325aa7669c69118d60124c0bc1013054
+  data.tar.gz: 18ca9e448f75dc6d2d97cb071060ea5e49af680a991bb184cb55b9e752454f2a1a45d0073986b97e60182f9afc1d2688b20e87648a8d447a6589e26cbb563943

data/lib/mmplayer.rb

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

data/lib/mmplayer/message_handler.rb

@@ -49,22 +49,16 @@ module MMPlayer
     # @param [MIDIMessage] message
     # @return [Boolean, nil]
     def note_message(message)
-      callback = callback = @callback[:note][message.note] || @callback[:note][nil]
-      unless callback.nil?
-        callback.call(message.velocity)
-        true
-      end
+      call_callback(:note, message.note, message.velocity) |
+      call_catch_all_callback(:note, message)
     end
 
     # Find and call a cc received callback if it exists
     # @param [MIDIMessage] message
     # @return [Boolean, nil]
     def cc_message(message)
-      callback = @callback[:cc][message.index] || @callback[:cc][nil]
-      unless callback.nil?
-        callback.call(message.value)
-        true
-      end
+      call_callback(:cc, message.index, message.value) |
+        call_catch_all_callback(:cc, message)
     end
 
     # Find and call a system message callback if it exists
@@ -72,10 +66,7 @@ module MMPlayer
     # @return [Boolean, nil]
     def system_message(message)
       name = message.name.downcase.to_sym
-      unless (callback = @callback[:system][name]).nil?
-        callback.call
-        true
-      end
+      call_callback(:system, name)
     end
 
     # Find and call a channel message callback if it exists for the given message and channel
@@ -91,6 +82,28 @@ module MMPlayer
       end
     end
 
+    private
+
+    # Execute the catch-all callback for the given type if it exists
+    # @param [Symbol] type
+    # @param [MIDIMessage] message
+    # @return [Boolean]
+    def call_catch_all_callback(type, message)
+      call_callback(type, nil, message)
+    end
+
+    # Execute the callback for the given type and key and pass it the given args
+    # @param [Symbol] type
+    # @param [Object] key
+    # @param [*Object] arguments
+    # @return [Boolean]
+    def call_callback(type, key, *arguments)
+      unless (callback = @callback[type][key]).nil?
+        callback.call(*arguments)
+        true
+      end
+    end
+
   end
 
 end

data/test/message_handler_test.rb

@@ -33,10 +33,14 @@ class MMPlayer::MessageHandlerTest < Minitest::Test
             @var2 = nil
             @catchall = proc { |vel| @var2 = vel }
             @handler.add_callback(:note, nil, &@catchall)
-            @catchall.expects(:call).never
+            @catchall.expects(:call).once
           end
 
-          should "call specific callback" do
+          teardown do
+            @catchall.unstub(:call)
+          end
+
+          should "call both callbacks" do
             assert @handler.send(:note_message, @message)
           end
 

metadata

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