unimidi 0.4.5 → 0.5.0

data/lib/unimidi/loader.rb

@@ -1,30 +1,30 @@
-module UniMIDI
+# frozen_string_literal: true
 
+module UniMIDI
   # Populate UniMIDI devices using the underlying device objects from the platform-specific gems
-  module Loader
-
-    extend self
-
-    # Use the given platform-specific adapter to load devices
-    # @param [UniMIDI::Adapter::Loader] loader
-    def use(loader)
-      @loader = loader
-    end
+  class Loader
+    class << self
+      # Use the given platform-specific adapter to load devices
+      # @param [UniMIDI::Adapter::Loader] loader
+      def use(loader)
+        @loader = loader
+      end
 
-    # @param [Hash] options
-    # @option options [Symbol] :direction Return only a particular direction of device eg :input, :output
-    # @return [Array<Input>, Array<Output>]
-    def devices(options = {})
-      if @devices.nil?
-        inputs = @loader.inputs.map { |device| ::UniMIDI::Input.new(device) }
-        outputs = @loader.outputs.map { |device| ::UniMIDI::Output.new(device) }
-        @devices = {
-          :input => inputs,
-          :output => outputs
-        }
+      # Get all MIDI devices
+      # @param [Hash] options
+      # @option options [Symbol] :direction Return only a particular direction of device eg :input, :output
+      # @return [Array<Input>, Array<Output>]
+      def devices(options = {})
+        if @devices.nil?
+          inputs = @loader.inputs.map { |device| ::UniMIDI::Input.new(device) }
+          outputs = @loader.outputs.map { |device| ::UniMIDI::Output.new(device) }
+          @devices = {
+            input: inputs,
+            output: outputs
+          }
+        end
+        options[:direction].nil? ? @devices.values.flatten : @devices[options[:direction]]
       end
-      options[:direction].nil? ? @devices.values.flatten : @devices[options[:direction]]
     end
-
   end
 end

data/lib/unimidi/output.rb

@@ -1,18 +1,18 @@
-module UniMIDI
+# frozen_string_literal: true
 
+module UniMIDI
   # A MIDI output device
   class Output
-
     extend Device::ClassMethods
     include Device::InstanceMethods
 
     # All MIDI output devices -- used to populate the class
     # @return [Array<Output>]
     def self.all
-      Loader.devices(:direction => :output)
+      Loader.devices(direction: :output)
     end
 
-    # Sends a message to the output. 
+    # Sends a message to the output.
     #
     # The message format can be:
     #
@@ -21,18 +21,18 @@ module UniMIDI
     # 3. A string of bytes eg "904040"
     # 4. An array of strings ["904040", "804040"]
     #
-    # @param [*Array<Fixnum>, *Array<String>, *Fixnum, *String] messages
-    # @return [Array<Fixnum>, Array<String>]
+    # @param [*Array<Integer>, *Array<String>, *Integer, *String] messages
+    # @return [Array<Integer>, Array<String>]
     def puts(*messages)
       message = messages.first
       case message
       when Array then messages.each { |array| puts(*array.flatten) }
-      when Fixnum then puts_bytes(*messages)
+      when Integer then puts_bytes(*messages)
       when String then puts_s(*messages)
       else
         if message.respond_to?(:to_bytes)
           puts_bytes(*message.to_bytes.flatten)
-        elsif message.respond_to?(:to_a) 
+        elsif message.respond_to?(:to_a)
           puts_bytes(*message.to_a.flatten)
         end
       end
@@ -46,18 +46,16 @@ module UniMIDI
       @device.puts_s(*messages)
       messages.count < 2 ? messages[0] : messages
     end
-    alias_method :puts_bytestr, :puts_s
-    alias_method :puts_hex, :puts_s
+    alias puts_bytestr puts_s
+    alias puts_hex puts_s
 
     # Sends a message to the output in a form of bytes eg output.puts_bytes(0x90, 0x40, 0x40).
     # This method does not do type checking.
-    # @param [*Array<Fixnum>] messages
-    # @return [Array<Fixnum>, Array<Array<Fixnum>>]
+    # @param [*Array<Integer>] messages
+    # @return [Array<Integer>, Array<Array<Integer>>]
     def puts_bytes(*messages)
       @device.puts_bytes(*messages)
       messages.count < 2 ? messages[0] : messages
     end
-
   end
-
 end

data/lib/unimidi/platform.rb

@@ -1,28 +1,34 @@
-module UniMIDI
+# frozen_string_literal: true
 
+module UniMIDI
   # Deal with different dependencies between different user environments
   module Platform
-
     extend self
-    
+
     # Loads the proper MIDI library and adapter for the user's environment
     def bootstrap
