midi-message 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3524480addf08fbff3d0ff0895a035b24cebf1d8
-  data.tar.gz: 83faadad1ad868779a0a22354d1dc877d4ec5d4e
+  metadata.gz: 6e0111fbc4f13b3de102dff3ebbdc0b2ccda001c
+  data.tar.gz: 77408d5b1a726b00d7c4032530c8c361fd31e8dc
 SHA512:
-  metadata.gz: b9aeefc9a4b4dd10e1a9cb42771ca5266fe90cf461654694b0aba55415178da6ec26c1b3c04c5bbc085417be2c4f6cd3d0a0f30046b09329079ead357f6cd971
-  data.tar.gz: ab692acd6ec98d41c5b9c538f59dc0159a1431c977bf7dd738ce452e07fa05b726cfc075dcccceda3a393024996bc6d6fa5351d53171aec8e75596f5a40390fe
+  metadata.gz: 1fafe7abcdaf8e90df0bcaeeb49d680266ba453dbf21c28aae68a5dd1d97fd962b9e59077bab2fbafc15872563c674a965dae51a666190235d37b5722b3b8c0c
+  data.tar.gz: 575a16f20a645fbd7cf6304716ab35120d8718fdecca41bea197c09fc55202e225ef48a9930a6aa226cca7c6bc635e22fb49b90cff54651af0ed759e2913dfdd

data/lib/midi-message.rb

@@ -25,6 +25,6 @@ require "midi-message/parser"
 
 module MIDIMessage
 
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 
 end

data/lib/midi-message/channel_message.rb

@@ -54,10 +54,8 @@ module MIDIMessage
       ]
       properties.each_with_index do |property, i|
         property_schema = schema[i]
-        container = send(property_schema[:name])
-        index = property_schema[:index]
-        define_getter(property, container, index)
-        define_setter(property, container, index)
+        define_getter(property, property_schema)
+        define_setter(property, property_schema)
         has_properties = true
       end
       has_properties
@@ -67,7 +65,9 @@ module MIDIMessage
     # @param [Hash] container
     # @param [Fixnum] index
     # @return [Boolean]
-    def define_getter(property, container, index)
+    def define_getter(property, property_schema)
+      container = send(property_schema[:name])
+      index = property_schema[:index]
       self.class.send(:attr_reader, property)
       instance_variable_set("@#{property.to_s}", container[index])
       true
@@ -77,10 +77,11 @@ module MIDIMessage
     # @param [Hash] container
     # @param [Fixnum] index
     # @return [Boolean]
-    def define_setter(property, container, index)
+    def define_setter(property, property_schema)
+      index = property_schema[:index]
       self.class.send(:define_method, "#{property.to_s}=") do |value|
         send(:instance_variable_set, "@#{property.to_s}", value)
-        container[index] = value
+        send(property_schema[:name])[index] = value
         update
         return self
       end

data/test/message_test.rb

@@ -3,51 +3,70 @@ require "helper"
 class ShortMessageTest < Minitest::Test
 
   def test_channel_message
-    msg = MIDIMessage::ChannelMessage.new(0x9, 0x0, 0x40, 0x40)
-    assert_equal(0x9, msg.status[0])
-    assert_equal(0x0, msg.status[1])
-    assert_equal(0x40, msg.data[0])
-    assert_equal(0x40, msg.data[1])
-    assert_equal([0x90, 0x40, 0x40], msg.to_a)
-    assert_equal("904040", msg.to_bytestr)
+    message = MIDIMessage::ChannelMessage.new(0x9, 0x0, 0x40, 0x40)
+    assert_equal(0x9, message.status[0])
+    assert_equal(0x0, message.status[1])
+    assert_equal(0x40, message.data[0])
+    assert_equal(0x40, message.data[1])
+    assert_equal([0x90, 0x40, 0x40], message.to_a)
+    assert_equal("904040", message.to_bytestr)
   end
 
   def test_to_type
