midi-message 0.4.4 → 0.4.5

data/test/system_message_test.rb

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

metadata

@@ -1,15 +1,95 @@
 --- !ruby/object:Gem::Specification
 name: midi-message
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Ari Russo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-27 00:00:00.000000000 Z
-dependencies: []
+date: 2015-01-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.5.0
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 10.4.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 10.4.2
+- !ruby/object:Gem::Dependency
+  name: shoulda-context
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 description: Objects and classes for dealing with MIDI messages.
 email:
 - ari.russo@gmail.com
@@ -24,9 +104,9 @@ files:
 - lib/midi-message/constant.rb
 - lib/midi-message/context.rb
 - lib/midi-message/message.rb
+- lib/midi-message/messages.rb
 - lib/midi-message/note_message.rb
 - lib/midi-message/parser.rb
-- lib/midi-message/short_message.rb
 - lib/midi-message/system_exclusive.rb
 - lib/midi-message/system_message.rb
 - lib/midi-message/type_conversion.rb
@@ -34,9 +114,9 @@ files:
 - test/constants_test.rb
 - test/context_test.rb
 - test/helper.rb
+- test/message_test.rb
 - test/mutability_test.rb
 - test/parser_test.rb
-- test/short_message_test.rb
 - test/system_exclusive_test.rb
 - test/system_message_test.rb
 homepage: http://github.com/arirusso/midi-message

data/lib/midi-message/short_message.rb

@@ -1,137 +0,0 @@
-module MIDIMessage
-
-  # Common behavior amongst all Message types
-  module ShortMessage
-
-    include MIDIMessage # this enables ..kind_of?(MIDIMessage)
-    
-    attr_reader :name,
-                :status,
-                :verbose_name
-
-    # Initialize the message status
-    # @param [Fixnum] status_nibble_1 The first nibble of the status
-    # @param [Fixnum] status_nibble_2 The second nibble of the status
-    def initialize_short_message(status_nibble_1, status_nibble_2)
-      @status = [status_nibble_1, status_nibble_2]
-      populate_using_const
-    end
-
-    # Byte array representation of the message eg [0x90, 0x40, 0x40] for NoteOn(0x40, 0x40)
-    # @return [Array<Fixnum>] The array of bytes in the MIDI message
-    def to_a
-      data = @data.nil? ? [] : [@data[0], @data[1]]
-      [(@status[0] << 4) + @status[1], *data].compact
-    end
-    alias_method :to_byte_a, :to_a
-    alias_method :to_byte_array, :to_a
-    alias_method :to_bytes, :to_a
-
-    # String representation of the message's bytes eg "904040" for NoteOn(0x40, 0x40)
-    # @return [String] The bytes of the message as a string of hex bytes
-    def to_hex_s
-      TypeConversion.numeric_byte_array_to_hex_string(to_a)
-    end
-    alias_method :to_bytestr, :to_hex_s
-
-    protected
-
-    def self.included(base)
-      base.send(:extend, ClassMethods)
-    end
-
-    def update
-      populate_using_const
-    end
-
-    private
-
-    # This will populate message metadata with information gathered from midi.yml
-    def populate_using_const
-      const_group_name = self.class.display_name
-      group_name_alias = self.class.constant_name
-      property = self.class.constant_property
-      value = self.send(property) unless property.nil?
-      value ||= @status[1] # default property to use for constants
-      group = ConstantGroup[group_name_alias] || ConstantGroup[const_group_name]
-      unless group.nil?
-        const = group.find_by_value(value)
-        unless const.nil?
-          @const = const
-          @name = @const.nil? ? const.key : @const.key
-          @verbose_name = "#{self.class.display_name}: #{@name}"
-        end
-      end
-    end
-
-    module ClassMethods
-
-      # Find a constant value in this class's group for the passed in key
-      # @param [String] name The constant key
-      # @return [String] The constant value
-      def get_constant(name)
-        key = constant_name || display_name
-        unless key.nil?
-          group = ConstantGroup[key]
-          group.find(name)
-        end
-      end
-
-      def display_name
-        const_get("DISPLAY_NAME") if const_defined?("DISPLAY_NAME")
-      end
-
-      def constant_map
-        const_get("CONSTANT") if const_defined?("CONSTANT")
-      end
-
-      def constant_name
-        constant_map.keys.first unless constant_map.nil?
-      end
-
-      def constant_property
-        constant_map[constant_name] unless constant_map.nil?
-      end
-
-      # This returns a MessageBuilder for the class, preloaded with the selected const
-      # @param [String, Symbol] const_name The constant key to use to build the message
-      # @return [MIDIMessage::MessageBuilder] A MessageBuilder object for the passed in constant
-      def [](const_name)
-        const = get_constant(const_name.to_s)
-        MessageBuilder.new(self, const) unless const.nil?
-      end
-
-    end
-
-  end
-
-  class MessageBuilder
-
-    # @param [MIDIMessage] klass The message class to build
-    # @param [String] const The constant to build the message with
-    def initialize(klass, const)
-      @klass = klass
-      @const = const
-    end
-
-    def new(*a)
-      a.last.kind_of?(Hash) ? a.last[:const] = @const : a.push(:const => @const)
-      @klass.new(*a)
-    end
-
-  end
-
-  # Shortcuts for dealing with message status
-  module Status
-
-    # The value of the Status constant with the name status_name
-    # @param [String] status_name The key to use to look up a constant value
-    # @return [String] The constant value that was looked up
-    def self.[](status_name)
-      const = Constant.find("Status", status_name)
-      const.value unless const.nil?
-    end
-
-  end
-
-end