unimidi 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4f3cb4ead6e1ac868f749c5cf2dda0efa6e7b49
-  data.tar.gz: aa339b94d2f2f8cc50270c87928be812936dbeb8
+  metadata.gz: 0531893dc83d0ed407f9c4f984c488058481957e
+  data.tar.gz: c22c25a2305d2007e7179cf8826268abb4e40156
 SHA512:
-  metadata.gz: e2002458e871943b6021f2d2266d6e282d4ed03d3e111c0169c08778ab8222391742e6fa5305de44ecb18157141a1efa95ecc5f034ee9fb3b2a2c65f74338d94
-  data.tar.gz: 15f7796a4d71bcb8656950b8077fb7f6c14f179a8a3be23a85754ed937af5d936c1dc47b7bde03205ea1718f703e8ff676185947f306ef3c52c19e8e6754783b
+  metadata.gz: 7abb6b93f5b49ec458ee47e24f277446528a233a174e6aed9c54db93239648d2ef058ef788f9532c24793c4b1b335a50ffa4ff10be360068d43bf49560a93586
+  data.tar.gz: 7372540218623430ed69eb8012e1d8493e52693923801dc6326a607ad16040c69033e7097d9e433aa347e1b089a8fa0c91ff045973616caad5078431b8e5a6d9

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2010-2014 Ari Russo
+Copyright 2010-2016 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

