music-transcription 0.3.0 → 0.4.0

data/lib/music-transcription/version.rb

@@ -2,6 +2,6 @@
 module Music
 module Transcription
   # music-transcription version
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end
 end

data/music-transcription.gemspec

@@ -13,23 +13,18 @@ a common representation enables composition and performance.
 DESCRIPTION
   gem.license       = "MIT"
   gem.authors       = ["James Tunnell"]
-  gem.email         = "jamestunnell@lavabit.com"
+  gem.email         = "jamestunnell@gmail.com"
   gem.homepage      = "https://github.com/jamestunnell/music-transcription"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
-
-  gem.add_dependency 'hashmake'
-  # gem.add_dependency 'spnet'
-  # gem.add_dependency 'spcore'
-  # gem.add_dependency 'micro-optparse'
-  # gem.add_dependency 'wavefile'
   
-  gem.add_development_dependency 'bundler', '~> 1.0'
-  gem.add_development_dependency 'rake', '~> 0.8'
-  gem.add_development_dependency 'rspec', '~> 2.4'
+  gem.add_development_dependency 'bundler', '~> 1.5'
+  gem.add_development_dependency 'rubygems-bundler', '~> 1.4'
+  gem.add_development_dependency 'rake', '~> 10.1'
+  gem.add_development_dependency 'rspec', '~> 2.14'
   gem.add_development_dependency 'yard', '~> 0.8'
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'pry-nav'

data/spec/link_spec.rb

@@ -2,21 +2,25 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe Link do
   context '.new' do
-    its(:relationship) { should eq(Link::RELATIONSHIP_NONE) }
-    its(:target_pitch) { should eq(Pitch.new) }
+    it 'should assign the given pitch to :target_pitch' do
+      Link.new(C2).target_pitch.should eq(C2)
+    end
   end
     
-  it 'should assign the given relationship' do
-    Link::RELATIONSHIPS.each do |relationship|
-      link = Link.new(:relationship => relationship)
-      link.relationship.should eq(relationship)
+  describe '==' do
+    it 'should return true if two links have the same target pitch' do
+      Link.new(C2).should eq(Link.new(C2))
+    end
+    
+    it 'should return false if two links do not have the same target pitch' do
+      Link.new(C2).should_not eq(Link.new(F5))
     end
   end
   
-  it 'should assign the given target pitch' do
-    [A0, B0].each do |pitch|
-      link = Link.new(:target_pitch => pitch)
-      link.target_pitch.should eq(pitch)
+  describe 'clone' do
+    it 'should return a link with the same target pitch' do
+      l = Link.new(C4)
+      l.clone.should eq(l)
     end
   end
 end

data/spec/note_spec.rb

@@ -7,59 +7,32 @@ describe Note do
   
   context '.new' do
     it 'should assign :duration that is given during construction' do
-      note = Note.new :duration => 2
+      note = Note.new 2
       note.duration.should eq(2)
     end
     
-    it "should assign :sustain, :attack, and :separation parameters if given during construction" do
-      note = Note.new :duration => 2, :sustain => 0.1, :attack => 0.2, :separation => 0.3
-      note.sustain.should eq(0.1)
-      note.attack.should eq(0.2)
-      note.separation.should eq(0.3)
+    it "should assign :accent parameter if given during construction" do
+      note = Note.new 2, accent: Accent::Stacatto.new
+      note.accent.class.should eq(Accent::Stacatto)
     end
     
-    it 'should have no intervals if not given' do
-      Note.new(:duration => 2).intervals.should be_empty
+    it 'should have no pitches if not given' do
+      Note.new(2).pitches.should be_empty
     end
     
-    it 'should assign intervals when given' do
-      intervals = [
-        Interval.new(:pitch => C2),
-        Interval.new(:pitch => D2),
-      ]
-      Note.new(:duration => 2, :intervals => intervals).intervals.should eq(intervals)
+    it 'should assign pitches when given' do
+      pitches = [ C2, D2 ]
+      n = Note.new(2, pitches)
+      n.pitches.should include(pitches[0])
+      n.pitches.should include(pitches[1])
     end
   end
   
   context '#duration=' do
     it 'should assign duration' do
