midi-message 0.3.1 → 0.3.2

data/README.rdoc

@@ -1,6 +1,6 @@
 = MIDI Message
 
-{pic}[http://images.treetrouble.net/images/mks80_small.jpg]
+{pic}[http://img208.imageshack.us/img208/5623/mks80small.jpg]
 
 MIDI messages, objectified in Ruby
 

data/lib/midi-message/system_message.rb

@@ -2,6 +2,22 @@
 #
 
 module MIDIMessage
+
+  #
+  # MIDI System message
+  #
+  module SystemMessage
+
+    # In the case of something like SystemCommon.new(0xF2, 0x00, 0x08), the first nibble F is redundant because
+    # all system messages start with 0xF and it can be assumed.
+    # However, the this method looks to see if this has occurred and strips the redundancy
+    # @param [Integer] byte The byte to strip of a redundant 0xF
+    # @return [Integer] The remaining nibble
+    def strip_redundant_nibble(byte)
+      byte > 0xF ? (byte & 0x0F) : byte
+    end
+
+  end
   
   #
   # MIDI System-Common message
@@ -9,6 +25,7 @@ module MIDIMessage
   class SystemCommon
 
     include ShortMessage
+    include SystemMessage
     use_display_name 'System Common'
     
     attr_reader :data
@@ -16,9 +33,10 @@ module MIDIMessage
     def initialize(*a)
       options = a.last.kind_of?(Hash) ? a.pop : {}
       @const = options[:const]
-      @data = [a[1], a[2]]
-      second_nibble = @const.nil? ? a[0] : @const.value 
-      initialize_short_message(0xF, second_nibble)
+      id = @const.nil? ? a.shift : @const.value
+      id = strip_redundant_nibble(id)
+      initialize_short_message(0xF, id)
+      @data = [a[0], a[1]]
     end
     
   end  
@@ -29,12 +47,14 @@ module MIDIMessage
   class SystemRealtime
 
     include ShortMessage
+    include SystemMessage
     use_display_name 'System Realtime'
     
     def initialize(*a)
       options = a.last.kind_of?(Hash) ? a.pop : {} 
       @const = options[:const]
       id = @const.nil? ? a[0] : @const.value
+      id = strip_redundant_nibble(id)
       initialize_short_message(0xF, id)
     end
 

data/lib/midi-message.rb

@@ -11,7 +11,7 @@ module MIDIMessage
   module Process    
   end
   
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
  
 end
 
@@ -37,4 +37,4 @@ require "midi-message/process/processor"
 require "midi-message/event/note"
 require "midi-message/process/filter"
 require "midi-message/process/limit"
-require "midi-message/process/transpose"
+require "midi-message/process/transpose"

data/lib/midi.yml

@@ -110,6 +110,7 @@ Manufacturer:
 
   Emagic: [0x00, 0x20, 0x31]
   Behringer: [0x00, 0x20, 0x32]
+  Access: [0x00, 0x20, 0x33]
 
 Note:
   C-1: 0

data/test/test_short_message.rb

@@ -120,4 +120,4 @@ class ShortMessageTest < Test::Unit::TestCase
     assert_equal("F8", msg.to_bytestr)     
   end        
    
-end
+end

data/test/test_system_message.rb

@@ -0,0 +1,71 @@
+#!/usr/bin/env ruby
+
+require 'helper'
+
+class SystemMessageTest < Test::Unit::TestCase
+
+  include MIDIMessage
+  include TestHelper
+
+  def test_system_common
+    msg = SystemCommon.new(0x2, 0x00, 0x08)
+    assert_equal("Song Position Pointer", msg.name)
+    assert_equal(0xF, msg.status[0])
+    assert_equal(0x2, msg.status[1])
+    assert_equal(0x00, msg.data[0])
+    assert_equal(0x08, msg.data[1])
+    assert_equal([0xF2, 0x00, 0x08], msg.to_a)
+    assert_equal("F20008", msg.to_bytestr)    
+  end
+
+  def test_system_common_redundant
+    msg = SystemCommon.new(0xF2, 0x00, 0x08)
+    assert_equal("Song Position Pointer", msg.name)
+    assert_equal(0xF, msg.status[0])
+    assert_equal(0x2, msg.status[1])
+    assert_equal(0x00, msg.data[0])
+    assert_equal(0x08, msg.data[1])
+    assert_equal([0xF2, 0x00, 0x08], msg.to_a)
+    assert_equal("F20008", msg.to_bytestr)    
+  end
+
+  def test_system_common_constant  
+    msg = SystemCommon["Song Position Pointer"].new(0x00, 0x08)
+    assert_equal("Song Position Pointer", msg.name)
+    assert_equal(0xF, msg.status[0])
+    assert_equal(0x2, msg.status[1])
+    assert_equal(0x00, msg.data[0])
+    assert_equal(0x08, msg.data[1])
+    assert_equal([0xF2, 0x00, 0x08], msg.to_a)
+    assert_equal("F20008", msg.to_bytestr) 
+  end
+
+  def test_system_realtime   
+    msg = SystemRealtime.new(0x8)
+    assert_equal("Clock", msg.name)
+    assert_equal(0xF, msg.status[0])
+    assert_equal(0x8, msg.status[1])
+    assert_equal([0xF8], msg.to_a)
+    assert_equal("F8", msg.to_bytestr)    
+  end      
+
+  def test_system_realtime_redundant   
+    msg = SystemRealtime.new(0xF8)
+    assert_equal("Clock", msg.name)
+    assert_equal(0xF, msg.status[0])
+    assert_equal(0x8, msg.status[1])
+    assert_equal([0xF8], msg.to_a)
+    assert_equal("F8", msg.to_bytestr)    
+  end  
+
+  def test_system_realtime_constant    
+    msg = SystemRealtime["Clock"].new
+    assert_equal("Clock", msg.name)
+    assert_equal(0xF, msg.status[0])
+    assert_equal(0x8, msg.status[1])
+    assert_equal([0xF8], msg.to_a)
+    assert_equal("F8", msg.to_bytestr)   
+  end   
+
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: midi-message
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-27 00:00:00.000000000Z
+date: 2012-09-17 00:00:00.000000000 Z
 dependencies: []
 description: MIDI messages, objectified in Ruby
 email:
@@ -45,6 +45,7 @@ files:
 - test/test_processor.rb
 - test/test_short_message.rb
 - test/test_system_exclusive.rb
+- test/test_system_message.rb
 - test/test_transpose.rb
 - LICENSE
 - README.rdoc
@@ -69,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: midi-message
-rubygems_version: 1.8.6
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: MIDI messages, objectified in Ruby