@@ -16,7 +16,7 @@ Also see [MicroMIDI](http://github.com/arirusso/micromidi) which builds a full M
 
 Using Ruby 1.9.2 or JRuby 1.6.1 (or newer) is strongly recommended.  JRuby should be run in 1.9 mode where applicable
 
-UniMIDI uses one of the following libraries, depending on which platform you're using it on.  The necessary library should install automatically with the unimidi gem. 
+UniMIDI uses one of the following libraries, depending on which platform you're using it on.  The necessary library should install automatically with the unimidi gem.
 
 Platform
 
@@ -24,7 +24,7 @@ Platform
 * Linux: [alsa-rawmidi](http://github.com/arirusso/alsa-rawmidi)
 * OSX: [ffi-coremidi](http://github.com/arirusso/ffi-coremidi)
 * Windows/Cygwin: [midi-winmm](http://github.com/arirusso/midi-winmm)
-	
+
 ### Install
 
 If you're using Bundler, add this line to your application's Gemfile:
@@ -34,7 +34,7 @@ If you're using Bundler, add this line to your application's Gemfile:
 Otherwise...
 
 `gem install unimidi`
-	
+
 ### Usage
 
 ##### Blog Posts
@@ -75,13 +75,13 @@ See below for additional notes on testing with JRuby
 ##### Linux
 
 * *libasound* and *libasound-dev* packages are required
-	
-### Author 
+
+### Author
 
 [Ari Russo](http://github.com/arirusso) <ari.russo at gmail.com>
-		
+
 ### License
 
 Apache 2.0, See the file LICENSE
 
-Copyright (c) 2010-2014 Ari Russo  
+Copyright (c) 2010-2016 Ari Russo  

data/lib/unimidi.rb

@@ -1,7 +1,8 @@
 #
 # Realtime MIDI IO for Ruby
 #
-# (c)2010-2014 Ari Russo and licensed under the Apache 2.0 License
+# (c)2010-2016 Ari Russo
+# Licensed under the Apache 2.0 License
 #
 
 # modules
@@ -17,7 +18,7 @@ require "unimidi/output"
 
 module UniMIDI
 
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 
   Platform.bootstrap
 

data/lib/unimidi/input.rb

@@ -1,10 +1,15 @@
+require "unimidi/input/buffer_access"
+require "unimidi/input/stream_reader"
+
 module UniMIDI
 
   # A MIDI input device
   class Input
 
     extend Device::ClassMethods
+    include BufferAccess
     include Device::InstanceMethods
+    include StreamReader
 
     # All MIDI input devices -- used to populate the class
     # @return [Array<Input>]
@@ -12,102 +17,6 @@ module UniMIDI
       Loader.devices(:direction => :input)
     end
 
-    # The device buffer
-    # @return [Array<Hash>]
-    def buffer
-      @device.buffer
-    end
-
-    #
-    # Plucks data from the input buffer and returns it as array of MIDI event hashes as such:
-    #   [
-    #     { :data => [144, 60, 100], :timestamp => 1024 },
-    #     { :data => [128, 60, 100], :timestamp => 1100 },
-    #     { :data => [144, 40, 120], :timestamp => 1200 }
-    #   ]
-    #
-    # In this case, the data is an array of Numeric bytes
-    # The timestamp is the number of millis since this input was enabled
-    # Arguments are passed to the underlying device object
-    #
-    # @param [*Object] args
-    # @return [Array<Hash>]
-    def gets(*args)
-      @device.gets(*args)
-    rescue SystemExit, Interrupt
-      exit
-    end
-
-    #
-    # Plucks data from the input buffer and returns it as array of MIDI event hashes.
-    # Similar to Input#gets except that the returned message data as string of hex digits eg:
-    #   [
-    #     { :data => "904060", :timestamp => 904 },
-    #     { :data => "804060", :timestamp => 1150 },
-    #     { :data => "90447F", :timestamp => 1300 }
-    #   ]
-    #
-    # @param [*Object] args
-    # @return [Array<Hash>]
-    def gets_s(*args)
-      @device.gets_s(*args)
-    rescue SystemExit, Interrupt
-      exit
-    end
-    alias_method :gets_bytestr, :gets_s
-    alias_method :gets_hex, :gets_s
-
-    #
-    # Plucks data from the input buffer and returns it as an array of data bytes such as
-    #   [144, 60, 100, 128, 60, 100, 144, 40, 120]
-    #
-    # @param [*Object] args
-    # @return [Array<Fixnum>]
-    def gets_data(*args)
-      arr = gets(*args)
-      arr.map { |msg| msg[:data] }.inject(:+)
-    end
-
-    #
-    # Plucks data from the input buffer and returns it as a string of data such as
-    #   "90406080406090447F"
-    #
-    # @param [*Object] args
-    # @return [String]
-    def gets_data_s(*args)
-      arr = gets_bytestr(*args)
-      arr.map { |msg| msg[:data] }.join
-    end
-    alias_method :gets_data_bytestr, :gets_data_s
-    alias_method :gets_data_hex, :gets_data_s
-
-    # Clears the input buffer
-    # @return [Array]
-    def clear_buffer
-      @device.buffer.clear
-    end
-
-    # Gets any messages in the buffer in the same format as Input#gets, without removing them from the buffer
-    # @param [*Object] args
-    # @return [Array<Hash>]
-    def gets_buffer(*args)
-      @device.buffer
-    end
-
-    # Gets any messages in the buffer in the same format as Input#gets_s, without removing them from the buffer
-    # @param [*Object] args
-    # @return [Array<Hash>]
-    def gets_buffer_s(*args)
-      @device.buffer.map { |msg| msg[:data] = TypeConversion.numeric_byte_array_to_hex_string(msg[:data]); msg }
-    end
-
-    # Gets any messages in the buffer in the same format as Input#gets_data without removing them from the buffer
-    # @param [*Object] args
-    # @return [Array<Fixnum>]
-    def gets_buffer_data(*args)
-      @device.buffer.map { |msg| msg[:data] }
-    end
-
   end
 
 end

data/lib/unimidi/input/buffer_access.rb

@@ -0,0 +1,47 @@
+module UniMIDI
+
+  class Input
+
+    module BufferAccess
+
+      # The device buffer
+      # @return [Array<Hash>]
+      def buffer
+        @device.buffer
+      end
+
+      # Clears the input buffer
+      # @return [Array]
+      def clear_buffer
+        @device.buffer.clear
+      end
+
+      # Gets any messages in the buffer in the same format as Input::StreamReader#gets. This doesn't remove
+      # the messages from the buffer or have any effect on the StreamReader pointer position
+      # @param [*Object] args
+      # @return [Array<Hash>]
+      def gets_buffer(*args)
+        @device.buffer
+      end
+
+      # Gets any messages in the buffer in the same format as Input#gets_s. This doesn't remove
+      # the messages from the buffer or have any effect on the StreamReader pointer position
+      # @param [*Object] args
+      # @return [Array<Hash>]
+      def gets_buffer_s(*args)
+        @device.buffer.map { |msg| msg[:data] = TypeConversion.numeric_byte_array_to_hex_string(msg[:data]); msg }
+      end
+
+      # Gets any messages in the buffer in the same format as Input#gets_data. . This doesn't remove
+      # the messages from the buffer or have any effect on the StreamReader pointer position
+      # @param [*Object] args
+      # @return [Array<Fixnum>]
+      def gets_buffer_data(*args)
+        @device.buffer.map { |msg| msg[:data] }
+      end
+
+    end
+
+  end
+
+end

data/lib/unimidi/input/stream_reader.rb

@@ -0,0 +1,85 @@
+module UniMIDI
+
+  class Input
+
+    module StreamReader
+
+      # Returns any data in the input buffer that have been received since the last call to a
+      # StreamReader method. If a StreamReader method has not yet been called, all data received
+      # since the program was initialized will be returned
+      #
+      # The data is returned as array of MIDI event hashes as such:
+      #   [
+      #     { :data => [144, 60, 100], :timestamp => 1024 },
+      #     { :data => [128, 60, 100], :timestamp => 1100 },
+      #     { :data => [144, 40, 120], :timestamp => 1200 }
+      #   ]
+      #
+      # In this case, the data is an array of Numeric bytes
+      # The timestamp is the number of millis since this input was enabled
+      # Arguments are passed to the underlying device object
+      #
+      # @param [*Object] args
+      # @return [Array<Hash>]
+      def gets(*args)
+        @device.gets(*args)
+      rescue SystemExit, Interrupt
+        exit
+      end
+
+      # Returns any data in the input buffer that have been received since the last call to a
+      # StreamReader method. If a StreamReader method has not yet been called, all data received
+      # since the program was initialized will be returned
+      #
+      # Similar to Input#gets except that the returned message data as string of hex digits eg:
+      #   [
+      #     { :data => "904060", :timestamp => 904 },
+      #     { :data => "804060", :timestamp => 1150 },
+      #     { :data => "90447F", :timestamp => 1300 }
+      #   ]
+      #
+      # @param [*Object] args
+      # @return [Array<Hash>]
+      def gets_s(*args)
+        @device.gets_s(*args)
+      rescue SystemExit, Interrupt
+        exit
+      end
+      alias_method :gets_bytestr, :gets_s
+      alias_method :gets_hex, :gets_s
+
+      # Returns any data in the input buffer that have been received since the last call to a
+      # StreamReader method. If a StreamReader method has not yet been called, all data received
+      # since the program was initialized will be returned
+      #
+      # Similar to Input#gets except that the returned message data as an array of data bytes such as
+      #   [144, 60, 100, 128, 60, 100, 144, 40, 120]
+      #
+      # @param [*Object] args
+      # @return [Array<Fixnum>]
+      def gets_data(*args)
+        arr = gets(*args)
+        arr.map { |msg| msg[:data] }.inject(:+)
+      end
+
+      # Returns any data in the input buffer that have been received since the last call to a
+      # StreamReader method. If a StreamReader method has not yet been called, all data received
+      # since the program was initialized will be returned
+      #
+      # Similar to Input#gets except that the returned message data as a string of data such as
+      #   "90406080406090447F"
+      #
+      # @param [*Object] args
+      # @return [String]
+      def gets_data_s(*args)
+        arr = gets_bytestr(*args)
+        arr.map { |msg| msg[:data] }.join
+      end
+      alias_method :gets_data_bytestr, :gets_data_s
+      alias_method :gets_data_hex, :gets_data_s
+
+    end
+
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unimidi
 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-01-02 00:00:00.000000000 Z
+date: 2016-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -187,6 +187,8 @@ files:
 - 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
@@ -210,7 +212,7 @@ 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:
   - - ">="
@@ -218,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: unimidi
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Realtime MIDI IO for Ruby