-      note = Note.new :pitch => @pitch, :duration => 2
+      note = Note.new 2, [@pitch]
       note.duration = 3
       note.duration.should eq 3
     end
-  end
-  
-  context '#sustain=' do
-    it "should assign sustain" do
-      note = Note.new :pitch => @pitch, :duration => 2
-      note.sustain = 0.123
-      note.sustain.should eq 0.123
-    end
-  end
-
-  context '#attack=' do
-    it "should assign attack" do
-      note = Note.new :pitch => @pitch, :duration => 2
-      note.attack = 0.123
-      note.attack.should eq 0.123
-    end
-  end
-  
-  context '#separation=' do
-    it "should assign separation" do
-      note = Note.new :pitch => @pitch, :duration => 2
-      note.separation = 0.123
-      note.separation.should eq 0.123
-    end
-  end
+  end  
 end

data/spec/part_spec.rb

@@ -2,86 +2,18 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe Part do
   context '.new' do
-    its(:offset) { should eq(0) }
     its(:notes) { should be_empty }
     
     it "should assign loudness_profile profile given during construction" do
-      loudness_profile = Profile.new(
-        :start_value => 0.5,
-        :value_changes => {
-          1.0 => linear_change(1.0, 2.0)
-        }
-      )
-      part = Part.new :loudness_profile => loudness_profile
+      loudness_profile = Profile.new(0.5, 1.0 => linear_change(1.0, 2.0))
+      part = Part.new loudness_profile: loudness_profile
       part.loudness_profile.should eq(loudness_profile)
     end  
     
     it "should assign notes given during construction" do
-      notes = [
-        Note.new(
-          :duration => 0.25,
-          :intervals => [
-            Interval.new(:pitch => C1),
-            Interval.new(:pitch => D1),
-          ]
-        )
-      ]
-      
-      part = Part.new :notes => notes
+      notes = [ Note.new(0.25, [C1,D1]) ]
+      part = Part.new notes: notes
       part.notes.should eq(notes)
     end
   end  
 end
-
-describe PartFile do
-  describe '.new' do
-    before :all do
-      @part_hash = {
-        :notes => [
-          Note.new(
-            :duration => 0.25,
-            :intervals => [
-              Interval.new(:pitch => C1),
-              Interval.new(:pitch => D1) ]
-          ),
-          Note.new(
-            :duration => 0.125,
-            :intervals => [
-              Interval.new(:pitch => E2) ]
-          ),
-        ],
-        :loudness_profile => Profile.new(
-          :start_value => 0.6
-        )
-      }
-      
-      @path = 'temp.yml'
-    end
-    
-    context 'hash of part stored in YAML file' do
-      it 'should load part from file' do
-        File.open(@path, 'w') do |file|
-          file.write @part_hash.to_yaml
-        end
-        part = Part.new @part_hash
-        part_from_file = PartFile.new(:file_path => @path)
-        part_from_file.should eq part
-      end
-    end
-
-    context 'part stored in YAML file' do
-      it 'should load part from file' do
-        part = Part.new @part_hash
-        File.open(@path, 'w') do |file|
-          file.write part.to_yaml
-        end
-        part_from_file = PartFile.new(:file_path => @path)
-        part_from_file.should eq part
-      end
-    end
-    
-    after :all do
-      File.delete @path
-    end
-  end
-end

data/spec/pitch_spec.rb

