mtk 0.0.3.2 → 0.0.3.3

data/spec/mtk/{midi/file_spec.rb → io/midi_file_spec.rb}

@@ -1,8 +1,8 @@
 require 'spec_helper'
-require 'mtk/midi/file'
+require 'mtk/io/midi_file'
 require 'tempfile'
 
-describe MTK::MIDI::File do
+describe MTK::IO::MIDIFile do
 
   let(:test_mid) { File.join(File.dirname(__FILE__), '..', '..', 'test.mid') }
 
@@ -28,11 +28,11 @@ describe MTK::MIDI::File do
 
   describe "#to_timelines" do
     it "converts a single-track MIDI file to an Array containing one Timeline" do
-      MIDI_File(test_mid).to_timelines.length.should == 1 # one track
+      MIDIFile(test_mid).to_timelines.length.should == 1 # one track
     end
 
     it "converts note on/off messages to Note events" do
-      MIDI_File(test_mid).to_timelines.first.should == {
+      MIDIFile(test_mid).to_timelines.first.should == {
         0.0 => [Note(C4,  0.25, 126/127.0)],
         1.0 => [Note(Db4, 0.5,   99/127.0)],
         2.0 => [Note(D4,  0.75,  72/127.0)],
@@ -43,8 +43,8 @@ describe MTK::MIDI::File do
 
   describe "#write_timeline" do
     it 'writes monophonic Notes in a Timeline to a MIDI file' do
-      MIDI_File(tempfile).write_timeline(
-        Timeline.from_hash({
+      MIDIFile(tempfile).write_timeline(
+        MTK::Events::Timeline.from_h({
           0 => Note(C4, q, 0.7),
           1 => Note(G4, q, 0.8),
           2 => Note(C5, q, 0.9)
@@ -83,8 +83,8 @@ describe MTK::MIDI::File do
     end
 
     it 'writes polyphonic (simultaneous) Notes in a Timeline to a MIDI file' do
-      MIDI_File(tempfile).write_timeline(
-        Timeline.from_hash({
+      MIDIFile(tempfile).write_timeline(
+        MTK::Events::Timeline.from_h({
           0 => [Note(C4,q,0.5), Note(E4,q,0.5)],
           2.0 => [Note(G4,h,1), Note(B4,h,1), Note(D5,h,1)]
         })
@@ -134,8 +134,8 @@ describe MTK::MIDI::File do
     end
 
     it 'ignores rests (events with negative duration)' do
-      MIDI_File(tempfile).write_timeline(
-        Timeline.from_hash({
+      MIDIFile(tempfile).write_timeline(
+        MTK::Events::Timeline.from_h({
           0 => Note(C4, q, 0.7),
           1 => Note(G4, -q, 0.8), # this is a rest because it has a negative duration
           2 => Note(C5, q, 0.9)
@@ -170,12 +170,12 @@ describe MTK::MIDI::File do
 
   describe "#write_timelines" do
     it "writes a multitrack MIDI file" do
-      MIDI_File(tempfile).write_timelines([
-        Timeline.from_hash({
+      MIDIFile(tempfile).write_timelines([
+        MTK::Events::Timeline.from_h({
           0 => Note(C4, q, 0.7),
           1.0 => Note(G4, q, 0.8),
         }),
-        Timeline.from_hash({
+        MTK::Events::Timeline.from_h({
           1 => Note(C5, h, 0.9),
           2 => Note(D5, h, 1),
         }),
@@ -226,15 +226,15 @@ describe MTK::MIDI::File do
 
   describe "#write" do
     it "calls write_timeline when given a Timeline" do
-      midi_file = MIDI_File(nil)
-      timeline = Timeline.new
+      midi_file = MIDIFile(nil)
+      timeline =  MTK::Events::Timeline.new
       midi_file.should_receive(:write_timeline).with(timeline)
       midi_file.write(timeline)
     end
 
     it "calls write_timelines when given an Array" do
-      midi_file = MIDI_File(nil)
-      timelines = [Timeline.new]
+      midi_file = MIDIFile(nil)
+      timelines = [MTK::Events::Timeline.new]
       midi_file.should_receive(:write_timelines).with(timelines)
       midi_file.write(timelines)
     end

data/spec/mtk/{midi/output_spec.rb → io/midi_output_spec.rb}

@@ -1,9 +1,9 @@
 require 'spec_helper'
-require 'mtk/midi/output'
+require 'mtk/io/midi_output'
 
-describe MTK::MIDI::Output do
+describe MTK::IO::MIDIOutput do
 
-  class MockOuput < MTK::MIDI::Output
+  class MockOuput < MTK::IO::MIDIOutput
     public_class_method :new
   end
 
@@ -24,7 +24,7 @@ describe MTK::MIDI::Output do
 
   def timeline_with_param_event(event_type, event_options={})
     event = MTK::Events::Parameter.new event_type, event_options
-    MTK::Timeline.from_hash 0 => event
+     MTK::Events::Timeline.from_h 0 => event
   end
 
   def should_be_scheduled timed_data
@@ -51,7 +51,7 @@ describe MTK::MIDI::Output do
     it "handles note events" do
       should_be_scheduled 0 => [:note_on,  60, 127, 0],
                           1 => [:note_off, 60, 127, 0]
-      subject.play MTK::Timeline.from_hash( 0 => Note(C4,fff,1) )
+      subject.play  MTK::Events::Timeline.from_h( 0 => Note(C4,fff,1) )
     end
 
     it "handles control events" do
@@ -94,7 +94,7 @@ describe MTK::MIDI::Output do
                            1 => [:note_off, 60, 127, 0],
                            2 => [:note_on,  67, 127, 0],
                            3 => [:note_off, 67, 127, 0]
-      subject.play [MTK::Timeline.from_hash( 0 => Note(C4,fff,1) ), MTK::Timeline.from_hash( 2 => Note(G4,fff,1) )]
+      subject.play [ MTK::Events::Timeline.from_h( 0 => Note(C4,fff,1) ),  MTK::Events::Timeline.from_h( 2 => Note(G4,fff,1) )]
     end
 
   end

data/spec/mtk/{constants → lang}/durations_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe MTK::Constants::Durations do
+describe MTK::Lang::Durations do
 
   describe 'w' do
     it 'is 4 beats' do

data/spec/mtk/{constants → lang}/intensities_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
   
-describe MTK::Constants::Intensities do
+describe MTK::Lang::Intensities do
 
   describe 'ppp' do
     it 'is equivalent to MIDI velocity 16' do

data/spec/mtk/{constants → lang}/intervals_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
   
-describe MTK::Constants::Intervals do
+describe MTK::Lang::Intervals do
 
   describe 'P1' do
     it 'is 0 semitones' do

data/spec/mtk/lang/parser_spec.rb

@@ -23,7 +23,7 @@ describe MTK::Lang::Parser do
   end
 
   def var(name)
-    ::MTK::Variable.new(name)
+    ::MTK::Lang::Variable.new(name)
   end
 
 
@@ -33,6 +33,12 @@ describe MTK::Lang::Parser do
 
 
   describe ".parse" do
+    it "can parse a single pitch class and play it" do
+      sequencer = MTK::Lang::Parser.parse('c')
+      timeline = sequencer.to_timeline
+      timeline.should ==  MTK::Events::Timeline.from_h({0 => MTK.Note(C4)})
+    end
+
     context "default (root rule) behavior" do
       it "parses a bare_sequencer" do
         sequencer = parse('C:q:mp D4:ff A i:p Eb:pp Bb7 F2:h. F#4:mf:s q ppp')
@@ -52,7 +58,7 @@ describe MTK::Lang::Parser do
             0 => C4:mp:q
             1 => D4:o:h
           }
-        ").should == Timeline.from_hash({0 => chain(C4,mp,q), 1 => chain(D4,o,h)})
+        ").should ==  MTK::Events::Timeline.from_h({0 => chain(C4,mp,q), 1 => chain(D4,o,h)})
       end
 
       it "parses a chain of sequences" do
@@ -146,7 +152,7 @@ describe MTK::Lang::Parser do
 
     context "timeline rule" do
       it "parses a very simple Timeline" do
-        parse("{0 => C}", :timeline).should == Timeline.from_hash({0 => seq(C)})
+        parse("{0 => C}", :timeline).should ==  MTK::Events::Timeline.from_h({0 => seq(C)})
       end
 
       it "parses a Timeline with one entry" do
@@ -154,7 +160,7 @@ describe MTK::Lang::Parser do
           {
             0 => C4:mp:q
           }
-        ", :timeline).should == Timeline.from_hash({0 => chain(C4,mp,q)})
+        ", :timeline).should ==  MTK::Events::Timeline.from_h({0 => chain(C4,mp,q)})
       end
 
       it "parses a Timeline with multiple entries" do
@@ -163,7 +169,7 @@ describe MTK::Lang::Parser do
             0 => C4:mp:q
             1 => D4:o:h
           }
-        ", :timeline).should == Timeline.from_hash({0 => chain(C4,mp,q), 1 => chain(D4,o,h)})
+        ", :timeline).should ==  MTK::Events::Timeline.from_h({0 => chain(C4,mp,q), 1 => chain(D4,o,h)})
       end
 
       #it "parses a Timeline containing a chord" do
@@ -171,7 +177,7 @@ describe MTK::Lang::Parser do
       #    {
       #      0 => [C4 E4 G4]:fff:w
       #    }
-      #  ", :timeline).should == Timeline.from_hash({0 => chain(Chord(C4,E4,G4),fff,w)})
+      #  ", :timeline).should == Timeline.from_h({0 => chain(Chord(C4,E4,G4),fff,w)})
       #end
     end
 

data/spec/mtk/{constants → lang}/pitch_classes_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe MTK::Constants::PitchClasses do
+describe MTK::Lang::PitchClasses do
   let(:cases) {
     [
         [PitchClass['C'],  'C',   0],

data/spec/mtk/{constants → lang}/pitches_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe MTK::Constants::Pitches do
+describe MTK::Lang::Pitches do
 
   it "defines constants for the 128 notes in MIDI" do
     Pitches.constants.length.should == 130 # there's also the PITCHES and PITCH_NAMES constants

data/spec/mtk/{helpers → lang}/pseudo_constants_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe MTK::Helpers::PseudoConstants do
+describe MTK::Lang::PseudoConstants do
 
   module MockConstants
-    extend MTK::Helpers::PseudoConstants
+    extend MTK::Lang::PseudoConstants
     define_constant 'constant', :value
   end
 

data/spec/mtk/{variable_spec.rb → lang/variable_spec.rb}

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe MTK::Variable do
+describe MTK::Lang::Variable do
 
   def var(*args)
-    ::MTK::Variable.new(*args)
+    ::MTK::Lang::Variable.new(*args)
   end
 
   describe '#name' do
@@ -41,11 +41,11 @@ describe MTK::Variable do
 
   describe '#to_s' do
     it "includes just the variable name when there's no value" do
-      var('$').to_s.should == 'MTK::Variable<$>'
+      var('$').to_s.should == 'MTK::Lang::Variable<$>'
     end
 
     it "includes just the variable name and value when there's a value" do
-      var('x',1).to_s.should == 'MTK::Variable<x=1>'
+      var('x',1).to_s.should == 'MTK::Lang::Variable<x=1>'
     end
   end
 

data/spec/mtk/numeric_extensions_spec.rb

@@ -3,99 +3,79 @@ require 'mtk/numeric_extensions'
 
 describe Numeric do
 
-  describe '#semitones' do
-    it "is the Numeric value" do
-      100.semitones.should == 100
+  describe "#to_pitch" do
+    it "acts like Pitch.from_f applied to the Numeric value" do
+      12.3.to_pitch.should == MTK::Core::Pitch.from_f(12.3)
     end
   end
 
-  describe "#cents" do
-    it "is the Numeric / 100.0" do
-      100.cents.should == 1
-    end
-  end
 
-  describe "#minor_seconds" do
-    it "is the Numeric value" do
-      2.minor_seconds.should == 2
+  describe "#to_pitch_class" do
+    it "acts like PitchClass.from_f applied to the Numeric value" do
+      6.to_pitch_class.should == MTK::Core::PitchClass.from_f(6)
     end
   end
 
-  describe "#major_seconds" do
-    it "is the Numeric * 2" do
-      2.major_seconds.should == 4
-    end
-  end
 
-  describe "#minor_thirds" do
-    it "is the Numeric * 3" do
-      2.minor_thirds.should == 6
+  describe "#to_duration" do
+    it "acts like Duration.from_f applied to the Numeric value" do
+      1.5.to_duration.should == MTK::Core::Duration.from_f(1.5)
     end
   end
 
-  describe "#major_thirds" do
-    it "is the Numeric * 4" do
-      2.major_thirds.should == 8
+  describe "#beat" do
+    it "acts like #to_duration" do
+      1.beat.should == 1.to_duration
     end
   end
 
-  describe "#perfect_fourths" do
-    it "is the Numeric * 5" do
-      2.perfect_fourths.should == 10
+  describe "#beats" do
+    it "acts like #to_duration" do
+      2.beats.should == 2.to_duration
     end
   end
 
-  describe "#tritones" do
-    it "is the Numeric * 6" do
-      2.tritones.should == 12
-    end
-  end
 
-  describe "#augmented_fourths" do
-    it "is the Numeric * 6" do
-      2.augmented_fourths.should == 12
+  describe "#to_intensity" do
+    it "acts like Intensity.from_f applied to the Numeric value" do
+      0.75.to_intensity.should == MTK::Core::Intensity.from_f(0.75)
     end
   end
 
-  describe "#diminshed_fifths" do
-    it "is the Numeric * 6" do
-      2.diminshed_fifths.should == 12
+  describe "#percent_intensity" do
+    it "acts like Intensity.from_f applied to 1/100 of the Numeric value" do
+      75.percent_intensity.should == MTK::Core::Intensity.from_f(0.75)
     end
   end
 
-  describe "#perfect_fifths" do
-    it "is the Numeric * 7" do
-      2.perfect_fifths.should == 14
-    end
-  end
 
-  describe "#minor_sixths" do
-    it "is the Numeric * 8" do
-      2.minor_sixths.should == 16
+  describe "#to_interval" do
+    it "acts like Interval.from_f applied to the Numeric value" do
+      3.5.to_interval.should == MTK::Core::Interval.from_f(3.5)
     end
   end
 
-  describe "#major_sixths" do
-    it "is the Numeric * 9" do
-      2.major_sixths.should == 18
+  describe '#semitone' do
+    it "acts like #to_interval" do
+      1.semitone.should == 1.to_interval
     end
   end
 
-  describe "#minor_sevenths" do
-    it "is the Numeric * 10" do
-      2.minor_sevenths.should == 20
+  describe '#semitones' do
+    it "acts like #to_interval" do
+      2.semitones.should == 2.to_interval
     end
   end
 
-  describe "#major_sevenths" do
-    it "is the Numeric * 11" do
-      2.major_sevenths.should == 22
+  describe "#cents" do
+    it "acts like Interval.from_f applied to 1/100 of the Numeric value" do
+      50.cents.should == MTK::Core::Interval.from_f(0.5)
     end
   end
 
   describe "#octaves" do
-    it "is the Numeric * 12" do
-      2.octaves.should == 24
+    it "acts like Interval.from_f applied to 12 times the Numeric value" do
+      2.octaves.should == MTK::Core::Interval.from_f(24)
     end
   end
 

data/spec/mtk/patterns/for_each_spec.rb

@@ -5,7 +5,7 @@ describe MTK::Patterns::ForEach do
   FOREACH = ::MTK::Patterns::ForEach
 
   def var(name)
-    ::MTK::Variable.new(name)
+    ::MTK::Lang::Variable.new(name)
   end
 
   def seq(*args)

data/spec/mtk/patterns/sequence_spec.rb

@@ -8,7 +8,7 @@ describe MTK::Patterns::Sequence do
   let(:sequence) { SEQUENCE.new(elements) }
 
   it "is a MTK::Collection" do
-    sequence.should be_a MTK::Helpers::Collection
+    sequence.should be_a MTK::Groups::Collection
     # and now we won't test any other collection features here... see collection_spec
   end
 

data/spec/mtk/sequencers/legato_sequencer_spec.rb

@@ -12,7 +12,7 @@ describe MTK::Sequencers::LegatoSequencer do
 
   describe "#to_timeline" do
     it "contains notes assembled from the given patterns, with Timeline time deltas from the max event duration at the previous step" do
-      legato_sequencer.to_timeline.should == Timeline.from_hash({
+      legato_sequencer.to_timeline.should ==  MTK::Events::Timeline.from_h({
         0   => Note(C4,1,0.3),
         1.0 => Note(D4,0.5,0.6),
         1.5 => Note(E4,1.5,0.9),
@@ -22,7 +22,7 @@ describe MTK::Sequencers::LegatoSequencer do
 
     it "treats negative durations as rests" do
       legato_sequencer = LEGATO_SEQUENCER.new( [pitches, Patterns.DurationSequence(-1,-0.5,-1.5,4), intensities] )
-      legato_sequencer.to_timeline.should == Timeline.from_hash({
+      legato_sequencer.to_timeline.should ==  MTK::Events::Timeline.from_h({
         3.0 => Note(C4,4,1.0)
       })
     end

data/spec/mtk/sequencers/rhythmic_sequencer_spec.rb

@@ -23,11 +23,11 @@ describe MTK::Sequencers::RhythmicSequencer do
 
   describe "#to_timeline" do
     it "returns a Timeline" do
-      rhythmic_sequencer.to_timeline.should be_a Timeline
+      rhythmic_sequencer.to_timeline.should be_a  MTK::Events::Timeline
     end
 
     it "contains notes assembled from the given patterns, with Timeline time deltas from the :rhythm type pattern" do
-      rhythmic_sequencer.to_timeline.should == Timeline.from_hash({
+      rhythmic_sequencer.to_timeline.should ==  MTK::Events::Timeline.from_h({
         0 =>   Note(C4,1,0.3),
         0.5 => Note(D4,1,0.6),
         2.0 => Note(E4,2,0.9),
@@ -38,7 +38,7 @@ describe MTK::Sequencers::RhythmicSequencer do
 
     it "uses the absolute value of any negative durations in the rhythm pattern" do
       timeline = RHYTHMIC_SEQUENCER.new( [pitches, intensities, durations], rhythm: Patterns.RhythmSequence(-0.5, 1.5, -4) ).to_timeline
-      timeline.should == Timeline.from_hash({
+      timeline.should ==  MTK::Events::Timeline.from_h({
         0 =>   Note(C4,1,0.3),
         0.5 => Note(D4,1,0.6),
         2.0 => Note(E4,2,0.9),
@@ -50,7 +50,7 @@ describe MTK::Sequencers::RhythmicSequencer do
   describe "#max_steps" do
     it "controls the maximum number of times in the generated timeline" do
       rhythmic_sequencer.max_steps = 2
-      rhythmic_sequencer.to_timeline.should == Timeline.from_hash({
+      rhythmic_sequencer.to_timeline.should ==  MTK::Events::Timeline.from_h({
         0   => Note(C4,1,0.3),
         0.5 => Note(D4,1,0.6)
       })

data/spec/mtk/sequencers/step_sequencer_spec.rb

@@ -32,12 +32,12 @@ describe MTK::Sequencers::StepSequencer do
   describe "#to_timeline" do
     it "returns a Timeline" do
       timeline = step_sequencer.to_timeline
-      timeline.should be_a Timeline
+      timeline.should be_a  MTK::Events::Timeline
     end
 
     it "contains notes assembled from the given patterns" do
       timeline = step_sequencer.to_timeline
-      timeline.should == Timeline.from_hash({
+      timeline.should ==  MTK::Events::Timeline.from_h({
         0 => Note(C4,1,0.3),
         1 => Note(D4,1,0.7),
         2 => Note(E4,2,1.0)
@@ -46,7 +46,7 @@ describe MTK::Sequencers::StepSequencer do
 
     it "treats negative durations as rests" do
       timeline = STEP_SEQUENCER.new( [pitches, intensities, Patterns.DurationSequence(1, -1, 2)] ).to_timeline
-      timeline.should == Timeline.from_hash({
+      timeline.should ==  MTK::Events::Timeline.from_h({
         0 => Note(C4,1,0.3),
         2 => Note(E4,2,1.0)
       })
@@ -57,7 +57,7 @@ describe MTK::Sequencers::StepSequencer do
     it "controls the delta between each time in the generated timeline" do
       step_sequencer.step_size = 2
       timeline = step_sequencer.to_timeline
-      timeline.should == Timeline.from_hash({
+      timeline.should ==  MTK::Events::Timeline.from_h({
         0 => Note(C4,1,0.3),
         2 => Note(D4,1,0.7),
         4 => Note(E4,2,1.0)
@@ -69,7 +69,7 @@ describe MTK::Sequencers::StepSequencer do
     it "controls the maximum number of times in the generated timeline" do
       step_sequencer.max_steps = 2
       timeline = step_sequencer.to_timeline
-      timeline.should == Timeline.from_hash({
+      timeline.should ==  MTK::Events::Timeline.from_h({
         0 => Note(C4,1,0.3),
         1 => Note(D4,1,0.7)
       })

data/spec/spec_helper.rb

@@ -2,10 +2,11 @@ $__RUNNING_RSPEC_TESTS__ = true
 
 require 'mtk'
 include MTK
-include Constants
-include PitchClasses
-include Pitches
-include Intensities
-include Durations
-include Intervals
+include MTK::Core
+include MTK::Lang
+include MTK::Lang::PitchClasses
+include MTK::Lang::Pitches
+include MTK::Lang::Intensities
+include MTK::Lang::Durations
+include MTK::Lang::Intervals