unimidi 0.1.5-java → 0.1.6-java

data/README.rdoc

@@ -37,6 +37,10 @@ A couple of notes about JRuby only:
 
 * please see {test/config.rb}[http://github.com/arirusso/unimidi/blob/master/test/config.rb] before running tests
 
+For testing with JRuby, use 
+
+  jruby --1.9 -S rake test
+
 == Documentation
 
 * {rdoc}[http://rdoc.info/gems/unimidi]

data/lib/unimidi.rb

@@ -6,12 +6,15 @@
 
 module UniMIDI
   
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
  
 end
 
+require 'forwardable'
+
 require 'unimidi/congruous_api_adapter'
 require 'unimidi/platform'
+require 'unimidi/type_conversion'
 
 module UniMIDI
   extend(Platform.instance.interface)

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

@@ -7,23 +7,18 @@ module UniMIDI
 
   module AlsaRawMIDIAdapter
     
-    class Input
-      include CongruousApiAdapter::Device
-      include CongruousApiAdapter::Input
-      DeferToClass = AlsaRawMIDI::Input
+    class Input < CongruousApiInput
+      defer_to AlsaRawMIDI::Input
     end
 
-    class Output
-      include CongruousApiAdapter::Device
-      include CongruousApiAdapter::Output
-      DeferToClass = AlsaRawMIDI::Output
+    class Output < CongruousApiOutput
+      defer_to AlsaRawMIDI::Output
     end
     
-    class Device
-      extend CongruousApiAdapter::Device::ClassMethods
-      DeferToClass = AlsaRawMIDI::Device
-      InputClass = Input
-      OutputClass = Output
+    class Device < CongruousApiDevice
+      defer_to AlsaRawMIDI::Device
+      input_class Input
+      output_class Output
     end
     
   end

data/lib/unimidi/adapter/ffi-coremidi.rb

@@ -7,23 +7,18 @@ module UniMIDI
 
   module CoreMIDIAdapter
     
-    class Input
-      include CongruousApiAdapter::Device
-      include CongruousApiAdapter::Input
-      DeferToClass = CoreMIDI::Input
+    class Input < CongruousApiInput
+      defer_to CoreMIDI::Input
     end
 
-    class Output
-      include CongruousApiAdapter::Device
-      include CongruousApiAdapter::Output
-      DeferToClass = CoreMIDI::Output
+    class Output < CongruousApiOutput
+      defer_to CoreMIDI::Output
     end
     
-    class Device
-      extend CongruousApiAdapter::Device::ClassMethods
-      DeferToClass = CoreMIDI::Device
-      InputClass = Input
-      OutputClass = Output
+    class Device < CongruousApiDevice
+      defer_to CoreMIDI::Entity
+      input_class Input
+      output_class Output
     end
     
   end

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

@@ -7,23 +7,18 @@ module UniMIDI
 
   module MIDIJRubyAdapter
     
-    class Input
-      include CongruousApiAdapter::Device
-      include CongruousApiAdapter::Input
-      DeferToClass = MIDIJRuby::Input
+    class Input < CongruousApiInput
+      defer_to MIDIJRuby::Input
     end
 
-    class Output
-      include CongruousApiAdapter::Device
-      include CongruousApiAdapter::Output
-      DeferToClass = MIDIJRuby::Output
+    class Output < CongruousApiOutput
+      defer_to MIDIJRuby::Output
     end
     
-    class Device
-      extend CongruousApiAdapter::Device::ClassMethods
-      DeferToClass = MIDIJRuby::Device
-      InputClass = Input
-      OutputClass = Output
+    class Device < CongruousApiDevice
+      defer_to MIDIJRuby::Device
+      input_class Input
+      output_class Output
     end
 
   end

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

@@ -7,23 +7,18 @@ module UniMIDI
 
   module MIDIWinMMAdapter
     
-    class Input
-      include CongruousApiAdapter::Device
-      include CongruousApiAdapter::Input
-      DeferToClass = MIDIWinMM::Input
+    class Input < CongruousApiInput
+      defer_to MIDIWinMM::Input
     end
 
-    class Output
-      include CongruousApiAdapter::Device
-      include CongruousApiAdapter::Output
-      DeferToClass = MIDIWinMM::Output
+    class Output < CongruousApiOutput
+      defer_to MIDIWinMM::Output
     end
     
-    class Device
-      extend CongruousApiAdapter::Device::ClassMethods
-      DeferToClass = MIDIWinMM::Device
-      InputClass = Input
-      OutputClass = Output
+    class Device < CongruousApiDevice
+      defer_to MIDIWinMM::Device
+      input_class Input
+      output_class Output
     end
 
   end

data/lib/unimidi/congruous_api_adapter.rb

@@ -12,7 +12,7 @@ module UniMIDI
         @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)
@@ -23,165 +23,187 @@ module UniMIDI
             close
           end
         else
-          self
+        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)
+        # returns the first device for this class
+        def first(*a)
+          new(@deference[self].first(*a))
         end