@@ -5,17 +5,17 @@ describe Pitch do
   before :each do
     @cases = 
     [
-      { :octave => 1, :semitone => 0, :cent => 0, :ratio => 2.0, :total_cent => 1200 },
-      { :octave => 2, :semitone => 0, :cent => 0, :ratio => 4.0, :total_cent => 2400 },
-      { :octave => 1, :semitone => 6, :cent => 0, :ratio => 2.8284, :total_cent => 1800 },
-      { :octave => 2, :semitone => 6, :cent => 0, :ratio => 5.6569, :total_cent => 3000 },
-      { :octave => 1, :semitone => 6, :cent => 20, :ratio => 2.8613, :total_cent => 1820 },
-      { :octave => 2, :semitone => 6, :cent => 20, :ratio => 5.7226, :total_cent => 3020 },
-      { :octave => 3, :semitone => 7, :cent => 77, :ratio => 12.5316, :total_cent => 4377 },
-      { :octave => -1, :semitone => 0, :cent => 0, :ratio => 0.5, :total_cent => -1200 },
-      { :octave => -2, :semitone => 0, :cent => 0, :ratio => 0.25, :total_cent => -2400 },
-      { :octave => -2, :semitone => 7, :cent => 55, :ratio => 0.3867, :total_cent => -1645 },
-      { :octave => -1, :semitone => 9, :cent => 23, :ratio => 0.8521, :total_cent => -277 },
+      { octave: 1, semitone: 0, cent: 0, :ratio => 2.0, :total_cent => 1200 },
+      { octave: 2, semitone: 0, cent: 0, :ratio => 4.0, :total_cent => 2400 },
+      { octave: 1, semitone: 6, cent: 0, :ratio => 2.8284, :total_cent => 1800 },
+      { octave: 2, semitone: 6, cent: 0, :ratio => 5.6569, :total_cent => 3000 },
+      { octave: 1, semitone: 6, cent: 20, :ratio => 2.8613, :total_cent => 1820 },
+      { octave: 2, semitone: 6, cent: 20, :ratio => 5.7226, :total_cent => 3020 },
+      { octave: 3, semitone: 7, cent: 77, :ratio => 12.5316, :total_cent => 4377 },
+      { octave: -1, semitone: 0, cent: 0, :ratio => 0.5, :total_cent => -1200 },
+      { octave: -2, semitone: 0, cent: 0, :ratio => 0.25, :total_cent => -2400 },
+      { octave: -2, semitone: 7, cent: 55, :ratio => 0.3867, :total_cent => -1645 },
+      { octave: -1, semitone: 9, cent: 23, :ratio => 0.8521, :total_cent => -277 },
     ]
   end
   
@@ -24,7 +24,7 @@ describe Pitch do
   end
   
   it "should be hash-makeable" do
-    obj = Pitch.new :octave => 4, :semitone => 3
+    obj = Pitch.new octave: 4, semitone: 3
     obj.octave.should eq(4)
     obj.semitone.should eq(3)
     obj.cent.should eq(0)
@@ -38,7 +38,7 @@ describe Pitch do
   
   it "should use the octave, semitone, and cent given during construction" do
     @cases.each do |case_data|
-      p = Pitch.new :octave => case_data[:octave], :semitone => case_data[:semitone], :cent => case_data[:cent]
+      p = Pitch.new octave: case_data[:octave], semitone: case_data[:semitone], cent: case_data[:cent]
       p.ratio.should be_within(0.01).of case_data[:ratio]
       p.total_cent.should be case_data[:total_cent]
     end
@@ -69,13 +69,13 @@ describe Pitch do
   end
   
   it "should be comparable to other pitches" do
-    p1 = Pitch.new :semitone => 1
-    p2 = Pitch.new :semitone => 2
-    p3 = Pitch.new :semitone => 3
+    p1 = Pitch.new semitone: 1
+    p2 = Pitch.new semitone: 2
+    p3 = Pitch.new semitone: 3
 
-    p1.should eq(Pitch.new :semitone => 1)
-    p2.should eq(Pitch.new :semitone => 2)
-    p3.should eq(Pitch.new :semitone => 3)
+    p1.should eq(Pitch.new semitone: 1)
+    p2.should eq(Pitch.new semitone: 2)
+    p3.should eq(Pitch.new semitone: 3)
     
     p1.should be < p2
     p1.should be < p3
@@ -86,36 +86,36 @@ describe Pitch do
   end
 
   it "should be addable and subtractable with other pitches" do
