midi 0.0.8 → 0.0.9

data/README.rdoc

@@ -2,7 +2,7 @@
 
 A Ruby DSL for MIDI
 
-{pic}[http://images.treetrouble.net/images/midi.png]
+{pic}[http://img855.imageshack.us/img855/9804/midi.png]
 
 == Features
  

data/TODO

@@ -1,8 +1,5 @@
 Functionality
-* thru issues / strong thru
-* Sysex messages 
 * MIDI files?
 
 Documentation
-* Guide for shorthand aliases
 * More rdoc

data/lib/micromidi.rb

@@ -16,7 +16,7 @@ require "unimidi"
 
 module MicroMIDI
   
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
   
   module Instructions
   end
@@ -35,8 +35,8 @@ module MicroMIDI
   
   module IO
     
-    def self.new(*args)
-      MicroMIDI.message(*args)
+    def self.new(*args, &block)
+      MicroMIDI.message(*args, &block)
     end
     
   end

data/lib/micromidi/context.rb

@@ -25,7 +25,12 @@ module MicroMIDI
         :sysex => Instructions::SysEx.new(@state)
       }
        
-      instance_eval(&block) unless block.nil?
+      edit(&block) unless block.nil?
+    end
+    
+    # open a block for editing/live coding in this Context
+    def edit(&block)
+      self.instance_eval(&block)
     end
     
     def repeat

data/lib/micromidi/instructions/composite.rb

@@ -6,15 +6,32 @@ module MicroMIDI
     
     module Composite
       
-      # play note n, wait <em>duration</em> seconds, then do note off for note n
-      def play(n, duration)
-        msg = case n
-          when Numeric, String then note(n)
-          when MIDIMessage then n 
+      #
+      # plays a note or notes, for a certain duration.
+      #
+      # the first argument must be a note name (String), MIDIMessage::NoteOn object, or array of either
+      # the last argument must be a Numeric (representing the duration)
+      #
+      # additional arguments should be note names or MIDIMessage::NoteOn objects and will 
+      # be played as a chord with the first argument
+      #
+      def play(*args)
+        raise "last argument must be a Numeric duration" unless args.last.kind_of?(Numeric)
+        
+        duration = args.pop
+        note_or_notes = [args].flatten
+        
+        msgs = note_or_notes.map do |n|
+          case n
+            when Numeric, String then note(n)
+            when MIDIMessage then n 
+          end
         end
+        
         sleep(duration)
-        off
-        msg
+        msgs.each { |msg| note_off(msg.note, :channel => msg.channel, :velocity => msg.velocity) }
+        
+        msgs.size > 1 ? msgs : msgs.first
       end
       
       # sends a note off message for every note on every channel

data/test/test_composite.rb

@@ -28,6 +28,50 @@ class CompositeTest < Test::Unit::TestCase
     assert_equal(0, off_msg.channel)
   end
   
+  def test_play_chord
+    m = MicroMIDI.message
+    start = Time.now
+    msgs = m.play "C0", "E1", "G2", 0.5
+    
+    finish = Time.now
+    dif = finish - start
+    assert_equal(true, dif >= 0.5)
+    
+    msg = msgs.first
+    
+    assert_equal(NoteOn, msg.class)
+    assert_equal(12, msg.note)
+    assert_equal(0, msg.channel)
+    assert_equal(6, m.state.output_cache.size)
+    
+    off_msg = m.state.output_cache.last[:message]
+    assert_equal(NoteOff, off_msg.class)
+    assert_equal(43, off_msg.note)
+    assert_equal(0, off_msg.channel)
+  end
+  
+  def test_play_chord_array
+    m = MicroMIDI.message
+    start = Time.now
+    msgs = m.play ["C0", "E1", "G2"], 0.5
+    
+    finish = Time.now
+    dif = finish - start
+    assert_equal(true, dif >= 0.5)
+    
+    msg = msgs.first
+    
+    assert_equal(NoteOn, msg.class)
+    assert_equal(12, msg.note)
+    assert_equal(0, msg.channel)
+    assert_equal(6, m.state.output_cache.size)
+    
+    off_msg = m.state.output_cache.last[:message]
+    assert_equal(NoteOff, off_msg.class)
+    assert_equal(43, off_msg.note)
+    assert_equal(0, off_msg.channel)
+  end
+  
   def test_all_off
     
   end

data/test/test_context.rb

@@ -8,13 +8,34 @@ class ContextTest < Test::Unit::TestCase
   include MIDIMessage
   include TestHelper
   
-  def test_no_block
+  def test_new_with_block
+    msg = nil
+    MIDI::IO.new do
+      msg = note "C0"
+    end
+    assert_equal(NoteOn, msg.class)
+    assert_equal(12, msg.note)
+    assert_equal(0, msg.channel)    
+  end
+  
+  def test_new_with_no_block
     m = MIDI::IO.new
     msg = m.note "C0"
     assert_equal(NoteOn, msg.class)
     assert_equal(12, msg.note)
     assert_equal(0, msg.channel)
   end
+  
+  def test_edit
+    msg = nil
+    m = MIDI::IO.new 
+    m.edit do
+      msg = m.note "C0"
+    end
+    assert_equal(NoteOn, msg.class)
+    assert_equal(12, msg.note)
+    assert_equal(0, msg.channel)     
+  end
 
   def test_repeat
     m = MicroMIDI.message

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: midi
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-18 00:00:00.000000000Z
+date: 2011-11-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: midi-eye
-  requirement: &70231410284120 !ruby/object:Gem::Requirement
+  requirement: &70134752556680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70231410284120
+  version_requirements: *70134752556680
 - !ruby/object:Gem::Dependency
   name: midi-message
-  requirement: &70231410283440 !ruby/object:Gem::Requirement
+  requirement: &70134752555560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70231410283440
+  version_requirements: *70134752555560
 - !ruby/object:Gem::Dependency
   name: unimidi
-  requirement: &70231410282960 !ruby/object:Gem::Requirement
+  requirement: &70134752553640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 0.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70231410282960
+  version_requirements: *70134752553640
 description: A Ruby DSL for MIDI
 email:
 - ari.russo@gmail.com