-      lib = case RUBY_PLATFORM
-        when /darwin/ then "ffi-coremidi"
-        when /java/ then "midi-jruby"
-        when /linux/ then "alsa-rawmidi"
-        when /mingw/ then "midi-winmm"
-      end
-      require("unimidi/adapter/#{lib}")
-      interface = case RUBY_PLATFORM
-        when /darwin/ then Adapter::CoreMIDI
-        when /java/ then Adapter::MIDIJRuby
-        when /linux/ then Adapter::AlsaRawMIDI
-        when /mingw/ then Adapter::MIDIWinMM
+      require("unimidi/adapter/#{platform_lib}")
+      Loader.use(platform_module::Loader)
+    end
+
+    private
+
+    def platform_lib
+      case RUBY_PLATFORM
+      when /darwin/ then 'ffi-coremidi'
+      when /java/ then 'midi-jruby'
+      when /linux/ then 'alsa-rawmidi'
+      when /mingw/ then 'midi-winmm'
       end
-      Loader.use(interface::Loader)
     end
 
+    def platform_module
+      case RUBY_PLATFORM
+      when /darwin/ then Adapter::CoreMIDI
+      when /java/ then Adapter::MIDIJRuby
+      when /linux/ then Adapter::AlsaRawMIDI
+      when /mingw/ then Adapter::MIDIWinMM
+      end
+    end
   end
-
 end

data/lib/unimidi/type_conversion.rb

@@ -1,17 +1,15 @@
+# frozen_string_literal: true
+
 module UniMIDI
-  
   # Utility for converting between different data formats
   module TypeConversion
+    module_function
 
-    extend self
-      
-    # Convert an array of numeric bytes to string of hex bytes 
-    # @param [Array<Fixnum>] byte An array of numeric bytes eg [0x90, 0x40, 0x40]
+    # Convert an array of numeric bytes to string of hex bytes
+    # @param [Array<Integer>] byte An array of numeric bytes eg [0x90, 0x40, 0x40]
     # @return [String] A string of hex bytes eg "904040"
     def numeric_byte_array_to_hex_string(bytes)
       bytes.map { |b| b.to_s(16) }.join
     end
-      
   end
-  
 end

data/lib/unimidi.rb

@@ -1,24 +1,26 @@
+# frozen_string_literal: true
+
 #
+# UniMIDI
 # Realtime MIDI IO for Ruby
 #
-# (c)2010-2014 Ari Russo and licensed under the Apache 2.0 License
+# (c)2010-2022 Ari Russo
+# Licensed under the Apache 2.0 License
 #
 
 # modules
-require "unimidi/command"
-require "unimidi/device"
-require "unimidi/loader"
-require "unimidi/platform"
-require "unimidi/type_conversion"
+require 'unimidi/command'
+require 'unimidi/device'
+require 'unimidi/platform'
+require 'unimidi/type_conversion'
 
 # classes
-require "unimidi/input"
-require "unimidi/output"
+require 'unimidi/input'
+require 'unimidi/loader'
+require 'unimidi/output'
 
 module UniMIDI
-
-  VERSION = "0.4.5"
+  VERSION = '0.5.0'
 
   Platform.bootstrap
-
 end

metadata

@@ -1,71 +1,155 @@
 --- !ruby/object:Gem::Specification
 name: unimidi
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.0
 platform: ruby
 authors:
 - Ari Russo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-10-05 00:00:00.000000000 Z
+date: 2022-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: alsa-rawmidi
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 13.0.6
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 13.0.6
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.11'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.11.0
+  type: :development
   prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency
-  name: ffi-coremidi
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.11'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.11.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.25'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.25.1
+  type: :development
   prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency
-  name: midi-jruby
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.25'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.25.1
+- !ruby/object:Gem::Dependency
+  name: alsa-rawmidi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  prerelease: false
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.1
   type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
-  name: midi-winmm
+  name: ffi-coremidi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.5
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.5
+- !ruby/object:Gem::Dependency
+  name: midi-jruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.4
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.4
+- !ruby/object:Gem::Dependency
+  name: midi-winmm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.10
   type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.10
 description: Platform independent realtime MIDI input and output for Ruby
 email:
 - ari.russo@gmail.com
@@ -73,30 +157,25 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.md
 - lib/unimidi.rb
+- lib/unimidi/adapter/alsa-rawmidi.rb
+- lib/unimidi/adapter/ffi-coremidi.rb
+- lib/unimidi/adapter/midi-jruby.rb
+- lib/unimidi/adapter/midi-winmm.rb
 - lib/unimidi/command.rb
 - lib/unimidi/device.rb
 - lib/unimidi/input.rb
+- lib/unimidi/input/buffer_access.rb
+- lib/unimidi/input/stream_reader.rb
 - lib/unimidi/loader.rb
 - lib/unimidi/output.rb
 - lib/unimidi/platform.rb
 - lib/unimidi/type_conversion.rb
