unimidi 0.0.4-i386-mingw32 → 0.0.7-i386-mingw32

data/README.rdoc

@@ -1,22 +1,24 @@
 = UniMIDI
 
-Author:: Ari Russo
-Copyright:: Copyright (c) 2011 Ari Russo
-
 == Summary
 
-Cross-Platform, realtime MIDI input and output for Ruby
+Platform independent realtime MIDI input and output for Ruby.
 
 == Features
 
-* Multiple platforms supported (currently Linux, Windows/Cygwin, more to follow)
-* Handle both input and output
-* Supports messaging to and from multiple devices concurrently
+* 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}[https://github.com/arirusso/midi-winmm] 
+* 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
 
@@ -34,7 +36,17 @@ Cross-Platform, realtime MIDI input and output for Ruby
 == 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  
+Apache 2.0, See the file LICENSE
+
+Copyright (c) 2010-2011 Ari Russo  

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

@@ -1,17 +1,24 @@
+require 'alsa-rawmidi'
+
 module UniMIDI
 
   module AlsaRawMIDIAdapter
     
+    class Device
+      extend CongruousApiAdapter::Device::ClassMethods
+      defer_to AlsaRawMIDI::Device
+    end
+    
     class Input
       include CongruousApiAdapter::Device
-      extend CongruousApiAdapter::Device::ClassMethods
-      DeviceClass = ::AlsaRawMIDI::Input
+      include CongruousApiAdapter::Input
+      defer_to AlsaRawMIDI::Input
     end
 
     class Output
       include CongruousApiAdapter::Device
-      extend CongruousApiAdapter::Device::ClassMethods
-      DeviceClass = ::AlsaRawMIDI::Output
+      include CongruousApiAdapter::Output
+      defer_to AlsaRawMIDI::Output
     end
 
   end

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

@@ -0,0 +1,26 @@
+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
+
+end

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

@@ -1,17 +1,24 @@
+require 'midi-winmm'
+
 module UniMIDI
 
   module MIDIWinMMAdapter
     
+    class Device
+      extend CongruousApiAdapter::Device::ClassMethods
+      defer_to MIDIWinMM::Device
+    end
+    
     class Input
       include CongruousApiAdapter::Device
-      extend CongruousApiAdapter::Device::ClassMethods
-      DeviceClass = ::MIDIWinMM::Input
+      include CongruousApiAdapter::Input
+      defer_to MIDIWinMM::Input
     end
 
     class Output
       include CongruousApiAdapter::Device
-      extend CongruousApiAdapter::Device::ClassMethods
-      DeviceClass = ::MIDIWinMM::Output
+      include CongruousApiAdapter::Output
+      defer_to MIDIWinMM::Output
     end
 
   end

data/lib/unimidi/congruous_api_adapter.rb

@@ -8,23 +8,102 @@ module UniMIDI
         @device = device_obj
       end
       
-      def method_missing(method, *args, &block)
-        @device.send(method, *args, &block)
+      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("DeviceClass")
+          const_get("DeferToClass")
         end
 
-        def method_missing(method, *args, &block)
-          device_class.send(method, *args, &block)
+      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

data/lib/unimidi/platform.rb

@@ -10,16 +10,17 @@ module UniMIDI
       
       def initialize
         lib = case RUBY_PLATFORM
+          when /java/ then 'midi-jruby'
           when /linux/ then 'alsa-rawmidi'
-          when /win/ then 'midi-winmm'
           when /mingw/ then 'midi-winmm' #cygwin
+          when /win/ then 'midi-winmm'
         end
-        require(lib)
         require("unimidi/adapter/#{lib}")
         @interface = case RUBY_PLATFORM
+          when /java/ then MIDIJRuby
           when /linux/ then AlsaRawMIDIAdapter
-          when /win/ then MIDIWinMMAdapter 
           when /mingw/ then MIDIWinMMAdapter #cygwin
+          when /win/ then MIDIWinMMAdapter 
         end
       end
 

data/lib/unimidi.rb

@@ -4,7 +4,7 @@
 #
 module UniMIDI
   
-  VERSION = "0.0.4"
+  VERSION = "0.0.7"
  
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unimidi
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.7
   prerelease: 
 platform: i386-mingw32
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-04-19 00:00:00.000000000 -04:00
+date: 2011-04-24 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: midi-winmm
-  requirement: &21437724 !ruby/object:Gem::Requirement
+  requirement: &21157896 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21437724
+  version_requirements: *21157896
 description: Cross-Platform, realtime MIDI input and output for Ruby.
 email:
 - ari.russo@gmail.com
@@ -31,6 +31,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/unimidi/adapter/alsa-rawmidi.rb
+- lib/unimidi/adapter/midi-jruby.rb
 - lib/unimidi/adapter/midi-winmm.rb
 - lib/unimidi/congruous_api_adapter.rb
 - lib/unimidi/platform.rb