midi-jruby 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d37ac746080bbbe99c19459c5a9e8ea5d35f2b44
-  data.tar.gz: d134b1bcf2c898180152ffd6978f9b46bf8d1522
+SHA256:
+  metadata.gz: 01ef785c234f6baaab44700ac5cd1777531a25e3a0f12501f0d5fd1967378149
+  data.tar.gz: 5fb7355602cb317dfc63e1bfe874e656463bd7200e4f5a04d9f07aae98422571
 SHA512:
-  metadata.gz: 7db8d967508e7e1d9bee502b621fa3b06b542931f4fd22547ae4f3bb1825fe53ffc7bb962c069610a14dbf8e0ec936cd0730e74a28a832341db0fed6f21d9b3a
-  data.tar.gz: 3e0fbfc184d4db3a8829662cc84c4d5160be02a5dc4ea382fcc00ab5530f6b0dffd3002cd1a380dc2c7d5f48e439ceb256ae65054bb293eab027a564759f3606
+  metadata.gz: 1462d234ef4bf16103e519818bd34e364efcb9b698922dd80057870b9bf6d169aa3992e59be3c3ea7841bbd3cafd32504c36372a8ae2007372d8a720e49a199d
+  data.tar.gz: 4d2bc64a738362e466497418c3590669509937af9f59b4d22f30ed888d5f5d209a92fe2005458bec038a6a84267213cea90e2f06a2760ad1548eaf431bc24c15

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2011-2017 Ari Russo
+Copyright 2011-2022 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