-- lib/unimidi/adapter/alsa-rawmidi.rb
-- lib/unimidi/adapter/ffi-coremidi.rb
-- lib/unimidi/adapter/midi-jruby.rb
-- lib/unimidi/adapter/midi-winmm.rb
-- test/adapter_test.rb
-- test/class_methods_test.rb
-- test/functional_test.rb
-- test/helper.rb
-- test/input_test.rb
-- test/platform_test.rb
-- test/type_conversion_test.rb
-- LICENSE
-- README.md
 homepage: http://github.com/arirusso/unimidi
 licenses:
-- Apache 2.0
+- Apache-2.0
 metadata: {}
 post_install_message:
 rdoc_options: []
@@ -104,17 +183,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.8.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: unimidi
-rubygems_version: 2.1.9
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Realtime MIDI IO for Ruby

data/test/adapter_test.rb

@@ -1,66 +0,0 @@
-require "helper"
-
-class UniMIDI::AdapterTest < Test::Unit::TestCase
-
-  context "Adapter" do
-
-    context "Device#type" do
-
-      should "be an input" do
-        input = TestHelper.devices[:input]
-        assert_equal(:input, input.type)
-      end
-
-      should "be an output" do
-        output = TestHelper.devices[:output]
-        assert_equal(:output, output.type)  
-      end
-
-    end
-
-    context "Device.count" do
-
-      setup do
-        @inputs = UniMIDI::Input.all
-      end
-
-      should "count all of the inputs" do
-        assert_equal @inputs.count, UniMIDI::Input.count
-      end
-
-    end
-
-    context "Device.find_by_name" do
-
-      setup do
-        index = rand(0..(UniMIDI::Output.count-1))
-        @output = UniMIDI::Output.all[index]
-      end
-
-      should "select the correct input" do
-        result = UniMIDI::Output.find_by_name(@output.name)
-        assert_equal @output, result
-      end
-
-    end
-
-    context "Device.first" do
-
-      setup do
-        @output = UniMIDI::Output.all.first
-      end
-
-      should "open the output" do
-        @output.expects(:open)
-        output = UniMIDI::Output.first
-        @output.unstub(:open)
-      end
-
-      should "return the correct output" do
-        output = UniMIDI::Output.first
-        assert_equal @output, output
-      end
-    end
-
-  end
-end

data/test/class_methods_test.rb

@@ -1,95 +0,0 @@
-require "helper"
-
-class UniMIDI::ClassMethodsTest < Test::Unit::TestCase
-
-  context "ClassMethods" do
-
-    context "#first" do
-
-      context "no block given" do
-        should "return first input" do
-          i = UniMIDI::Input.first
-          assert_equal(UniMIDI::Input.all.first, i)
-        end
-      end
-
-      context "block given" do
-        should "pass and return first input" do
-          sleep(1)
-          i = UniMIDI::Input.first do |i|
-            assert_equal(true, i.enabled?)
-          end
-          assert_equal(UniMIDI::Input.all.first, i)
-        end
-
-      end
-    end
-
-    context "#last" do
-
-      context "no block given" do
-        should "return last input" do
-          i = UniMIDI::Input.last
-          assert_equal(UniMIDI::Input.all.last, i)    
-        end
-      end
-
-      context "block given" do
-        should "pass and return last input" do
-          sleep(1)
-          i = UniMIDI::Input.last do |i|
-            assert_equal(true, i.enabled?)     
-          end
-          assert_equal(UniMIDI::Input.all.last, i)     
-        end
-
-      end
-    end
-
-    context "#[]" do
-
-      should "return correct input" do
-        i = UniMIDI::Input[0]
-        assert_equal(UniMIDI::Input.first, i)
-        assert_equal(UniMIDI::Input.all.first, i)
-      end
-
-    end
-
-    context "#use" do
-
-      context "block given" do
-        should "return and enable an input" do
-          sleep(1)
-          i = UniMIDI::Input.use(0) do |i|
-            assert_equal(true, i.enabled?) 
-          end
-          assert_equal(UniMIDI::Input.first, i)
-          assert_equal(UniMIDI::Input.all.first, i)    
-        end
-
-      end
-
-      context "with symbol" do
-
-        should "return an enabled input" do
-          sleep(1)
-          input = UniMIDI::Input.use(:first)
-          assert_equal(true, input.enabled?) 
-          assert_equal(UniMIDI::Input.first, input)
-          assert_equal(UniMIDI::Input.all.first, input)       
-        end
-
-      end
-
-    end
-
-    context "#all" do
-      should "return all devices" do
-        assert_equal(UniMIDI::Loader.devices(:direction => :input), UniMIDI::Input.all)
-      end
-    end
-
-  end
-
-end