-        
-        def last
-          new(device_class.last)
+
+        # returns the last device for this class
+        def last(*a)
+          new(@deference[self].last(*a))
         end
-        
+
+        # returns all devices in an array
         def all
           all_by_type.values.flatten
         end
-        
+
+        # returns all devices as a hash as such
+        #   { :input => [input devices], :output => [output devices] }
         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) }
+          {
+            :input => @deference[self].all_by_type[:input].map { |d| @input_class.new(d) },
+            :output => @deference[self].all_by_type[:output].map { |d| @output_class.new(d) }
           }
         end
 
-        def get_input_class
-          self::InputClass
+        def defer_to(klass)
+          @deference ||= {}
+          @deference[self] = klass
         end
 
-        def get_output_class
-          self::OutputClass
+        def input_class(klass)
+          @input_class = klass
         end
 
-        def device_class
-          self::DeferToClass
+        def output_class(klass)
+          @output_class = klass
         end
 
       end
 
     end
 
-    module Input
-   
-      def self.included(base)
-        base.extend(Device::ClassMethods)
-        base.extend(ClassMethods)
-      end
+  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
-      alias_method :gets_s, :gets_bytestr
-      alias_method :gets_hex, :gets_bytestr
-
-      #
-      # 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
+  class CongruousApiInput
+    
+    include CongruousApiAdapter::Device
+    extend CongruousApiAdapter::Device::ClassMethods
+    extend Forwardable
+    
+    def_delegators :@device, :buffer
+    
+    #
+    # 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
 
-      #
-      # returns a string of data such as 
-      #   "90406080406090447F"
-      #             
-      def gets_data_bytestr(*a)
-        arr = gets_bytestr
-        arr.map { |msg| msg[:data] }.join
-      end
-      alias_method :gets_data_s, :gets_data_bytestr
-      alias_method :gets_data_hex, :gets_data_bytestr
-      
-      module ClassMethods
-             
-        # returns all inputs
-        def all
-          device_class.all.map { |d| new(d) }
-        end
-        
-      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_s(*a)
+      @device.gets_s(*a)
+    end
+    alias_method :gets_bytestr, :gets_s
+    alias_method :gets_hex, :gets_s
+
+    #
+    # 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_s(*a)
+      arr = gets_bytestr
+      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 buffer
+    def clear_buffer
+      @device.buffer.clear
+    end
+    
+    # gets any messages in the buffer in the same format as CongruousApiInput#gets 
+    def gets_buffer(*a)
+      @device.buffer
+    end
+    
+    # gets any messages in the buffer in the same format as CongruousApiInput#gets_s
+    def gets_buffer_s(*a)
+      @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 CongruousApiInput#gets_data
+    def gets_buffer_data(*a)
+      @device.buffer.map { |msg| msg[:data] }
+    end
 