-    p1 = Pitch.new :semitone => 1
-    p2 = Pitch.new :semitone => 2
-    p3 = Pitch.new :semitone => 3
+    p1 = Pitch.new semitone: 1
+    p2 = Pitch.new semitone: 2
+    p3 = Pitch.new semitone: 3
     
-    (p1 + p2).should eq(Pitch.new :semitone => 3) 
-    (p1 + p3).should eq(Pitch.new :semitone => 4)
-    (p2 + p3).should eq(Pitch.new :semitone => 5)
+    (p1 + p2).should eq(Pitch.new semitone: 3) 
+    (p1 + p3).should eq(Pitch.new semitone: 4)
+    (p2 + p3).should eq(Pitch.new semitone: 5)
     
-    (p1 - p2).should eq(Pitch.new :semitone => -1) 
-    (p1 - p3).should eq(Pitch.new :semitone => -2)
-    (p2 - p3).should eq(Pitch.new :semitone => -1)
-    (p3 - p2).should eq(Pitch.new :semitone => 1)
-    (p3 - p1).should eq(Pitch.new :semitone => 2)
+    (p1 - p2).should eq(Pitch.new semitone: -1) 
+    (p1 - p3).should eq(Pitch.new semitone: -2)
+    (p2 - p3).should eq(Pitch.new semitone: -1)
+    (p3 - p2).should eq(Pitch.new semitone: 1)
+    (p3 - p1).should eq(Pitch.new semitone: 2)
   end
   
   it "should have freq of 440 for A4" do
-    a4 = Pitch.new :octave => 4, :semitone => 9
+    a4 = Pitch.new octave: 4, semitone: 9
     a4.freq.should be_within(0.01).of(440.0)
   end
   
   context 'String#to_pitch' do
     it 'should create a Pitch object that matches the musical note' do
       {
-	"Ab2" => Pitch.new(:octave => 2, :semitone => 8),
-	"C0" => Pitch.new(:octave => 0, :semitone => 0),
-	"db4" => Pitch.new(:octave => 4, :semitone => 1),
-	"F#12" => Pitch.new(:octave => 12, :semitone => 6),
-	"E#7" => Pitch.new(:octave => 7, :semitone => 5),
-	"G9" => Pitch.new(:octave => 9, :semitone => 7),
-	"Bb10" => Pitch.new(:octave => 10, :semitone => 10),
+	"Ab2" => Pitch.new(octave: 2, semitone: 8),
+	"C0" => Pitch.new(octave: 0, semitone: 0),
+	"db4" => Pitch.new(octave: 4, semitone: 1),
+	"F#12" => Pitch.new(octave: 12, semitone: 6),
+	"E#7" => Pitch.new(octave: 7, semitone: 5),
+	"G9" => Pitch.new(octave: 9, semitone: 7),
+	"Bb10" => Pitch.new(octave: 10, semitone: 10),
       }.each do |str, expected_pitch|
 	str.to_pitch.should eq(expected_pitch)
       end
@@ -124,7 +124,7 @@ describe Pitch do
   
   context '.make_from_freq' do
     it 'should make a pitch whose freq is approximately the given freq' do
-      one_cent = Pitch.new(:cent => 1)
+      one_cent = Pitch.new(cent: 1)
       [1.0, 25.0, 200.0, 3500.0].each do |given_freq|
 	pitch = Pitch.make_from_freq given_freq
 	freq = pitch.freq

data/spec/profile_spec.rb

@@ -4,17 +4,14 @@ describe Profile do
   
   context '.new' do
     it "should assign start value given during construction" do
-      p = Profile.new(:start_value => 0.2)
+      p = Profile.new(0.2)
       p.start_value.should eq(0.2)
     end
     
     it "should assign settings given during construction" do
