unimidi 0.0.7-i386-mingw32 → 0.1.3-i386-mingw32

data/LICENSE

@@ -1,13 +1,13 @@
-Copyright 2010-2011 Ari Russo
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
+Copyright 2010-2011 Ari Russo
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
 limitations under the License.

data/README.rdoc

@@ -1,52 +1,51 @@
-= UniMIDI
-
-== Summary
-
-Platform independent realtime MIDI input and output for Ruby.
-
-== Features
-
-* Platform independent.  Currently Linux, JRuby, Windows and Cygwin are supported. More platforms will follow (see "to-do")
-* Both input and output to and from multiple devices concurrently
-* Agnostically handle different MIDI Message types (including SysEx)
-
-== Requirements
-
-Platform
-
-* JRuby: {midi-jruby}[http://github.com/arirusso/midi-jruby]
-* Linux: {alsa-rawmidi}[http://github.com/arirusso/alsa-rawmidi]
-* Windows/Cygwin: {midi-winmm}[http://github.com/arirusso/midi-winmm] 
-
-Note that if you are using JRuby you must be in 1.9 mode.  This is normally accomplished by passing --1.9 to JRuby at the command line.
-	
-== Install
-
-* gem install unimidi
-	
-== Examples
-
-* {input}[http://github.com/arirusso/unimidi/blob/master/examples/input.rb]
-* {output}[http://github.com/arirusso/unimidi/blob/master/examples/output.rb]
-
-== Tests
-
-* please see {test/config.rb}[http://github.com/arirusso/unimidi/blob/master/test/config.rb] before running tests
-
-== Documentation
-
-* {rdoc}[http://rdoc.info/gems/unimidi]
-
-== To-do
-
-* OSX (coremidirb?) implementation
-	
-== Author 
-
-{Ari Russo}[http://github.com/arirusso] <ari.russo at gmail.com>
-		
-== License
-
-Apache 2.0, See the file LICENSE
-
-Copyright (c) 2010-2011 Ari Russo  
+= UniMIDI
+
+== Summary
+
+Platform independent realtime MIDI input and output for Ruby.
+
+== Features
+
+* Currently Linux, JRuby, Windows and Cygwin are supported. OSX is {in progress}[http://github.com/arirusso/ffi-coremidi]
+* Both input and output to and from multiple devices concurrently
+* Agnostically handle different MIDI and SysEx Message types
+
+== Requirements
+
+Platform
+
+* JRuby: {midi-jruby}[http://github.com/arirusso/midi-jruby]
+* Linux: {alsa-rawmidi}[http://github.com/arirusso/alsa-rawmidi]
+* Windows/Cygwin: {midi-winmm}[http://github.com/arirusso/midi-winmm] 
+
+A couple of notes about JRuby only:
+
+* You must be in 1.9 mode.  This is normally accomplished by passing --1.9 to JRuby at the command line.
+* javax.sound has some documented issues with SysEx messages in some versions OSX Snow Leopard which do affect this library. 
+	
+== Install
+
+* gem install unimidi
+	
+== Examples
+
+* {input}[http://github.com/arirusso/unimidi/blob/master/examples/input.rb]
+* {output}[http://github.com/arirusso/unimidi/blob/master/examples/output.rb]
+
+== Tests
+
+* please see {test/config.rb}[http://github.com/arirusso/unimidi/blob/master/test/config.rb] before running tests
+
+== Documentation
+
+* {rdoc}[http://rdoc.info/gems/unimidi]
+	
+== Author 
+
+{Ari Russo}[http://github.com/arirusso] <ari.russo at gmail.com>
+		
+== License
+
+Apache 2.0, See the file LICENSE
+
+Copyright (c) 2010-2011 Ari Russo  

data/lib/unimidi.rb

@@ -1,17 +1,19 @@
-#!/usr/bin/env ruby
-#
-# A realtime MIDI interface for Ruby
-#
-module UniMIDI
-  
-  VERSION = "0.0.7"
- 
-end
-
-require 'unimidi/congruous_api_adapter'
-require 'unimidi/platform'
-
-module UniMIDI
-  extend(Platform.instance.interface)
-  include(Platform.instance.interface)
-end
+#!/usr/bin/env ruby
+#
+# A realtime MIDI interface for Ruby
+# (c)2010-2011 Ari Russo and licensed under the Apache 2.0 License
+#
+
+module UniMIDI
+  
+  VERSION = "0.1.3"
+ 
+end
+
+require 'unimidi/congruous_api_adapter'
+require 'unimidi/platform'
+
+module UniMIDI
+  extend(Platform.instance.interface)
+  include(Platform.instance.interface)
+end

data/lib/unimidi/adapter/alsa-rawmidi.rb

@@ -1,26 +1,33 @@
-require 'alsa-rawmidi'
-
-module UniMIDI
-
-  module AlsaRawMIDIAdapter
-    
-    class Device
-      extend CongruousApiAdapter::Device::ClassMethods
-      defer_to AlsaRawMIDI::Device
-    end
-    
-    class Input
-      include CongruousApiAdapter::Device
-      include CongruousApiAdapter::Input
-      defer_to AlsaRawMIDI::Input
-    end
-
-    class Output
-      include CongruousApiAdapter::Device
-      include CongruousApiAdapter::Output
-      defer_to AlsaRawMIDI::Output
-    end
-
-  end
-
+#!/usr/bin/env ruby
+#
+# (c)2010-2011 Ari Russo and licensed under the Apache 2.0 License
+#
+
+require 'alsa-rawmidi'
+
+module UniMIDI
+
+  module AlsaRawMIDIAdapter
+    
+    class Input
+      include CongruousApiAdapter::Device
+      include CongruousApiAdapter::Input
+      defer_to AlsaRawMIDI::Input
+    end
+
+    class Output
+      include CongruousApiAdapter::Device
+      include CongruousApiAdapter::Output
+      defer_to AlsaRawMIDI::Output
+    end
+    
+    class Device
+      extend CongruousApiAdapter::Device::ClassMethods
+      defer_to AlsaRawMIDI::Device
+      input_class Input
+      output_class Output
+    end
+    
+  end
+
 end

data/lib/unimidi/adapter/midi-jruby.rb

@@ -1,26 +1,33 @@
-require 'midi-jruby'
-
-module UniMIDI
-
-  module AlsaRawMIDIAdapter
-    
-    class Device
-      extend CongruousApiAdapter::Device::ClassMethods
-      defer_to MIDIJRuby::Device
-    end
-    
-    class Input
-      include CongruousApiAdapter::Device
-      include CongruousApiAdapter::Input
-      defer_to MIDIJRuby::Input
-    end
-
-    class Output
-      include CongruousApiAdapter::Device
-      include CongruousApiAdapter::Output
-      defer_to MIDIJRuby::Output
-    end
-
-  end
-
+#!/usr/bin/env ruby
+#
+# (c)2010-2011 Ari Russo and licensed under the Apache 2.0 License
+#
+
+require 'midi-jruby'
+
+module UniMIDI
+
+  module MIDIJRubyAdapter
+    
+    class Input
+      include CongruousApiAdapter::Device
+      include CongruousApiAdapter::Input
+      defer_to MIDIJRuby::Input
+    end
+
+    class Output
+      include CongruousApiAdapter::Device
+      include CongruousApiAdapter::Output
+      defer_to MIDIJRuby::Output
+    end
+    
+    class Device
+      extend CongruousApiAdapter::Device::ClassMethods
+      defer_to MIDIJRuby::Device
+      input_class Input
+      output_class Output
+    end
+
+  end
+
 end

data/lib/unimidi/adapter/midi-winmm.rb

@@ -1,26 +1,33 @@
-require 'midi-winmm'
-
-module UniMIDI
-
-  module MIDIWinMMAdapter
-    
-    class Device
-      extend CongruousApiAdapter::Device::ClassMethods
-      defer_to MIDIWinMM::Device
-    end
-    
-    class Input
-      include CongruousApiAdapter::Device
-      include CongruousApiAdapter::Input
-      defer_to MIDIWinMM::Input
-    end
-
-    class Output
-      include CongruousApiAdapter::Device
-      include CongruousApiAdapter::Output
-      defer_to MIDIWinMM::Output
-    end
-
-  end
-
+#!/usr/bin/env ruby
+#
+# (c)2010-2011 Ari Russo and licensed under the Apache 2.0 License
+#
+
+require 'midi-winmm'
+
+module UniMIDI
+
+  module MIDIWinMMAdapter
+    
+    class Input
+      include CongruousApiAdapter::Device
+      include CongruousApiAdapter::Input
+      defer_to MIDIWinMM::Input
+    end
+
+    class Output
+      include CongruousApiAdapter::Device
+      include CongruousApiAdapter::Output
+      defer_to MIDIWinMM::Output
+    end
+    
+    class Device
+      extend CongruousApiAdapter::Device::ClassMethods
+      defer_to MIDIWinMM::Device
+      input_class Input
+      output_class Output
+    end
+
+  end
+
 end

data/lib/unimidi/congruous_api_adapter.rb

@@ -1,113 +1,197 @@
-module UniMIDI
-
-  module CongruousApiAdapter
-
-    module Device
-      
-      def initialize(device_obj)
-        @device = device_obj
-      end
-      
-      def open(*a, &block)
-        begin 
-          @device.open(*a)
-          block.call(self)
-        ensure
-          close
-        end
-      end
-      
-      def close(*a)
-        @device.close(*a)
-      end
-
-      def self.included(base)
-        base.send(:attr_reader, :device)
-      end
-
-      module ClassMethods
-        
-        def first         
-          new(device_class.first)
-        end
-        
-        def last
-          new(device_class.last)
-        end
-        
-        def all
-          device_class.all.map { |d| new(d) }
-        end
-        
-        def all_by_type
-          { 
-            :input => device_class.all_by_type[:input].map { |d| new(d) },
-            :output => device_class.all_by_type[:output].map { |d| new(d) }
-          }
-        end
-        
-        def defer_to(klass)
-          const_set("DeferToClass", klass)
-        end
-
-        def device_class
-          const_get("DeferToClass")
-        end
-
-      end
-
-    end
-
-    module Input
-   
-      def self.included(base)
-        base.extend(Device::ClassMethods)
-        base.extend(ClassMethods)
-      end
-
-      def gets(*a)
-        @device.gets(*a)
-      end
-      
-      def gets_bytestr(*a)
-        @device.gets_bytestr(*a)
-      end
-      
-      module ClassMethods
-        
-        def self.all
-          device_class.all_by_type[:input].map { |d| new(d) }
-        end
-        
-      end
-
-    end
-
-    module Output
-      
-      def self.included(base)
-        base.extend(Device::ClassMethods)
-        base.extend(ClassMethods)
-      end
-      
-      def puts(*a)
-        @device.puts(*a)
-      end
-      
-      def puts_bytestr(*a)
-        @device.puts_bytestr(*a)
-      end
-      
-      module ClassMethods
-        
-        def self.all
-          device_class.all_by_type[:output].map { |d| new(d) }
-        end
-        
-      end
-
-    end
-
-  end
-
+#!/usr/bin/env ruby
+#
+# (c)2010-2011 Ari Russo and licensed under the Apache 2.0 License
+#
+
+module UniMIDI
+
+  module CongruousApiAdapter
+
+    module Device
+      
+      def initialize(device_obj)
+        @device = device_obj
+        @id = @device.id
+        @name = @device.name
+      end
+      
+      # enable the device for use, can be passed a block to which the device will be passed back
+      def open(*a, &block)
+        @device.open(*a)
+        unless block.nil?
+          begin
+            block.call(self)
+          ensure
+            close
+          end
+        else
+          self
+        end
+      end
+      
+      # close the device
+      def close(*a)
+        @device.close(*a)
+      end
+
+      def self.included(base)
+        #base.send(:attr_reader, :device)
+        base.send(:attr_reader, :name)
+        base.send(:attr_reader, :id)
+      end
+
+      module ClassMethods
+        
+        def first         
+          new(device_class.first)
+        end
+        
+        def last
+          new(device_class.last)
+        end
+        
+        def all
+          all_by_type.values.flatten
+        end
+        
+        def all_by_type
+          { 
+            :input => device_class.all_by_type[:input].map { |d| get_input_class.new(d) },
+            :output => device_class.all_by_type[:output].map { |d| get_output_class.new(d) }
+          }
+        end
+        
+        def defer_to(klass)
+          const_set("DeferToClass", klass)
+        end
+        
+        def get_input_class
+          const_get("InputClass")
+        end
+        
+        def get_output_class
+          const_get("OutputClass")
+        end
+
+        def input_class(klass)
+          const_set("InputClass", klass)
+        end
+        
+        def output_class(klass)
+          const_set("OutputClass", klass)
+        end
+        
+        def device_class
+          const_get("DeferToClass")
+        end
+
+      end
+
+    end
+
+    module Input
+   
+      def self.included(base)
+        base.extend(Device::ClassMethods)
+        base.extend(ClassMethods)
+      end
+
+      #
+      # returns an 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 }
+      #   ]
+      #
+      # the data is an array of Numeric bytes
+      # the timestamp is the number of millis since this input was enabled
+      #
+      def gets(*a)
+        @device.gets(*a)
+      end
+      
+      #
+      # same as gets but returns message data as string of hex digits as such:
+      #   [ 
+      #     { :data => "904060", :timestamp => 904 },
+      #     { :data => "804060", :timestamp => 1150 },
+      #     { :data => "90447F", :timestamp => 1300 }
+      #   ]
+      #
+      def gets_bytestr(*a)
+        @device.gets_bytestr(*a)
+      end
+
+      #
+      # returns an array of data bytes such as 
+      #   [144, 60, 100, 128, 60, 100, 144, 40, 120]
+      #       
+      def gets_data(*a)
+        arr = gets
+        arr.map { |msg| msg[:data] }.inject { |a,b| a + b }
+      end
+
+      #
+      # returns a string of data such as 
+      #   "90406080406090447F"
+      #             
+      def gets_data_bytestr(*a)
+        arr = gets_bytestr
+        arr.map { |msg| msg[:data] }.join
+      end
+      
+      module ClassMethods
+             
+        # returns all inputs
+        def all
+          device_class.all.map { |d| new(d) }
+        end
+        
+      end
+
+    end
+
+    module Output
+      
+      def self.included(base)
+        base.extend(Device::ClassMethods)
+        base.extend(ClassMethods)
+      end
+      
+      # sends a message to the output. the message can be:
+      #
+      # bytes eg output.puts(0x90, 0x40, 0x40) 
+      # an array of bytes eg output.puts([0x90, 0x40, 0x40])
+      # or a string eg output.puts("904040")
+      #
+      def puts(*a)
+        @device.puts(*a)
+      end
+      
+      # sends a message to the output in a form of a string eg "904040".  this method does not do
+      # type checking and therefore is more performant than puts
+      def puts_bytestr(*a)
+        @device.puts_bytestr(*a)
+      end
+
+      # 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 and therefore is more performant than puts      
+      def puts_bytes(*a)
+        @device.puts_bytes(*a)
+      end
+      
+      module ClassMethods
+        
+        # returns all outputs
+        def all
+          device_class.all.map { |d| new(d) }
+        end
+        
+      end
+
+    end
+
+  end
+
 end

data/lib/unimidi/platform.rb

@@ -1,30 +1,35 @@
-require 'singleton'
-
-module UniMIDI
-    
-    class Platform
-      
-      include Singleton
-
-      attr_reader :interface
-      
-      def initialize
-        lib = case RUBY_PLATFORM
-          when /java/ then 'midi-jruby'
-          when /linux/ then 'alsa-rawmidi'
-          when /mingw/ then 'midi-winmm' #cygwin
-          when /win/ then 'midi-winmm'
-        end
-        require("unimidi/adapter/#{lib}")
-        @interface = case RUBY_PLATFORM
-          when /java/ then MIDIJRuby
-          when /linux/ then AlsaRawMIDIAdapter
-          when /mingw/ then MIDIWinMMAdapter #cygwin
-          when /win/ then MIDIWinMMAdapter 
-        end
-      end
-
-  end
-
-end
-
+#!/usr/bin/env ruby
+#
+# (c)2010-2011 Ari Russo and licensed under the Apache 2.0 License
+#
+
+require 'singleton'
+
+module UniMIDI
+    
+    class Platform
+      
+      include Singleton
+
+      attr_reader :interface
+      
+      def initialize
+        lib = case RUBY_PLATFORM
+          when /java/ then 'midi-jruby'
+          when /linux/ then 'alsa-rawmidi'
+          when /mingw/ then 'midi-winmm' #cygwin
+          when /win/ then 'midi-winmm'
+        end
+        require("unimidi/adapter/#{lib}")
+        @interface = case RUBY_PLATFORM
+          when /java/ then MIDIJRubyAdapter
+          when /linux/ then AlsaRawMIDIAdapter
+          when /mingw/ then MIDIWinMMAdapter #cygwin
+          when /win/ then MIDIWinMMAdapter 
+        end
+      end
+
+  end
+
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unimidi
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.3
   prerelease: 
 platform: i386-mingw32
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-04-24 00:00:00.000000000 -04:00
+date: 2011-05-04 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: midi-winmm
-  requirement: &21157896 !ruby/object:Gem::Requirement
+  requirement: &9399804 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,8 +22,8 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21157896
-description: Cross-Platform, realtime MIDI input and output for Ruby.
+  version_requirements: *9399804
+description: Platform Independent, realtime MIDI input and output for Ruby.
 email:
 - ari.russo@gmail.com
 executables: []
@@ -62,5 +62,5 @@ rubyforge_project: unimidi
 rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
-summary: Cross-Platform, realtime MIDI input and output for Ruby
+summary: Realtime MIDI input and output for Ruby.
 test_files: []