+    # returns all inputs
+    def self.all
+      @deference[self].all.map { |d| new(d) }
     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
+  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
+  class CongruousApiOutput
+    
+    include CongruousApiAdapter::Device
+    extend CongruousApiAdapter::Device::ClassMethods
+    
+    # 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_s(*a)
+      @device.puts_s(*a)
+    end
+    alias_method :puts_bytestr, :puts_s
+    alias_method :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 and therefore is more performant than puts
+    def puts_bytes(*a)
+      @device.puts_bytes(*a)
     end
 
+    # returns all outputs
+    def self.all
+      @deference[self].all.map { |d| new(d) }
+    end
+
+  end
+
+  class CongruousApiDevice
+    extend CongruousApiAdapter::Device::ClassMethods
   end
 
 end

data/lib/unimidi/platform.rb

@@ -4,30 +4,30 @@
 require 'singleton'
 
 module UniMIDI
-    
-    class Platform
-      
-      include Singleton
+  
+  class Platform
+
+    include Singleton
 
-      attr_reader :interface
-      
-      def initialize
-        lib = case RUBY_PLATFORM
-          when /darwin/ then "ffi-coremidi"
-          when /java/ then "midi-jruby"
-          when /linux/ then "alsa-rawmidi"
-          when /mingw/ then "midi-winmm"
-          when /win/ then "midi-winmm"
-        end
-        require("unimidi/adapter/#{lib}")
-        @interface = case RUBY_PLATFORM
-          when /darwin/ then CoreMIDIAdapter
-          when /java/ then MIDIJRubyAdapter
-          when /linux/ then AlsaRawMIDIAdapter
-          when /mingw/ then MIDIWinMMAdapter
-          when /win/ then MIDIWinMMAdapter 
-        end
+    attr_reader :interface
+    
+    def initialize
+      lib = case RUBY_PLATFORM
+        when /darwin/ then "ffi-coremidi"
+        when /java/ then "midi-jruby"
+        when /linux/ then "alsa-rawmidi"
+        when /mingw/ then "midi-winmm"
+        #when /win/ then "midi-winmm"
+      end
+      require("unimidi/adapter/#{lib}")
+      @interface = case RUBY_PLATFORM
+        when /darwin/ then CoreMIDIAdapter
+        when /java/ then MIDIJRubyAdapter
+        when /linux/ then AlsaRawMIDIAdapter
+        when /mingw/ then MIDIWinMMAdapter
+        #when /win/ then MIDIWinMMAdapter
       end
+    end
 
   end
 

data/lib/unimidi/type_conversion.rb

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+#
+
+module UniMIDI
+  
+  module TypeConversion
+      
+    # byte array to string of hex bytes 
+    def numeric_byte_array_to_hex_string(bytes)
+      bytes.map { |b| b.hex }.join
+    end
+      
+  end
+  
+end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: unimidi
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-    - 0
-    - 1
-    - 5
-  version: 0.1.5
+  prerelease: 
+  version: 0.1.6
 platform: java
 authors: 
   - Ari Russo
@@ -14,18 +10,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-07 00:00:00 -04:00
+date: 2011-05-10 00:00:00 -04:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: midi-jruby
     prerelease: false
     requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
             version: "0"
     type: :runtime
     version_requirements: *id001
@@ -42,10 +37,11 @@ files:
   - lib/unimidi.rb
   - lib/unimidi/congruous_api_adapter.rb
   - lib/unimidi/platform.rb
-  - lib/unimidi/adapter/ffi-coremidi.rb
-  - lib/unimidi/adapter/midi-winmm.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
   - LICENSE
   - README.rdoc
 has_rdoc: true
@@ -58,25 +54,21 @@ rdoc_options: []
 require_paths: 
   - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 1
-          - 3
-          - 6
         version: 1.3.6
 requirements: []
 
 rubyforge_project: unimidi
-rubygems_version: 1.3.6
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: Realtime MIDI input and output for Ruby.