ffi-coremidi 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02fbbcac2bae39264c7109814065da5271cf51aa
-  data.tar.gz: a0e119085cd64f85928bcebe4a35feb5640f79ac
+  metadata.gz: 28b485379651851b48abf76f539672cdc9f08a97
+  data.tar.gz: 66eb8e0c88b90cd4ef8eaa3547964d5043266a9e
 SHA512:
-  metadata.gz: aa6b3a57ad8c644f0e4536c512a44485dd3e48722bbf7278eea125b09484bbd7b19ef0a04330ab39349bf46593d929cd2e53579e7e935cd3f62c43ade52e4a79
-  data.tar.gz: ea6b760413f3337345a3a8cab0fd9649d2496be70b7dad42516c25424e0988487aac99b279d14552ce1583ce05e1ae17576a9f4f3d7e62c4b83c077cc2b0d453
+  metadata.gz: 42e781c9108831e86ec68f04d9873ace1d45c1d093195bc24207e9a5e4cd8f331da8bec8c37659152422e7d3ff184f081463048e6c92308ebc25af62c7a3d0a6
+  data.tar.gz: f1cf748819e912dabb989495fc2359d0c26593a20e4dcb1aa5cf57605f61bcc2e172f53630f87e70f571c064b911991e826e50d199af9f80c60b2d561da0aa18

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2011-2014 Ari Russo
+Copyright 2011-2015 Ari Russo
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/README.md

@@ -12,7 +12,7 @@ Note that in the interest of allowing people on other platforms to utilize your
 * Input and output on multiple devices concurrently
 * Generalized handling of different MIDI Message types (including SysEx)
 * Timestamped input events
-* Patch MIDI via software to other programs using IAC 
+* Patch MIDI via software to other programs using IAC
 
 ### Requirements
 
@@ -23,11 +23,11 @@ Note that in the interest of allowing people on other platforms to utilize your
 If you're using Bundler, add this line to your application's Gemfile:
 
 `gem "ffi-coremidi"`
-  
+
 Otherwise
 
 `gem install ffi-coremidi`
