mtk 0.0.3.3 → 0.4

data/spec/mtk/events/timeline_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe MTK::Events::Timeline do
 
   let(:note1) { Note(C4, p, 1) }
-  let(:note2) { Note(G4, o, 2) }
+  let(:note2) { Note(G4, f, 2) }
   let(:timeline_raw_data) { { 0.0 => note1, 1.0 => [note1, note2] } }
   let(:timeline_hash) { { 0.0 => [note1], 1.0 => [note1, note2] } }
   let(:timeline) { MTK::Events::Timeline.from_h(timeline_raw_data) }
@@ -425,6 +425,10 @@ describe MTK::Events::Timeline do
         (line =~ /=>/).should == arrow_position
       end
     end
+
+    it "returns empty string for empty timelines" do
+      MTK::Events::Timeline.new.to_s.should == ''
+    end
   end
 end
 

data/spec/mtk/io/midi_file_spec.rb

@@ -42,7 +42,7 @@ describe MTK::IO::MIDIFile do
   end
 
   describe "#write_timeline" do
-    it 'writes monophonic Notes in a Timeline to a MIDI file' do
+    it 'writes monophonic Notes in a Timeline to a MIDI format 0 file' do
       MIDIFile(tempfile).write_timeline(
         MTK::Events::Timeline.from_h({
           0 => Note(C4, q, 0.7),
@@ -56,6 +56,7 @@ describe MTK::IO::MIDIFile do
         seq = MIDI::Sequence.new
         seq.read(file)
         seq.tracks.size.should == 1
+        seq.format.should == 0
 
         track = seq.tracks[0]
         note_ons, note_offs = note_ons_and_offs(track)
@@ -82,6 +83,15 @@ describe MTK::IO::MIDIFile do
       end
     end
 
+    it 'writes a timeline that can be read in as an identical Timeline' do
+      timeline = MTK::Events::Timeline.from_h({
+        0 => Note(C4, q, 1)
+      })
+      MIDIFile(tempfile).write_timeline(timeline)
+      read_timeline = MIDIFile(tempfile).to_timelines.first
+      read_timeline.should == timeline
+    end
+
     it 'writes polyphonic (simultaneous) Notes in a Timeline to a MIDI file' do
       MIDIFile(tempfile).write_timeline(
         MTK::Events::Timeline.from_h({
@@ -169,7 +179,7 @@ describe MTK::IO::MIDIFile do
   end
 
   describe "#write_timelines" do
-    it "writes a multitrack MIDI file" do
+    it "writes a multitrack format 1 MIDI file" do
       MIDIFile(tempfile).write_timelines([
         MTK::Events::Timeline.from_h({
           0 => Note(C4, q, 0.7),
@@ -186,6 +196,7 @@ describe MTK::IO::MIDIFile do
         seq = MIDI::Sequence.new
         seq.read(file)
         seq.tracks.size.should == 2
+        seq.format.should == 1
 
         track = seq.tracks[0]
         note_ons, note_offs = note_ons_and_offs(track)

data/spec/mtk/io/midi_output_spec.rb

@@ -10,14 +10,15 @@ describe MTK::IO::MIDIOutput do
   let(:subject) { MockOuput.new(mock_device) }
 
   let(:mock_device) do
-    mock_device = mock(:device)
+    mock_device = double(:device)
     mock_device.stub(:open)
     mock_device
   end
 
   let(:scheduler) do
-    scheduler = mock(:scheduler)
+    scheduler = double(:scheduler)
     Gamelan::Scheduler.stub(:new).and_return scheduler
+    scheduler.stub(:stop).and_return :stop_scheduler
     scheduler
   end
 
@@ -28,14 +29,16 @@ describe MTK::IO::MIDIOutput do
   end
 
   def should_be_scheduled timed_data
+    explicitly_expected_stop_scheduler = false
     timed_data.each do |time,data|
+      explicitly_expected_stop_scheduler = true if data == :stop_scheduler
       scheduler.should_receive(:at) do |scheduled_time,&callback|
         scheduled_time.should == time
         callback.yield.should == data
       end
     end
-    scheduler.should_receive(:at) # end time, don't care about this here...
-    scheduler.should_receive(:run).and_return mock(:thread,:join=>nil)
+    scheduler.should_receive(:at) unless explicitly_expected_stop_scheduler # auto-handle stop_schedulerer if needed
+    scheduler.should_receive(:run).and_return double(:thread,:join=>nil)
   end
 
 
@@ -50,7 +53,8 @@ describe MTK::IO::MIDIOutput do
 
     it "handles note events" do
       should_be_scheduled 0 => [:note_on,  60, 127, 0],
-                          1 => [:note_off, 60, 127, 0]
+                          1 => [:note_on,  60,   0, 0]
+                          # 1 => [:note_off, 60, 127, 0] # for when we have proper note off support
       subject.play  MTK::Events::Timeline.from_h( 0 => Note(C4,fff,1) )
     end
 
@@ -82,21 +86,50 @@ describe MTK::IO::MIDIOutput do
     it "handles simultaneous events" do
       should_be_scheduled [
         [0, [:note_on,  60, 127, 0]],
-        [1, [:note_off, 60, 127, 0]],
+        [1, [:note_on,  60,   0, 0]],
+        # [1, [:note_off, 60, 127, 0]], # for when we have proper note off support
         [0, [:note_on,  67, 127, 0]],
-        [1, [:note_off, 67, 127, 0]]
+        [1, [:note_on,  67,   0, 0]],
+        # [1, [:note_off, 67, 127, 0]] # for when we have proper note off support
       ]
       subject.play [Note(C4,fff,1),Note(G4,fff,1)]
     end
 
     it "handles a list of timelines" do
       should_be_scheduled  0 => [:note_on,  60, 127, 0],
-                           1 => [:note_off, 60, 127, 0],
+                           1 => [:note_on,  60,   0, 0],
+                           #1 => [:note_off, 60, 127, 0], # for when we have proper note off support
                            2 => [:note_on,  67, 127, 0],
-                           3 => [:note_off, 67, 127, 0]
+                           3 => [:note_on,  67,   0, 0]
+                           #3 => [:note_off, 67, 127, 0] # for when we have proper note off support
       subject.play [ MTK::Events::Timeline.from_h( 0 => Note(C4,fff,1) ),  MTK::Events::Timeline.from_h( 2 => Note(G4,fff,1) )]
     end
 
+
+    it "stops the scheduler 2 beats after the last event" do
+      should_be_scheduled  0 => [:note_on,  60, 127, 0],
+                           1 => [:note_on,  60,   0, 0],
+                           #1 => [:note_off, 60, 127, 0], # for when we have proper note off support
+                           3 => :stop_scheduler
+      subject.play MTK::Events::Timeline.from_h( 0 => Note(C4,fff,1) )
+    end
+
+    it "stops the scheduler 2 beats after the longest of simultaneous final events" do
+      should_be_scheduled  [
+        [0,  [:note_on,  60, 127, 0]],
+        [1,  [:note_on,  60,   0, 0]],
+        #[1,  [:note_off, 60, 127, 0]], # for when we have proper note off support
+        [0,  [:note_on,  62, 127, 0]],
+        [3.5,[:note_on,  62,   0, 0]],
+        #[3.5,[:note_off, 62, 127, 0]], # for when we have proper note off support
+        [0,  [:note_on,  64, 127, 0]],
+        [2,  [:note_on,  64,   0, 0]],
+        #[2,  [:note_off, 64, 127, 0]], # for when we have proper note off support
+        [5.5, :stop_scheduler]
+      ]
+      subject.play MTK::Events::Timeline.from_h( 0 => [Note(C4,fff,1), Note(D4,fff,3.5), Note(E4,fff,2)] )
+    end
+
   end
 
 end

data/spec/mtk/lang/durations_spec.rb

@@ -29,12 +29,12 @@ describe MTK::Lang::Durations do
     end
   end
 
-  describe 'i' do
+  describe 'e' do
     it 'is 1/2 of a beat' do
-      i.value.should == 1.0/2
+      e.value.should == 1.0/2
     end
     it 'is available via a module property and via mixin' do
-      Durations::i.should == i
+      Durations::e.should == e
     end
   end
 
@@ -67,7 +67,7 @@ describe MTK::Lang::Durations do
 
   describe "DURATIONS" do
     it "contains all Durations pseudo-constants" do
-      Durations::DURATIONS.should =~ [w, h, q, i, s, r, x]
+      Durations::DURATIONS.should =~ [w, h, q, e, s, r, x]
     end
 
     it "is immutable" do
@@ -77,7 +77,7 @@ describe MTK::Lang::Durations do
 
   describe "DURATION_NAMES" do
     it "contains all Durations pseudo-constants names as strings" do
-      Durations::DURATION_NAMES.should =~ ['w', 'h', 'q', 'i', 's', 'r', 'x']
+      Durations::DURATION_NAMES.should =~ ['w', 'h', 'q', 'e', 's', 'r', 'x']
     end
 
     it "is immutable" do

data/spec/mtk/lang/intensities_spec.rb

@@ -47,12 +47,12 @@ describe MTK::Lang::Intensities do
     end    
   end
 
-  describe 'o' do # AKA forte
+  describe 'f' do # AKA forte
     it 'is equivalent to MIDI velocity 95' do
-      (o.value * 127).round.should == 95
+      (f.value * 127).round.should == 95
     end
     it 'is available via a module property and via mixin' do
-      Intensities::o.should == o
+      Intensities::f.should == f
     end
     it "does not overwrite the PitchClass constant 'F'" do
       F.should be_a PitchClass
@@ -79,7 +79,7 @@ describe MTK::Lang::Intensities do
 
   describe "INTENSITIES" do
     it "contains all Intensities pseudo-constants" do
-      Intensities::INTENSITIES.should =~ [ppp, pp, p, mp, mf, o, ff, fff]
+      Intensities::INTENSITIES.should =~ [ppp, pp, p, mp, mf, f, ff, fff]
     end
 
     it "is immutable" do
@@ -89,7 +89,7 @@ describe MTK::Lang::Intensities do
 
   describe "INTENSITY_NAMES" do
     it "contains all Intensities pseudo-constants names as strings" do
-      Intensities::INTENSITY_NAMES.should =~ ['ppp', 'pp', 'p', 'mp', 'mf', 'o', 'ff', 'fff']
+      Intensities::INTENSITY_NAMES.should =~ ['ppp', 'pp', 'p', 'mp', 'mf', 'f', 'ff', 'fff']
     end
 
     it "is immutable" do

data/spec/mtk/lang/intervals_spec.rb

@@ -11,12 +11,30 @@ describe MTK::Lang::Intervals do
     end
   end
 
+  describe 'd2' do
+    it 'is 0 semitones' do
+      d2.should == Interval[0]
+    end
+    it 'is available via a module property and via mixin' do
+      Intervals::d2.should == d2
+    end
+  end
+
   describe 'm2' do
     it 'is 1 semitone' do
       m2.should == Interval[1]
     end
     it 'is available via a module property and via mixin' do
-      Intervals::P1.should == P1
+      Intervals::m2.should == m2
+    end
+  end
+
+  describe 'a1' do
+    it 'is 1 semitone' do
+      a1.should == Interval[1]
+    end
+    it 'is available via a module property and via mixin' do
+      Intervals::a1.should == a1
     end
   end
 
@@ -25,7 +43,16 @@ describe MTK::Lang::Intervals do
       M2.should == Interval[2]
     end
     it 'is available via a module property and via mixin' do
-      Intervals::P1.should == P1
+      Intervals::M2.should == M2
+    end
+  end
+
+  describe 'd3' do
+    it 'is 2 semitones' do
+      d3.should == Interval[2]
+    end
+    it 'is available via a module property and via mixin' do
+      Intervals::d3.should == d3
     end
   end
 
@@ -34,7 +61,16 @@ describe MTK::Lang::Intervals do
       m3.should == Interval[3]
     end
     it 'is available via a module property and via mixin' do
-      Intervals::P1.should == P1
+      Intervals::m3.should == m3
+    end
+  end
+
+  describe 'a2' do
+    it 'is 3 semitones' do
+      a2.should == Interval[3]
+    end
+    it 'is available via a module property and via mixin' do
+      Intervals::a2.should == a2
     end
   end
 
@@ -43,7 +79,16 @@ describe MTK::Lang::Intervals do
       M3.should == Interval[4]
     end
     it 'is available via a module property and via mixin' do
-      Intervals::P1.should == P1
+      Intervals::M3.should == M3
+    end
+  end
+
+  describe 'd4' do
+    it 'is 4 semitones' do
+      d4.should == Interval[4]
+    end
+    it 'is available via a module property and via mixin' do
+      Intervals::d4.should == d4
     end
   end
 
@@ -52,7 +97,16 @@ describe MTK::Lang::Intervals do
       P4.should == Interval[5]
     end
     it 'is available via a module property and via mixin' do
-      Intervals::P1.should == P1
+      Intervals::P4.should == P4
+    end
+  end
+
+  describe 'a3' do
+    it 'is 5 semitones' do
+      a3.should == Interval[5]
+    end
+    it 'is available via a module property and via mixin' do
+      Intervals::a3.should == a3
     end
   end
 
@@ -61,7 +115,25 @@ describe MTK::Lang::Intervals do
       TT.should == Interval[6]
     end
     it 'is available via a module property and via mixin' do
-      Intervals::P1.should == P1
+      Intervals::TT.should == TT
+    end
+  end
+
+  describe 'a4' do
+    it 'is 6 semitones' do
+      a4.should == Interval[6]
+    end
+    it 'is available via a module property and via mixin' do
+      Intervals::a4.should == a4
+    end
+  end
+
+  describe 'd5' do
+    it 'is 6 semitones' do
+      d5.should == Interval[6]
+    end
+    it 'is available via a module property and via mixin' do
+      Intervals::d5.should == d5
     end
   end
 
@@ -70,7 +142,16 @@ describe MTK::Lang::Intervals do
       P5.should == Interval[7]
     end
     it 'is available via a module property and via mixin' do
-      Intervals::P1.should == P1
+      Intervals::P5.should == P5
+    end
+  end
+
+  describe 'd6' do
+    it 'is 7 semitones' do
+      d6.should == Interval[7]
+    end
+    it 'is available via a module property and via mixin' do
+      Intervals::d6.should == d6
     end
   end
 
@@ -83,12 +164,30 @@ describe MTK::Lang::Intervals do
     end
   end
 
+  describe 'a5' do
+    it 'is 8 semitones' do
+      a5.should == Interval[8]
+    end
+    it 'is available via a module property and via mixin' do
+      Intervals::a5.should == a5
+    end
+  end
+
   describe 'M6' do
     it 'is 9 semitones' do
       M6.should == Interval[9]
     end
     it 'is available via a module property and via mixin' do
-      Intervals::P1.should == P1
+      Intervals::M6.should == M6
+    end
+  end
+
+  describe 'd7' do
+    it 'is 9 semitones' do
+      d7.should == Interval[9]
+    end
+    it 'is available via a module property and via mixin' do
+      Intervals::d7.should == d7
     end
   end
 
@@ -97,7 +196,16 @@ describe MTK::Lang::Intervals do
       m7.should == Interval[10]
     end
     it 'is available via a module property and via mixin' do
-      Intervals::P1.should == P1
+      Intervals::m7.should == m7
+    end
+  end
+
+  describe 'a6' do
+    it 'is 10 semitones' do
+      a6.should == Interval[10]
+    end
+    it 'is available via a module property and via mixin' do
+      Intervals::a6.should == a6
     end
   end
 
@@ -106,7 +214,16 @@ describe MTK::Lang::Intervals do
       M7.should == Interval[11]
     end
     it 'is available via a module property and via mixin' do
-      Intervals::P1.should == P1
+      Intervals::M7.should == M7
+    end
+  end
+
+  describe 'd8' do
+    it 'is 11 semitones' do
+      d8.should == Interval[11]
+    end
+    it 'is available via a module property and via mixin' do
+      Intervals::d8.should == d8
     end
   end
 
@@ -115,14 +232,23 @@ describe MTK::Lang::Intervals do
       P8.should == Interval[12]
     end
     it 'is available via a module property and via mixin' do
-      Intervals::P1.should == P1
+      Intervals::P8.should == P8
+    end
+  end
+
+  describe 'a7' do
+    it 'is 12 semitones' do
+      a7.should == Interval[12]
+    end
+    it 'is available via a module property and via mixin' do
+      Intervals::a7.should == a7
     end
   end
 
 
   describe "INTERVALS" do
     it "contains all intervals constants/pseudo-constants" do
-      Intervals::INTERVALS.should =~ [P1, m2, M2, m3, M3, P4, TT, P5, m6, M6, m7, M7, P8]
+      Intervals::INTERVALS.should =~ MTK::Core::Interval::ALL_NAMES.map{|name| MTK::Core::Interval.from_name(name) }
     end
 
     it "is immutable" do
@@ -132,7 +258,7 @@ describe MTK::Lang::Intervals do
 
   describe "INTERVAL_NAMES" do
     it "contains all intervals constants/pseudo-constant names" do
-      Intervals::INTERVAL_NAMES.should =~ ['P1', 'm2', 'M2', 'm3', 'M3', 'P4', 'TT', 'P5', 'm6', 'M6', 'm7', 'M7', 'P8']
+      Intervals::INTERVAL_NAMES.should =~ MTK::Core::Interval::ALL_NAMES
     end
 
     it "is immutable" do