-    msg = MIDIMessage::ChannelMessage.new(0x9, 0x0, 0x40, 0x40)
-    typemsg = msg.to_type
-    assert_equal(MIDIMessage::NoteOn, typemsg.class)
-    assert_equal(msg.status[1], typemsg.channel)
-    assert_equal(msg.data[0], typemsg.note)
-    assert_equal(msg.data[1], typemsg.velocity)
-    assert_equal(msg.to_a, typemsg.to_a)
-    assert_equal(msg.to_bytestr, typemsg.to_bytestr)
+    message = MIDIMessage::ChannelMessage.new(0x9, 0x0, 0x40, 0x40)
+    typemessage = message.to_type
+    assert_equal(MIDIMessage::NoteOn, typemessage.class)
+    assert_equal(message.status[1], typemessage.channel)
+    assert_equal(message.data[0], typemessage.note)
+    assert_equal(message.data[1], typemessage.velocity)
+    assert_equal(message.to_a, typemessage.to_a)
+    assert_equal(message.to_bytestr, typemessage.to_bytestr)
   end
 
   def test_note_off
-    msg = MIDIMessage::NoteOff.new(0, 0x40, 0x40)
-    assert_equal(0, msg.channel)
-    assert_equal(0x40, msg.note)
-    assert_equal(0x40, msg.velocity)
-    assert_equal([0x80, 0x40, 0x40], msg.to_a)
-    assert_equal("804040", msg.to_bytestr)
+    message = MIDIMessage::NoteOff.new(0, 0x40, 0x40)
+    assert_equal(0, message.channel)
+    assert_equal(0x40, message.note)
+    assert_equal(0x40, message.velocity)
+    assert_equal([0x80, 0x40, 0x40], message.to_a)
+    assert_equal("804040", message.to_bytestr)
   end
 
   def test_note_on
-    msg = MIDIMessage::NoteOn.new(0, 0x40, 0x40)
-    assert_equal(0, msg.channel)
-    assert_equal(0x40, msg.note)
-    assert_equal(0x40, msg.velocity)
-    assert_equal([0x90, 0x40, 0x40], msg.to_a)
-    assert_equal("904040", msg.to_bytestr)
+    message = MIDIMessage::NoteOn.new(1, 0x40, 0x40)
+    assert_equal(1, message.channel)
+    assert_equal(0x40, message.note)
+    assert_equal(0x40, message.velocity)
+    assert_equal([0x91, 0x40, 0x40], message.to_a)
+    assert_equal("914040", message.to_bytestr)
+    assert_equal([0x91, 0x40, 0x40], message.to_bytes)
+  end
+
+  def test_change_channel
+    message = MIDIMessage::NoteOn.new(1, 0x40, 0x40)
+    assert_equal(1, message.channel)
+    assert_equal(0x40, message.note)
+    assert_equal(0x40, message.velocity)
+    assert_equal([0x91, 0x40, 0x40], message.to_a)
+    assert_equal("914040", message.to_bytestr)
+    assert_equal([0x91, 0x40, 0x40], message.to_bytes)
+
+    message.channel = 3
+    assert_equal(3, message.channel)
+    assert_equal(0x40, message.note)
+    assert_equal(0x40, message.velocity)
+    assert_equal([0x93, 0x40, 0x40], message.to_a)
+    assert_equal("934040", message.to_bytestr)
+    assert_equal([0x93, 0x40, 0x40], message.to_bytes)
   end
 
   def test_note_on_to_note_off
-    msg = MIDIMessage::NoteOn.new(0, 0x40, 0x40)
-    assert_equal(0, msg.channel)
-    assert_equal(0x40, msg.note)
-    assert_equal(0x40, msg.velocity)
-    assert_equal([0x90, 0x40, 0x40], msg.to_a)
-    off = msg.to_note_off
+    message = MIDIMessage::NoteOn.new(0, 0x40, 0x40)
+    assert_equal(0, message.channel)
+    assert_equal(0x40, message.note)
+    assert_equal(0x40, message.velocity)
+    assert_equal([0x90, 0x40, 0x40], message.to_a)
+    off = message.to_note_off
     assert_equal(0, off.channel)
     assert_equal(0x40, off.note)
     assert_equal(0x40, off.velocity)
@@ -56,63 +75,63 @@ class ShortMessageTest < Minitest::Test
 
 
   def test_polyphonic_aftertouch
-    msg = MIDIMessage::PolyphonicAftertouch.new(1, 0x40, 0x40)
-    assert_equal(1, msg.channel)
-    assert_equal(0x40, msg.note)
-    assert_equal(0x40, msg.value)
-    assert_equal([0xA1, 0x40, 0x40], msg.to_a)
-    assert_equal("A14040", msg.to_bytestr)
+    message = MIDIMessage::PolyphonicAftertouch.new(1, 0x40, 0x40)
+    assert_equal(1, message.channel)
+    assert_equal(0x40, message.note)
+    assert_equal(0x40, message.value)
+    assert_equal([0xA1, 0x40, 0x40], message.to_a)
+    assert_equal("A14040", message.to_bytestr)
   end
 
   def test_control_change
