unimidi 0.2.2-java → 0.2.3-java

data/lib/unimidi.rb

@@ -6,7 +6,7 @@
 
 module UniMIDI
   
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
  
 end
 

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

@@ -9,10 +9,12 @@ module UniMIDI
     
     class Input < CongruousApiInput
       defer_to AlsaRawMIDI::Input
+      device_class AlsaRawMIDI::Device
     end
 
     class Output < CongruousApiOutput
       defer_to AlsaRawMIDI::Output
+      device_class AlsaRawMIDI::Device
     end
     
     class Device < CongruousApiDevice

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

@@ -8,17 +8,28 @@ module UniMIDI
   module CoreMIDIAdapter
     
     class Input < CongruousApiInput
-      defer_to CoreMIDI::Input
+      defer_to CoreMIDI::Source
+      device_class CoreMIDI::Endpoint
     end
 
     class Output < CongruousApiOutput
-      defer_to CoreMIDI::Output
+      defer_to CoreMIDI::Destination
+      device_class CoreMIDI::Endpoint
     end
     
     class Device < CongruousApiDevice
       defer_to CoreMIDI::Endpoint
       input_class Input
       output_class Output
+        
+      def self.populate
+        klass = @deference[self].respond_to?(:all_by_type) ? @deference[self] : @device_class
+        @devices = {
+            :input => klass.all_by_type[:source].map { |d| @input_class.new(d) },
+            :output => klass.all_by_type[:destination].map { |d| @output_class.new(d) }
+          }          
+      end
+      
     end
     
   end

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

@@ -9,10 +9,12 @@ module UniMIDI
     
     class Input < CongruousApiInput
       defer_to MIDIJRuby::Input
+      device_class MIDIJRuby::Device
     end
 
     class Output < CongruousApiOutput
       defer_to MIDIJRuby::Output
+      device_class MIDIJRuby::Device
     end
     
     class Device < CongruousApiDevice

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

@@ -9,10 +9,12 @@ module UniMIDI
     
     class Input < CongruousApiInput
       defer_to MIDIWinMM::Input
+      device_class MIDIWinMM::Device
     end
 
     class Output < CongruousApiOutput
       defer_to MIDIWinMM::Output
+      device_class MIDIWinMM::Device
     end
     
     class Device < CongruousApiDevice

data/lib/unimidi/congruous_api_adapter.rb

@@ -13,6 +13,10 @@ module UniMIDI
         @name = @device.name
         @type = @device.type
       end
+      
+      def enabled?
+        @device.enabled
+      end
 
       # enable the device for use, can be passed a block to which the device will be passed back
       def open(*a, &block)
@@ -47,17 +51,13 @@ module UniMIDI
       module ClassMethods
         
         # returns the first device for this class
-        def first(*a)
-          dev = @deference[self].first(*a)
-          raise 'Device not found' if dev.nil?
-          new(dev)
+        def first(&block)
+          use_device(all.first, &block)
         end
 
         # returns the last device for this class
-        def last(*a)
-          dev = @deference[self].last(*a)
-          raise 'Device not found' if dev.nil?
-          new(dev)          
+        def last(&block)
+          use_device(all.last, &block)
         end
 
         # returns all devices in an array
@@ -66,23 +66,29 @@ module UniMIDI
         end
         
         # returns the device at <em>index</em>
+        def use(index, &block)
+          use_device(all[index], &block) 
+        end
+        
         def [](index)
-          all[index] 
+          all[index]
         end
 
         # returns all devices as a hash as such
         #   { :input => [input devices], :output => [output devices] }
         def all_by_type
-          {
-            :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) }
-          }
+          ensure_initialized
+          @devices
         end
 
         def defer_to(klass)
           @deference ||= {}
           @deference[self] = klass
         end
+        
+        def device_class(klass)
+          @device_class = klass
+        end
 
         def input_class(klass)
           @input_class = klass
@@ -91,6 +97,26 @@ module UniMIDI
         def output_class(klass)
           @output_class = klass
         end
+        
+        def populate
+          klass = @deference[self].respond_to?(:all_by_type) ? @deference[self] : @device_class
+          @devices = {
+            :input => klass.all_by_type[:input].map { |d| @input_class.new(d) },
+            :output => klass.all_by_type[:output].map { |d| @output_class.new(d) }
+          }          
+        end
+        alias_method :refresh, :populate
+        
+        private
+        
+        def ensure_initialized
+          populate if @devices.nil?
+        end
+        
+        def use_device(device, &block)
+          device.open(&block) unless block.nil?
+          device         
+        end
 
       end
 
@@ -177,7 +203,7 @@ module UniMIDI
 
     # returns all inputs
     def self.all
-      @deference[self].all.map { |d| new(d) }
+      UniMIDI::Device.all_by_type[:input]
     end
 
   end
@@ -225,7 +251,7 @@ module UniMIDI
 
     # returns all outputs
     def self.all
-      @deference[self].all.map { |d| new(d) }
+      UniMIDI::Device.all_by_type[:output]
     end
 
   end

data/test/helper.rb

@@ -29,16 +29,19 @@ module TestHelper
     end
   end 
   