-      p = Profile.new(
-        :start_value => 0.2,
-        :value_changes => {
-          1.0 => ValueChange.new(:value => 0.5),
-          1.5 => ValueChange.new(:value => 1.0)
-        }
+      p = Profile.new(0.2,
+        1.0 => ValueChange.new(0.5),
+        1.5 => ValueChange.new(1.0)
       )
       p.value_changes[1.0].value.should eq(0.5)
       p.value_changes[1.5].value.should eq(1.0)

data/spec/program_spec.rb

@@ -4,14 +4,14 @@ describe Program do
   
   it "should assign the segments given during initialization" do
     segments = [ 0.0...5.0, 0.0...4.0, 5.0...10.0 ]
-    program = Program.new :segments => segments
+    program = Program.new segments
     program.segments.should eq(segments.clone)
   end
   
   describe "#include?" do
     it "should return true for any offset which would be encountered" do
       segments = [ 0.0...5.0, 0.0...4.0, 5.0...10.0 ]
-      program = Program.new :segments => segments
+      program = Program.new segments
       
       [0.0, 4.0, 5.0, 9.999].each do |offset|
         program.include?(offset).should be_true
@@ -20,7 +20,7 @@ describe Program do
 
     it "should return false for any offset which would not be encountered" do
       segments = [ 0.0...5.0, 0.0...4.0, 5.0...10.0 ]
-      program = Program.new :segments => segments
+      program = Program.new segments
       
       [-0.000001, 10.000001].each do |offset|
         program.include?(offset).should be_false
@@ -31,15 +31,15 @@ describe Program do
   describe "#note_elapsed_at" do
     before :each do
       segments = [ 0.0...5.0, 0.0...4.0, 5.0..10.0 ]
-      @program = Program.new :segments => segments
+      @program = Program.new segments
     end
 
     it "should return 0.0 at program start" do
-      @program.note_elapsed_at(@program.start).should eq(0.0)
+      @program.note_elapsed_at(@program.segments.first.first).should eq(0.0)
     end
 
     it "should return program length at program stop" do
-      @program.note_elapsed_at(@program.stop).should eq(@program.length)
+      @program.note_elapsed_at(@program.segments.last.last).should eq(@program.length)
     end
 
     it "should return correct note elapsed for any included offset" do

data/spec/score_spec.rb

@@ -1,14 +1,14 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe Score do
+describe TimeScore do
   before :each do
     @parts = { "piano (LH)" => Samples::SAMPLE_PART }
-    @program = Program.new :segments => [0...0.75, 0...0.75]
+    @program = Program.new [0...0.75, 0...0.75]
   end
   
   describe '.new' do
     context "no args given" do
-      let(:score) { Score.new }
+      let(:score) { TimeScore.new }
       subject { score }
       its(:program) { should eq(Program.new) }
       its(:parts) { should be_empty }
@@ -16,12 +16,12 @@ describe Score do
     
     context 'args given' do
       it "should assign parts given during construction" do
-        score = Score.new :program => @program, :parts => @parts
+        score = TimeScore.new :program => @program, :parts => @parts
         score.parts.should eq(@parts)
       end
       
       it "should assign program given during construction" do
-        score = Score.new :program => @program
+        score = TimeScore.new :program => @program
         score.program.should eq(@program)
       end      
     end
@@ -31,23 +31,18 @@ end
 describe TempoScore do
   before :each do
     @parts = { "piano (LH)" => Samples::SAMPLE_PART }
-    @program = Program.new :segments => [0...0.75, 0...0.75]
-    @tempo_profile = Profile.new(
-      :start_value => tempo(120),
-      :value_changes => {
-        0.5 => linear_change(tempo(60), 0.25)
-      }
-    )
+    @program = Program.new [0...0.75, 0...0.75]
+    @tempo_profile = Profile.new(Tempo.new(120), 0.5 => linear_change(Tempo.new(60), 0.25))
   end
   
   describe '.new' do
     it "should assign tempo profile given during construction" do
-      score = TempoScore.new :tempo_profile => @tempo_profile
+      score = TempoScore.new @tempo_profile
       score.tempo_profile.should eq(@tempo_profile)
     end
     
     it "should assign part and program given during construction" do
-      score = TempoScore.new :tempo_profile => @tempo_profile, :parts => @parts, :program => @program
+      score = TempoScore.new @tempo_profile, parts: @parts, program: @program
       score.parts.should eq(@parts)
       score.program.should eq(@program)
     end