@@ -38,4 +38,4 @@ There is [an issue](http://stackoverflow.com/questions/8148898/java-midi-in-mac-
 
 Apache 2.0, See the file LICENSE
 
-Copyright (c) 2011-2017 [Ari Russo](http://github.com/arirusso)
+Copyright (c) 2011-2022 [Ari Russo](http://github.com/arirusso)

data/lib/midi-jruby/api.rb

@@ -1,8 +1,8 @@
+# frozen_string_literal: true
+
 module MIDIJRuby
-    
   # Access to javax.sound.midi
   module API
-
     import javax.sound.midi.MidiSystem
     import javax.sound.midi.MidiDevice
     import javax.sound.midi.MidiEvent
@@ -13,17 +13,19 @@ module MIDIJRuby
 
     extend self
 
+    SYSEX_STATUS_BYTES = [0xF0, 0xF7].freeze
+
     # Get all MIDI devices that are available via javax.sound.midi
     # @return [Array<Hash>] A set of hashes for each available device
     def get_devices
       MidiSystem.get_midi_device_info.map do |info|
         jdevice = MidiSystem.get_midi_device(info)
-        { 
-          :device => jdevice,
-          :id => get_uuid,
-          :name => info.get_name, 
-          :description => info.get_description, 
-          :vendor => info.get_vendor 
+        {
+          device: jdevice,
+          id: get_uuid,
+          name: info.get_name,
+          description: info.get_description,
+          vendor: info.get_vendor
         }
       end
     end
@@ -31,15 +33,15 @@ module MIDIJRuby
     # Get all MIDI inputs that are available via javax.sound.midi
     # @return [Array<Input>]
     def get_inputs
-      jinputs = get_devices.select { |device| !device[:device].get_max_transmitters.zero? }
+      jinputs = get_devices.reject { |device| device[:device].get_max_transmitters.zero? }
       jinputs.map { |jinput| Input.new(jinput[:id], jinput[:device], jinput) }
     end
 
     # Get all MIDI outputs that are available via javax.sound.midi
     # @return [Array<Output>]
     def get_outputs
-      joutputs = get_devices.select { |device| !device[:device].get_max_receivers.zero? }
-      joutputs.map { |joutput| Output.new(joutput[:id], joutput[:device], joutput) } 
+      joutputs = get_devices.reject { |device| device[:device].get_max_receivers.zero? }
+      joutputs.map { |joutput| Output.new(joutput[:id], joutput[:device], joutput) }
     end
 
     # Enable the given input device to receive MIDI messages
@@ -100,9 +102,19 @@ module MIDIJRuby
     def write_output(device, data)
       bytes = Java::byte[data.size].new
       data.each_with_index { |byte, i| bytes.ubyte_set(i, byte) }
-      message = data.first.eql?(0xF0) ? SysexMessage.new : ShortMessage.new
-      message.set_message(bytes, data.length.to_java(:int))
-      @receiver[device].send(message, 0)
+      if SYSEX_STATUS_BYTES.include?(data.first)
+        message = SysexMessage.new
+        message.set_message(bytes, data.length.to_java(:int))
+      else
+        message = ShortMessage.new
+        begin
+          message.set_message(*bytes)
+        rescue
+          # support older java versions
+          message.set_message(bytes)
+        end
+      end
+      @receiver[device].send(message, device.get_microsecond_position)
       true
     end
 
@@ -117,15 +129,14 @@ module MIDIJRuby
 
     # Input event handler class
     class InputReceiver
-      
       include javax.sound.midi.Receiver
-    
+
       attr_reader :stream
 
       def initialize
         @buffer = []
       end
-      
+
       # Pluck messages from the buffer
       # @return [Array<Array<Fixnum>>]
       def read
@@ -133,43 +144,39 @@ module MIDIJRuby
         @buffer.clear
         messages
       end
-      
+
       # Add a new message to the buffer
-      # @param [Array<Fixnum>] message
+      # @param [javax.sound.midi.MidiMessage] message
       # @param [Fixnum] timestamp
       # @return [Array<Array<Fixnum>>]
-      def send(message, timestamp = -1)
+      def send(message, _timestamp = -1)
         bytes = if message.respond_to?(:get_packed_message)
-          packed = message.get_packed_message
-          unpack(packed)
-        else
-          string = String.from_java_bytes(message.get_message)
-          string.unpack("C" * string.length)
-        end
+                  packed = message.get_packed_message
+                  unpack(packed)
+                else
+                  string = String.from_java_bytes(message.get_message)
+                  string.unpack('C' * string.length)
+                end
         @buffer << bytes
       end
 
-      def close
-      end
-      
+      def close; end
+
       private
-      
+
       # @param [String]
       # @return [Array<Fixnum>]
       def unpack(message)
         bytes = []
         string = message.to_s(16)
-        string = "0#{s}" if string.length.divmod(2).last > 0
-        string = string.rjust(6,"0")
-        while string.length > 0
-          string_byte = string.slice!(0,2)
+        string = "0#{s}" if string.length.divmod(2).last.positive?
+        string = string.rjust(6, '0')
+        while string.length.positive?
+          string_byte = string.slice!(0, 2)
           bytes << string_byte.hex
         end
-        bytes.reverse        
+        bytes.reverse
       end
-     
     end
-
   end
-
 end

data/lib/midi-jruby/device.rb

@@ -1,8 +1,8 @@
-module MIDIJRuby
+# frozen_string_literal: true
 
+module MIDIJRuby
   # Common methods used by both input and output devices
   module Device
-
     attr_reader :enabled, # has the device been initialized?
                 :id, # unique int id
                 :name, # name property from javax.sound.midi.MidiDevice.Info
@@ -10,7 +10,7 @@ module MIDIJRuby
                 :vendor, # vendor property from javax.sound.midi.MidiDevice.Info
                 :type # :input or :output
 
-    alias_method :enabled?, :enabled
+    alias enabled? enabled
 
     # @param [Fixnum] The uuid for the given device
     # @param [Java::ComSunMediaSound::MidiInDevice, Java::ComSunMediaSound::MidiOutDevice] device The underlying Java device object
@@ -47,8 +47,8 @@ module MIDIJRuby
     # @return [Hash]
     def self.all_by_type
       @devices ||= {
-        :input => API.get_inputs,
-        :output => API.get_outputs
+        input: API.get_inputs,
+        output: API.get_outputs
       }
     end
 
@@ -62,9 +62,7 @@ module MIDIJRuby
 
     # @return [String]
     def get_type
-      self.class.name.split("::").last.downcase.to_sym
+      self.class.name.split('::').last.downcase.to_sym
     end
-
   end
-
 end

data/lib/midi-jruby/input.rb

@@ -1,12 +1,12 @@
+# frozen_string_literal: true
+
 module MIDIJRuby
-    
   # Input device class
   class Input
-    
     include Device
-    
+
     attr_reader :buffer
-        
+
     #
     # An array of MIDI event hashes as such:
     # [
@@ -25,10 +25,10 @@ module MIDIJRuby
       @pointer = @buffer.length
       messages
     end
-    alias_method :read, :gets
-    
+    alias read gets
+
     # Same as Input#gets but returns message data as string of hex digits:
-    # [ 
+    # [
     #   { :data => "904060", :timestamp => 904 },
     #   { :data => "804060", :timestamp => 1150 },
     #   { :data => "90447F", :timestamp => 1300 }
@@ -40,14 +40,14 @@ module MIDIJRuby
       messages.each { |message| message[:data] = numeric_bytes_to_hex_string(message[:data]) }
       messages
     end
-    alias_method :gets_bytestr, :gets_s
-    alias_method :gets_hex, :gets_s
+    alias gets_bytestr gets_s
+    alias gets_hex gets_s
 
     # Enable this the input for use; can be passed a block
     # @param [Hash] options
     # @param [Proc] block
     # @return [Input] self
-    def enable(options = {}, &block)
+    def enable(_options = {})
       unless @enabled
         initialize_input
         @enabled = true
@@ -62,8 +62,8 @@ module MIDIJRuby
         self
       end
     end
-    alias_method :open, :enable
-    alias_method :start, :enable
+    alias open enable
+    alias start enable
 
     # Close this input
     # @return [Boolean]
@@ -72,25 +72,25 @@ module MIDIJRuby
       API.close_input(@device)
       @enabled = false
     end
-    
+
     # Select the first input
     # @return [Input]
     def self.first
-      Device.first(:input)  
+      Device.first(:input)
     end
 
     # Select the last input
     # @return [Input]
     def self.last
-      Device.last(:input) 
+      Device.last(:input)
     end
-    
+
     # All inputs
     # @return [Array<Input>]
     def self.all
       Device.all_by_type[:input]
     end
-    
+
     private
 
     # Initialize the input components
@@ -102,7 +102,7 @@ module MIDIJRuby
       initialize_listener
       true
     end
-    
+
     # Initialize the input buffer
     # @return [Boolean]
     def initialize_buffer
@@ -110,46 +110,46 @@ module MIDIJRuby
       @pointer = 0
       def @buffer.clear
         @pointer = 0
-        super        
+        super
       end
     end
-    
+
     # Get a timestamp for the current time
     # @return [Fixnum]
     def now
       now = Time.now.to_f - @start_time
       now * 1000
     end
-    
+
     # A hash of a MIDI message and corresponding timestamp
     # @param [Array<Fixnum>] message
     # @param [Fixnum] timestamp
     # @return [Hash]
-    def get_message_formatted(message, timestamp) 
-      { 
-        :data => message, 
-        :timestamp => timestamp
+    def get_message_formatted(message, timestamp)
+      {
+        data: message,
+        timestamp: timestamp
       }
     end
-    
+
     # Messages in the buffer
     # @return [Array<Array<Fixnum>>]
     def queued_messages
       @buffer.slice(@pointer, @buffer.length - @pointer)
     end
-    
+
     # Are there any new messages in the buffer?
     # @return [Boolean]
     def queued_messages?
       @pointer < @buffer.length
     end
-    
+
     # Launch a background thread that collects messages
     # @return [Thread]
     def initialize_listener
       @listener = Thread.new do
         begin
-          loop do        
+          loop do
             while (messages = API.read_input(@device)).empty?
               sleep(1.0/1000)
             end
@@ -162,11 +162,11 @@ module MIDIJRuby
       @listener.abort_on_exception = true
       @listener
     end
-        
+
     # @param [Array<Array<Fixnum>>]
     # @return [Array<Array<Fixnum>>]
     def add_to_buffer(messages)
-      @buffer += messages.compact.map do |message| 
+      @buffer += messages.compact.map do |message|
         get_message_formatted(message, now)
       end
     end
@@ -175,14 +175,12 @@ module MIDIJRuby
     # @param [Array<Fixnum>] bytes
     # @return [String]
     def numeric_bytes_to_hex_string(bytes)
-      string_bytes = bytes.map do |byte| 
+      string_bytes = bytes.map do |byte|
         string = byte.to_s(16).upcase
         string = "0#{string}" if byte < 0x10
         string
       end
       string_bytes.join
-    end 
-   
+    end
   end
-
 end

data/lib/midi-jruby/output.rb

@@ -1,51 +1,51 @@
+# frozen_string_literal: true
+
 module MIDIJRuby
-  
   # Output device class
   class Output
-    
     include Device
-    
+
     # Close this output
     # @return [Boolean]
     def close
       API.close_output(@device)
       @enabled = false
     end
-    
+
     # Output the given MIDI message
-    # @param [String] data A MIDI message expressed as a string of hex digits 
+    # @param [String] data A MIDI message expressed as a string of hex digits
     # @return [Boolean]
     def puts_s(data)
       bytes = hex_string_to_numeric_bytes(data)
       puts_bytes(*bytes)
     end
-    alias_method :puts_bytestr, :puts_s
-    alias_method :puts_hex, :puts_s
+    alias puts_bytestr puts_s
+    alias puts_hex puts_s
 
     # Output the given MIDI message
-    # @param [*Fixnum] data A MIDI messages expressed as Numeric bytes 
+    # @param [*Fixnum] data A MIDI messages expressed as Numeric bytes
     # @return [Boolean]
     def puts_bytes(*data)
       API.write_output(@device, data)
     end
-    
+
     # Output the given MIDI message
-    # @param [*Fixnum, *String] args 
+    # @param [*Fixnum, *String] args
     # @return [Boolean]
     def puts(*args)
       case args.first
-        when Array then args.each { |arg| puts(*arg) }
-        when Numeric then puts_bytes(*args)
-        when String then puts_bytestr(*args)
+      when Array then args.each { |arg| puts(*arg) }
+      when Numeric then puts_bytes(*args)
+      when String then puts_bytestr(*args)
       end
     end
-    alias_method :write, :puts
-    
+    alias write puts
+
     # Enable this device; also takes a block
     # @param [Hash] options
     # @param [Proc] block
     # @return [Output]
-    def enable(options = {}, &block)
+    def enable(_options = {})
       unless @enabled
         API.enable_output(@device)
         @enabled = true
@@ -60,21 +60,21 @@ module MIDIJRuby
         self
       end
     end
-    alias_method :open, :enable
-    alias_method :start, :enable
-    
+    alias open enable
+    alias start enable
+
     # Select the first output
     # @return [Output]
     def self.first
-      Device.first(:output) 
+      Device.first(:output)
     end
 
     # Select the last output
     # @return [Output]
     def self.last
-      Device.last(:output)  
+      Device.last(:output)
     end
-    
+
     # All outputs
     # @return [Array<Output>]
     def self.all
@@ -89,12 +89,10 @@ module MIDIJRuby
     def hex_string_to_numeric_bytes(string)
       string = string.dup
       bytes = []
-      until (string_byte = string.slice!(0,2)) == ""
+      until (string_byte = string.slice!(0, 2)) == ''
         bytes << string_byte.hex
       end
       bytes
     end
-
   end
-  
 end

data/lib/midi-jruby.rb

@@ -1,26 +1,26 @@
+# frozen_string_literal: true
+
 #
 # MIDI-JRuby
 # Realtime MIDI IO in JRuby using the javax.sound.midi API
 #
-# (c) 2011-2017 Ari Russo
+# (c) 2011-2022 Ari Russo
 # Licensed under Apache 2.0
 # https://github.com/arirusso/midi-jruby
 #
 
 # libs
-require "java"
-require "forwardable"
+require 'java'
+require 'forwardable'
 
 # modules
-require "midi-jruby/api"
-require "midi-jruby/device"
+require 'midi-jruby/api'
+require 'midi-jruby/device'
 
 # classes
-require "midi-jruby/input"
-require "midi-jruby/output"
+require 'midi-jruby/input'
+require 'midi-jruby/output'
 
 module MIDIJRuby
-
-  VERSION = "0.1.6"
-
+  VERSION = '0.2.0'
 end

metadata

@@ -1,95 +1,75 @@
 --- !ruby/object:Gem::Specification
 name: midi-jruby
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Ari Russo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-06-09 00:00:00.000000000 Z
+date: 2022-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.5'
+        version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.5.0
-  name: minitest
-  prerelease: false
-  type: :development
-  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
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  name: mocha
+        version: 13.0.6
+  name: rake
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '3.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.4.2
-  name: rake
+        version: 3.11.0
+  name: rspec
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '3.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: 3.11.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
-  name: shoulda-context
+        version: 1.10.0
+  name: rubocop
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.10.0
 description: Realtime MIDI IO with JRuby using the javax.sound.midi API
 email:
 - ari.russo@gmail.com
@@ -104,9 +84,6 @@ files:
 - lib/midi-jruby/device.rb
 - lib/midi-jruby/input.rb
 - lib/midi-jruby/output.rb
-- test/helper.rb
-- test/input_buffer_test.rb
-- test/io_test.rb
 homepage: http://github.com/arirusso/midi-jruby
 licenses:
 - Apache-2.0
@@ -124,10 +101,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: '0'
 requirements: []
-rubyforge_project: midi-jruby
-rubygems_version: 2.6.8
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
 summary: Realtime MIDI IO with JRuby

data/test/helper.rb

@@ -1,58 +0,0 @@
-$:.unshift(File.join("..", "lib"))
-
-require "minitest/autorun"
-require "shoulda-context"
-require "midi-jruby"
-
-module TestHelper
-
-  extend self
-
-  # http://stackoverflow.com/questions/8148898/java-midi-in-mac-osx-broken
-  def sysex_ok?
-    ENV["_system_name"] != "OSX"
-  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
-  end
-
-  def numeric_messages
-    messages = [
-      [0x90, 100, 100], # note on
-      [0x90, 43, 100], # note on
-      [0x90, 76, 100], # note on
-      [0x90, 60, 100], # note on
-      [0x80, 100, 100] # note off
-    ]
-    if sysex_ok?
-      messages << [0xF0, 0x41, 0x10, 0x42, 0x12, 0x40, 0x00, 0x7F, 0x00, 0x41, 0xF7]
-    end
-    messages
-  end
-
-  def string_messages
-    messages = [
-      "906440", # note on
-      "804340" # note off
-    ]
-    if sysex_ok?
-      messages << "F04110421240007F0041F7"
-    end
-    messages
-  end
-
-  def input
-    MIDIJRuby::Input.first
-  end
-
-  def output
-    MIDIJRuby::Output.all[1]
-  end
-
-end

data/test/input_buffer_test.rb

@@ -1,46 +0,0 @@
-require "helper"
-
-class MIDIJRuby::InputBufferTest < Minitest::Test
-
-  context "MIDIJRuby" do
-
-    setup do
-      @input = TestHelper.input.open
-      @output = TestHelper.output.open
-      @input.buffer.clear
-      @pointer = 0
-    end
-
-    teardown do
-      @input.close
-      @output.close
-    end
-
-    context "Source#buffer" do
-
-      setup do
-        @messages = TestHelper.numeric_messages
-        @messages_arr = @messages.inject(&:+).flatten
-        @received_arr = []
-      end
-
-      should "have the correct messages in the buffer" do
-        bytes = []
-        @messages.each do |message|
-          p "sending: #{message}"
-          @output.puts(message)
-          bytes += message
-
-          sleep(1)
-
-          buffer = @input.buffer.map { |m| m[:data] }.flatten
-          p "received: #{buffer.to_s}"
-          assert_equal(bytes, buffer)
-        end
-        assert_equal(bytes.length, @input.buffer.map { |m| m[:data] }.flatten.length)
-      end
-
-    end
-
-  end
-end

data/test/io_test.rb

@@ -1,80 +0,0 @@
-require "helper"
-
-class MIDIJRuby::IOTest < Minitest::Test
-
-  # These tests assume that TestOutput is connected to TestInput
-  context "MIDIJRuby" do
-
-    setup do
-      @input = TestHelper.input.open
-      @output = TestHelper.output.open
-      @input.buffer.clear
-      @pointer = 0
-    end
-
-    teardown do
-      @input.close
-      @output.close
-    end
-
-    context "full IO" do
-
-      context "using Arrays" do
-
-        setup do
-          @messages = TestHelper.numeric_messages
-          @messages_arr = @messages.inject(&:+).flatten
-          @received_arr = []
-        end
-
-        should "do IO" do
-          @messages.each do |message|
-
-            p "sending: #{message}"
-
-            @output.puts(message)
-            sleep(1)
-            received = @input.gets.map { |m| m[:data] }.flatten
-
-            p "received: #{received}"
-
-            assert_equal(@messages_arr.slice(@pointer, received.length), received)
-            @pointer += received.length
-            @received_arr += received
-          end
-          assert_equal(@messages_arr.length, @received_arr.length)
-        end
-      end
-
-      context "using byte Strings" do
-
-        setup do
-          @messages = TestHelper.string_messages
-          @messages_str = @messages.join
-          @received_str = ""
-        end
-
-        should "do IO" do
-          @messages.each do |message|
-
-            p "sending: #{message}"
-
-            @output.puts(message)
-            sleep(1)
-            received = @input.gets_bytestr.map { |m| m[:data] }.flatten.join
-            p "received: #{received}"
-
-            assert_equal(@messages_str.slice(@pointer, received.length), received)
-            @pointer += received.length
-            @received_str += received
-          end
-          assert_equal(@messages_str, @received_str)
-        end
-
-      end
-
-    end
-
-  end
-
-end