-  def platform_test(adapter, mod)
+  def platform_test(adapter, mod, device_class = nil, input_class = nil, output_class = nil)
+    device_class ||= mod::Device
+    input_class ||= mod::Input
+    output_class ||= mod::Output
     assert_equal(adapter, UniMIDI::Platform.instance.interface)
-    assert_not_same(mod::Input, UniMIDI::Input)
-    assert_not_same(mod::Output, UniMIDI::Output)
-    assert_not_same(mod::Device, UniMIDI::Device)
-    assert_equal(mod::Input.first.name, UniMIDI::Input.first.name)
-    assert_equal(mod::Input.first.id, UniMIDI::Input.first.id)
-    assert_not_same(mod::Output.first, UniMIDI::Output.first)
-    assert_equal(mod::Output.first.name, UniMIDI::Output.first.name)
-    assert_equal(mod::Output.first.id, UniMIDI::Output.first.id)
+    assert_not_same(input_class, UniMIDI::Input)
+    assert_not_same(output_class, UniMIDI::Output)
+    assert_not_same(device_class, UniMIDI::Device)
+    assert_equal(input_class.first.name, UniMIDI::Input.first.name)
+    assert_equal(input_class.first.id, UniMIDI::Input.first.id)
+    assert_not_same(output_class.first, UniMIDI::Output.first)
+    assert_equal(output_class.first.name, UniMIDI::Output.first.name)
+    assert_equal(output_class.first.id, UniMIDI::Output.first.id)
   end
 	    
   def bytestrs_to_ints(arr)

data/test/test_input_buffer.rb

@@ -15,6 +15,8 @@ class InputBufferTest < Test::Unit::TestCase
 
     $test_device[:output].open do |output|
       $test_device[:input].open do |input|
+        
+        input.buffer.clear
 
         messages.each do |msg|
 

data/test/test_io.rb

@@ -16,7 +16,9 @@ class IoTest < Test::Unit::TestCase
     pointer = 0
     $test_device[:output].open do |output|
       $test_device[:input].open do |input|
-
+        
+        input.buffer.clear
+        
         messages.each do |msg|
 
           $>.puts "sending: " + msg.inspect
@@ -87,7 +89,9 @@ class IoTest < Test::Unit::TestCase
     pointer = 0
     $test_device[:output].open do |output|
       $test_device[:input].open do |input|
-
+ 
+        #input.buffer.clear
+        
         messages.each do |msg|
 
           $>.puts "sending: " + msg.inspect

data/test/test_platform.rb

@@ -21,7 +21,7 @@ class PlatformTest < Test::Unit::TestCase
   
   def test_osx
     if RUBY_PLATFORM.include?("darwin")
-      platform_test(CoreMIDIAdapter, CoreMIDI)
+      platform_test(CoreMIDIAdapter, CoreMIDI, CoreMIDI::Endpoint, CoreMIDI::Source, CoreMIDI::Destination)
     end  
   end
   

data/test/test_selectors.rb

@@ -0,0 +1,56 @@
+#!/usr/bin/env ruby
+
+require 'helper'
+
+class SelectorTest < Test::Unit::TestCase
+
+  include UniMIDI
+  include TestHelper
+
+  def test_first
+    i = Input.first
+    assert_equal(Input.all.first, i)
+  end
+
+  def test_last
+    i = Input.last
+    assert_equal(Input.all.last, i)    
+  end
+  
+  def test_first_with_block
+    sleep(1)
+    i = Input.first do |i|
+      assert_equal(true, i.enabled?)
+    end
+    assert_equal(Input.all.first, i)
+  end
+  
+  def test_last_with_block
+    sleep(1)
+    i = Input.last do |i|
+      assert_equal(true, i.enabled?)     
+    end
+    assert_equal(Input.all.last, i)     
+  end
+  
+  def test_brackets
+    i = Input[0]
+    assert_equal(Input.first, i)
+    assert_equal(Input.all.first, i)
+  end
+  
+  def test_use_with_block
+    sleep(1)
+    i = Input.use(0) do |i|
+      assert_equal(true, i.enabled?) 
+    end
+    assert_equal(Input.first, i)
+    assert_equal(Input.all.first, i)    
+  end
+  
+  def test_all
+    i = Input.all
+    assert_equal(Device.all_by_type[:input], Input.all)
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unimidi
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: java
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-26 00:00:00.000000000Z
+date: 2011-09-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: midi-jruby
-  requirement: &81210930 !ruby/object:Gem::Requirement
+  requirement: &70346288664740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *81210930
+  version_requirements: *70346288664740
 description: Platform Independent, realtime MIDI input and output for Ruby
 email:
 - ari.russo@gmail.com
@@ -31,18 +31,19 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/unimidi
-- lib/unimidi.rb
-- lib/unimidi/adapter/ffi-coremidi.rb
-- lib/unimidi/adapter/midi-winmm.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/congruous_api_adapter.rb
 - lib/unimidi/platform.rb
 - lib/unimidi/type_conversion.rb
+- lib/unimidi.rb
 - test/helper.rb
-- test/test_io.rb
 - test/test_input_buffer.rb
+- test/test_io.rb
 - test/test_platform.rb
+- test/test_selectors.rb
 - LICENSE
 - README.rdoc
 homepage: http://github.com/arirusso/unimidi
@@ -65,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: unimidi
-rubygems_version: 1.8.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Realtime MIDI input and output for Ruby