-    msg = MIDIMessage::ControlChange.new(2, 0x20, 0x20)
-    assert_equal(msg.channel, 2)
-    assert_equal(0x20, msg.index)
-    assert_equal(0x20, msg.value)
-    assert_equal([0xB2, 0x20, 0x20], msg.to_a)
-    assert_equal("B22020", msg.to_bytestr)
+    message = MIDIMessage::ControlChange.new(2, 0x20, 0x20)
+    assert_equal(message.channel, 2)
+    assert_equal(0x20, message.index)
+    assert_equal(0x20, message.value)
+    assert_equal([0xB2, 0x20, 0x20], message.to_a)
+    assert_equal("B22020", message.to_bytestr)
   end
 
   def test_program_change
-    msg = MIDIMessage::ProgramChange.new(3, 0x40)
-    assert_equal(3, msg.channel)
-    assert_equal(0x40, msg.program)
-    assert_equal([0xC3, 0x40], msg.to_a)
-    assert_equal("C340", msg.to_bytestr)
+    message = MIDIMessage::ProgramChange.new(3, 0x40)
+    assert_equal(3, message.channel)
+    assert_equal(0x40, message.program)
+    assert_equal([0xC3, 0x40], message.to_a)
+    assert_equal("C340", message.to_bytestr)
 
   end
 
   def test_channel_aftertouch
-    msg = MIDIMessage::ChannelAftertouch.new(3, 0x50)
-    assert_equal(3, msg.channel)
-    assert_equal(0x50, msg.value)
-    assert_equal([0xD3, 0x50], msg.to_a)
-    assert_equal("D350", msg.to_bytestr)
+    message = MIDIMessage::ChannelAftertouch.new(3, 0x50)
+    assert_equal(3, message.channel)
+    assert_equal(0x50, message.value)
+    assert_equal([0xD3, 0x50], message.to_a)
+    assert_equal("D350", message.to_bytestr)
   end
 
   def test_pitch_bend
-    msg = MIDIMessage::PitchBend.new(0, 0x50, 0xA0)
-    assert_equal(0, msg.channel)
-    assert_equal(0x50, msg.low)
-    assert_equal(0xA0, msg.high)
-    assert_equal([0xE0, 0x50, 0xA0], msg.to_a)
-    assert_equal("E050A0", msg.to_bytestr)
+    message = MIDIMessage::PitchBend.new(0, 0x50, 0xA0)
+    assert_equal(0, message.channel)
+    assert_equal(0x50, message.low)
+    assert_equal(0xA0, message.high)
+    assert_equal([0xE0, 0x50, 0xA0], message.to_a)
+    assert_equal("E050A0", message.to_bytestr)
   end
 
   def test_system_common
-    msg = MIDIMessage::SystemCommon.new(1, 0x50, 0xA0)
-    assert_equal(1, msg.status[1])
-    assert_equal(0x50, msg.data[0])
-    assert_equal(0xA0, msg.data[1])
-    assert_equal([0xF1, 0x50, 0xA0], msg.to_a)
-    assert_equal("F150A0", msg.to_bytestr)
+    message = MIDIMessage::SystemCommon.new(1, 0x50, 0xA0)
+    assert_equal(1, message.status[1])
+    assert_equal(0x50, message.data[0])
+    assert_equal(0xA0, message.data[1])
+    assert_equal([0xF1, 0x50, 0xA0], message.to_a)
+    assert_equal("F150A0", message.to_bytestr)
   end
 
   def test_system_realtime
-    msg = MIDIMessage::SystemRealtime.new(0x8)
-    assert_equal(8, msg.id)
-    assert_equal([0xF8], msg.to_a)
-    assert_equal("F8", msg.to_bytestr)
+    message = MIDIMessage::SystemRealtime.new(0x8)
+    assert_equal(8, message.id)
+    assert_equal([0xF8], message.to_a)
+    assert_equal("F8", message.to_bytestr)
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: midi-message
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Ari Russo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2015-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: midi-message
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Ruby MIDI message objects