-  
+
 ### Documentation
 
 [rdoc](http://rubydoc.info/github/arirusso/ffi-coremidi)
@@ -48,4 +48,4 @@ Also thank you to [Jeremy Voorhis](http://github.com/jvoorhis) for some useful d
 
 Apache 2.0, See the file LICENSE
 
-Copyright (c) 2011-2014 [Ari Russo](http://github.com/arirusso)
+Copyright (c) 2011-2015 [Ari Russo](http://github.com/arirusso)

data/lib/coremidi.rb

@@ -1,7 +1,7 @@
 # ffi-coremidi
 #
 # Realtime MIDI IO with Ruby for OSX
-# (c)2011-2014 Ari Russo
+# (c)2011-2015 Ari Russo
 
 # libs
 require "ffi"
@@ -19,5 +19,5 @@ require "coremidi/source"
 require "coremidi/destination"
 
 module CoreMIDI
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

data/lib/coremidi/destination.rb

@@ -1,6 +1,6 @@
 module CoreMIDI
 
-  # Output/Destination endpoint class
+  # Type of endpoint used for output
   class Destination
 
     include Endpoint
@@ -23,9 +23,9 @@ module CoreMIDI
     # @return [Boolean]
     def puts_s(data)
       data = data.dup
-	    bytes = []
+      bytes = []
       until (str = data.slice!(0,2)).eql?("")
-      	bytes << str.hex
+        bytes << str.hex
       end
       puts_bytes(*bytes)
       true
@@ -47,10 +47,10 @@ module CoreMIDI
     # @param [*Array<Fixnum>, *Array<String>, *Fixnum, *String] args
     # @return [Boolean]
     def puts(*args)
-  	  case args.first
+      case args.first
       when Array then args.each { |arg| puts(*arg) }
-    	when Fixnum then puts_bytes(*args)
-    	when String then puts_bytestr(*args)
+      when Fixnum then puts_bytes(*args)
+      when String then puts_bytestr(*args)
       end
     end
     alias_method :write, :puts
@@ -58,14 +58,12 @@ module CoreMIDI
     # Enable this device
     # @return [Destination]
     def enable(options = {}, &block)
-      if !@enabled
-        @enabled = true
-        if block_given?
-      	  begin
-      		  yield(self)
-      	  ensure
-      		  close
-      	  end
+      @enabled = true unless @enabled
+      if block_given?
+        begin
+          yield(self)
+        ensure
+          close
         end
       end
       self
@@ -78,7 +76,7 @@ module CoreMIDI
     def self.first
       Endpoint.first(:destination)
     end
-    
+
     # Shortcut to the last output endpoint available
     # @return [Destination]
     def self.last
@@ -90,7 +88,7 @@ module CoreMIDI
     def self.all
       Endpoint.all_by_type[:destination]
     end
-    
+
     protected
 
     # Base initialization for this endpoint -- done whether or not the endpoint is enabled to
@@ -128,9 +126,9 @@ module CoreMIDI
 
     SysexCompletionCallback =
       API.get_callback([:pointer]) do |sysex_request_ptr|
-        # this isn't working for some reason. as of now, it's not needed though
+      # this isn't working for some reason. as of now, it's not needed though
       end
-      
+
     # Initialize a coremidi port for this endpoint
     def initialize_port
       port = API.create_midi_output_port(@client, @resource_id, @name)

data/lib/coremidi/endpoint.rb

@@ -1,8 +1,10 @@
 module CoreMIDI
 
-  # A MIDI source or destination, owned by an entity.
+  # A source or destination of a 16-channel MIDI stream
+  #
+  # https://developer.apple.com/library/ios/documentation/CoreMidi/Reference/MIDIServices_Reference/Reference/reference.html
   module Endpoint
-    
+
     extend Forwardable
 
     attr_reader :enabled, # has the endpoint been initialized?
@@ -10,7 +12,7 @@ module CoreMIDI
                 :id,
                 :resource_id, # :input or :output
                 :type
-                
+
     def_delegators :entity, :manufacturer, :model, :name
 
     alias_method :enabled?, :enabled
@@ -23,13 +25,13 @@ module CoreMIDI
       @type = get_type
       @enabled = false
     end
-    
+
     # Is this endpoint online?
     # @return [Boolean]
     def online?
       @entity.online? && connect?
     end
-    
+
     # Set the id for this endpoint (the id is immutable)
     # @param [Fixnum] val
     # @return [Fixnum]
@@ -83,9 +85,9 @@ module CoreMIDI
       case type
       when :source then Source
       when :destination then Destination
-      end  
+      end
     end
-    
+
     protected
 
     # Constructs the endpoint type (eg source, destination) for easy consumption
@@ -93,7 +95,7 @@ module CoreMIDI
       class_name = self.class.name.split('::').last
       class_name.downcase.to_sym
     end
-    
+
     # Enables the coremidi MIDI client that will go with this endpoint
     def enable_client
       client = API.create_midi_client(@resource_id, @name)

data/lib/coremidi/source.rb

@@ -1,6 +1,6 @@
 module CoreMIDI
 
-  # Input/Source endpoint class
+  # Type of endpoint used for input
   class Source
 
     include Endpoint
@@ -30,7 +30,7 @@ module CoreMIDI
     end
     alias_method :read, :gets
 
-    # Same as Source#gets except that it returns message data as string of hex 
+    # Same as Source#gets except that it returns message data as string of hex
     # digits as such:
     #   [
     #     { :data => "904060", :timestamp => 904 },
@@ -41,7 +41,7 @@ module CoreMIDI
     # @return [Array<Hash>]
     def gets_s
       messages = gets
-      messages.each do |message| 
+      messages.each do |message|
         message[:data] = TypeConversion.numeric_bytes_to_hex_string(message[:data])
       end
       messages
@@ -51,14 +51,12 @@ module CoreMIDI
     # Enable this the input for use; can be passed a block
     # @return [Source]
     def enable(options = {}, &block)
-      if !@enabled
-        @enabled = true
-        if block_given?
-          begin
-            yield(self)
-          ensure
-            close
-          end
+      @enabled = true unless @enabled
+      if block_given?
+        begin
+          yield(self)
+        ensure
+          close
         end
       end
       self
@@ -105,9 +103,9 @@ module CoreMIDI
 
     protected
 
-    # Base initialization for this endpoint -- done whether or not the endpoint is enabled to check whether 
+    # Base initialization for this endpoint -- done whether or not the endpoint is enabled to check whether
     # it is truly available for use
-    def connect   
+    def connect
       enable_client
       initialize_port
       @resource = API.MIDIEntityGetSource(@entity.resource, @resource_id)
@@ -134,7 +132,7 @@ module CoreMIDI
           @sysex_buffer.clear
         end
       end
-      @buffer << get_message_formatted(bytes, timestamp) if @sysex_buffer.empty? 
+      @buffer << get_message_formatted(bytes, timestamp) if @sysex_buffer.empty?
       @buffer
     end
 
@@ -214,9 +212,9 @@ module CoreMIDI
     # Give a message its timestamp and package it in a Hash
     # @return [Hash]
     def get_message_formatted(raw, time)
-      { 
-        :data => raw, 
-        :timestamp => timestamp(time) 
+      {
+        :data => raw,
+        :timestamp => timestamp(time)
       }
     end
 

data/test/helper.rb

@@ -1,41 +1,49 @@
 dir = File.dirname(File.expand_path(__FILE__))
 $LOAD_PATH.unshift dir + "/../lib"
 
-require "test/unit"
+require "minitest/autorun"
 require "mocha/test_unit"
 require "shoulda-context"
+
 require "coremidi"
 
 module TestHelper
-  
-  def self.select_devices
-    $test_device ||= {}
+
+  extend self
+
+  def device
+    @device ||= select_devices
+  end
+
+  def select_devices
+    @device ||= {}
     { :input => CoreMIDI::Source.all, :output => CoreMIDI::Destination.all }.each do |type, devs|
       puts ""
       puts "select an #{type.to_s}..."
-      while $test_device[type].nil?
+      while @device[type].nil?
         devs.each do |device|
           puts "#{device.id}: #{device.name}"
         end
         selection = $stdin.gets.chomp
         if selection != ""
           selection = selection.to_i
-          $test_device[type] = devs.find { |d| d.id == selection }
-          puts "selected #{selection} for #{type.to_s}" unless $test_device[type]
+          @device[type] = devs.find { |d| d.id == selection }
+          puts "selected #{selection} for #{type.to_s}" unless @device[type]
         end
       end
     end
-  end 
-	    
+    @device
+  end
+
   def bytestrs_to_ints(arr)
     data = arr.map { |m| m[:data] }.join
       output = []
       until (bytestr = data.slice!(0,2)).eql?("")
         output << bytestr.hex
       end
-    output    	
+    output
   end
-    
+
   # some MIDI messages
   VariousMIDIMessages = [
     [0xF0, 0x41, 0x10, 0x42, 0x12, 0x40, 0x00, 0x7F, 0x00, 0x41, 0xF7], # SysEx
@@ -45,14 +53,14 @@ module TestHelper
     [0x90, 60, 100], # note on
     [0x80, 100, 100] # note off
   ]
-    
+
   # some MIDI messages
   VariousMIDIByteStrMessages = [
     "F04110421240007F0041F7", # SysEx
     "906440", # note on
     "804340" # note off
   ]
-    
+
 end
 
 TestHelper.select_devices

data/test/input_buffer_test.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-class InputBufferTest < Test::Unit::TestCase
+class InputBufferTest < Minitest::Test
 
   context "CoreMIDI" do
 
@@ -16,8 +16,8 @@ class InputBufferTest < Test::Unit::TestCase
         @received_arr = []
         @pointer = 0
 
-        @output = $test_device[:output].open
-        @input = $test_device[:input].open
+        @output = TestHelper.device[:output].open
+        @input = TestHelper.device[:input].open
         @input.buffer.clear
       end
 
@@ -26,7 +26,7 @@ class InputBufferTest < Test::Unit::TestCase
         @messages.each do |message|
           puts "sending: #{message.inspect}"
           @output.puts(message)
-          bytes += message 
+          bytes += message
 
           sleep(0.5)
 

data/test/io_test.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-class CoreMIDI::IOTest < Test::Unit::TestCase
+class CoreMIDI::IOTest < Minitest::Test
 
   # ** these tests assume that TestOutput is connected to TestInput
   context "CoreMIDI" do
@@ -21,8 +21,8 @@ class CoreMIDI::IOTest < Test::Unit::TestCase
         end
 
         should "do IO" do
-          $test_device[:output].open do |output|
-            $test_device[:input].open do |input|
+          TestHelper.device[:output].open do |output|
+            TestHelper.device[:input].open do |input|
 
               input.buffer.clear
 
@@ -57,8 +57,8 @@ class CoreMIDI::IOTest < Test::Unit::TestCase
         end
 
         should "do IO" do
-          $test_device[:output].open do |output|
-            $test_device[:input].open do |input|
+          TestHelper.device[:output].open do |output|
+            TestHelper.device[:input].open do |input|
 
               @messages.each do |msg|
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-coremidi
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Ari Russo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-05 00:00:00.000000000 Z
+date: 2015-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi