music-transcription 0.17.1 → 0.19.0

data/lib/music-transcription/parsing/tempo_parsing.treetop

@@ -0,0 +1,49 @@
+module Music
+module Transcription
+module Parsing
+
+grammar Tempo
+  include PositiveInteger
+  include PositiveFloat
+  include PositiveRational
+  
+  rule tempo
+    tempo_bpm / tempo_qnpm / tempo_npm / tempo_nps
+  end
+  
+  rule tempo_bpm
+    val:positive_number ("bpm" / "BPM") {
+      def to_tempo
+        Music::Transcription::Tempo::BPM.new(val.to_num)
+      end }
+  end
+
+  rule tempo_qnpm
+    val:positive_number ("qnpm" / "QNPM") {
+      def to_tempo
+        Music::Transcription::Tempo::QNPM.new(val.to_num)
+      end }
+  end
+
+  rule tempo_npm
+    val:positive_number ("npm" / "NPM") {
+      def to_tempo
+        Music::Transcription::Tempo::NPM.new(val.to_num)
+      end }
+  end
+
+  rule tempo_nps
+    val:positive_number ("nps" / "NPS") {
+      def to_tempo
+        Music::Transcription::Tempo::NPS.new(val.to_num)
+      end }
+  end
+  
+  rule positive_number
+    positive_float / positive_rational / positive_integer
+  end
+end
+
+end
+end
+end

data/lib/music-transcription/validatable.rb

@@ -3,19 +3,8 @@
 module Validatable
   attr_reader :errors
   
-  def check_methods
-    if instance_variable_defined?(:@check_methods)
-      methods = instance_variable_get(:@check_methods)
-    else
-      methods = []
-    end
-    
-    if self.class.class_variable_defined?(:@@check_methods)
-      methods += self.class.class_variable_get(:@@check_methods)
-    end
-    
-    return methods
-  end
+  def check_methods; []; end
+  def validatables; []; end
   
   def validate
     @errors = []
@@ -30,16 +19,14 @@ module Validatable
     end
     
     validatables.each do |v|
-      @errors += v.validate
+      if v.respond_to?(:validate)
+        @errors += v.validate
+      end
     end
     
     return @errors
   end
   
-  def validatables
-    []
-  end
-  
   def valid?
     self.validate
     @errors.empty?

data/lib/music-transcription/version.rb

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

data/spec/model/measure_score_spec.rb

@@ -0,0 +1,85 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe MeasureScore do
+  describe '#initialize' do
+    it 'should use empty containers for parameters not given' do
+      s = MeasureScore.new(FOUR_FOUR,120)
+      s.parts.should be_empty
+      s.program.segments.should be_empty
+    end
+    
+    it 'should assign given parameters' do
+      m = FOUR_FOUR
+      s = MeasureScore.new(m,120)
+      s.start_meter.should eq m
+      s.start_tempo.should eq 120
+      
+      parts = { "piano (LH)" => Samples::SAMPLE_PART }
+      program = Program.new [0...0.75, 0...0.75]
+      mcs = { 1 => Change::Immediate.new(THREE_FOUR) }
+      tcs = { 1 => Change::Immediate.new(100) }
+      
+      s = MeasureScore.new(m,120,
+        parts: parts,
+        program: program,
+        meter_changes: mcs,
+        tempo_changes: tcs
+      )
+      s.parts.should eq parts
+      s.program.should eq program
+      s.meter_changes.should eq mcs
+      s.tempo_changes.should eq tcs
+    end
+  end
+  
+  describe '#valid?' do
+    {
+      'QNPM start tempo' => [ FOUR_FOUR, Tempo::QNPM.new(40) ],
+      'NPM start tempo' => [ FOUR_FOUR, Tempo::NPM.new(40) ],
+      'NPS start tempo' => [ FOUR_FOUR, Tempo::NPS.new(40) ],
+      'BPM start tempo' => [ FOUR_FOUR, Tempo::BPM.new(40) ],
+      'QNPM tempo changes' => [ FOUR_FOUR, Tempo::BPM.new(30),
+        :tempo_changes => { 1 => Change::Gradual.new(Tempo::QNPM.new(40), 2), 2 => Change::Immediate.new(Tempo::QNPM.new(50)) } ],
+      'NPM tempo changes' => [ FOUR_FOUR, Tempo::BPM.new(30),
+        :tempo_changes => { 1 => Change::Gradual.new(Tempo::NPM.new(40), 2), 2 => Change::Immediate.new(Tempo::QNPM.new(50)) } ],
+      'NPS tempo changes' => [ FOUR_FOUR, Tempo::BPM.new(30),
+        :tempo_changes => { 1 => Change::Gradual.new(Tempo::NPS.new(40), 2), 2 => Change::Immediate.new(Tempo::QNPM.new(50)) } ],
+      'BPM tempo changes' => [ FOUR_FOUR, Tempo::BPM.new(30),
+        :tempo_changes => { 1 => Change::Gradual.new(Tempo::BPM.new(40), 2), 2 => Change::Immediate.new(Tempo::QNPM.new(50)) } ],
+      'valid meter changes' => [ FOUR_FOUR, Tempo::BPM.new(120),
+        :meter_changes => { 1 => Change::Immediate.new(TWO_FOUR) } ],
+      'valid tempo changes' => [ FOUR_FOUR, Tempo::BPM.new(120),
+        :tempo_changes => { 1 => Change::Gradual.new(Tempo::BPM.new(200), 2), 2 => Change::Immediate.new(Tempo::BPM.new(300)) } ],
+      'valid part' => [ FOUR_FOUR, Tempo::BPM.new(120), :parts => { "piano" => Samples::SAMPLE_PART }],
+      'valid program' => [ FOUR_FOUR, Tempo::BPM.new(120), :program => Program.new([0..2,0..2]) ]
+    }.each do |context_str,args|
+      context context_str do
+        it 'should return true' do
+          MeasureScore.new(*args).should be_valid
+        end
+      end
+    end
+    
+    {
+      'start tempo object is not a Tempo object' => [ FOUR_FOUR, 120],
+      'invalid start meter' => [ Meter.new(-1,"1/4".to_r), Tempo::BPM.new(120)],
+      'non-meter start meter' => [ 1, Tempo::BPM.new(120)],
+      'invalid meter in change' => [ FOUR_FOUR, Tempo::BPM.new(120),
+        :meter_changes => { 1 => Change::Immediate.new(Meter.new(-2,"1/4".to_r)) } ],
+      'non-meter values in meter changes' => [ FOUR_FOUR, Tempo::BPM.new(120),
+        :meter_changes => { 1 => Change::Immediate.new(5) } ],
+      'non-immediate meter change' => [ FOUR_FOUR, Tempo::BPM.new(120),
+        :meter_changes => { 1 => Change::Gradual.new(TWO_FOUR,1) } ],
+      'tempo change value is not a Tempo object' => [ FOUR_FOUR, Tempo::QNPM.new(120),
+        :tempo_changes => { 1 => Change::Gradual.new(140,1) } ],
+      'invalid part' => [ FOUR_FOUR, 120, :parts => { "piano" => Part.new(-0.1) }],
+      'invalid program' => [ FOUR_FOUR, 120, :program => Program.new([2..0]) ],
+    }.each do |context_str,args|
+      context context_str do
+        it 'should return false' do
+          MeasureScore.new(*args).should be_invalid
+        end
+      end      
+    end
+  end
+end

data/spec/model/note_score_spec.rb

@@ -0,0 +1,68 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe NoteScore do
+  describe '#initialize' do
+    it 'should use empty containers for parameters not given' do
+      s = NoteScore.new(Tempo::QNPM.new(30))
+      s.parts.should be_empty
+      s.program.segments.should be_empty
+    end
+    
+    it 'should assign given parameters' do
+      s = NoteScore.new(Tempo::QNPM.new(30))
+      s.start_tempo.should eq Tempo::QNPM.new(30)
+      
+      parts = { "piano (LH)" => Samples::SAMPLE_PART }
+      program = Program.new [0...0.75, 0...0.75]
+      tcs = { 1 => Change::Immediate.new(Tempo::QNPM.new(40)) }
+      
+      s = NoteScore.new(Tempo::QNPM.new(30),
+        parts: parts,
+        program: program,
+        tempo_changes: tcs
+      )
+      s.parts.should eq parts
+      s.program.should eq program
+      s.tempo_changes.should eq tcs
+    end
+  end
+  
+  describe '#valid?' do
+    {
+      'QNPM start tempo' => [ Tempo::QNPM.new(40) ],
+      'NPM start tempo' => [ Tempo::NPM.new(40) ],
+      'NPS start tempo' => [ Tempo::NPS.new(40) ],
+      'QNPM tempo changes' => [ Tempo::QNPM.new(30),
+        :tempo_changes => { 1 => Change::Gradual.new(Tempo::QNPM.new(40), 2), 2 => Change::Immediate.new(Tempo::QNPM.new(50)) } ],
+      'NPM tempo changes' => [ Tempo::NPM.new(30),
+        :tempo_changes => { 1 => Change::Gradual.new(Tempo::NPM.new(40), 2), 2 => Change::Immediate.new(Tempo::QNPM.new(50)) } ],
+      'NPS tempo changes' => [ Tempo::NPS.new(30),
+        :tempo_changes => { 1 => Change::Gradual.new(Tempo::NPS.new(40), 2), 2 => Change::Immediate.new(Tempo::QNPM.new(50)) } ],
+      'valid part' => [ Tempo::QNPM.new(30), :parts => { "piano" => Samples::SAMPLE_PART }],
+      'valid program' => [ Tempo::QNPM.new(30), :program => Program.new([0..2,0..2]) ]
+    }.each do |context_str,args|
+      context context_str do
+        it 'should return true' do
+          NoteScore.new(*args).should be_valid
+        end
+      end
+    end
+    
+    {
+      'start tempo object is not a Tempo object' => [ 30],
+      'start tempo object is not a valid Tempo type' => [ Tempo::BPM.new(120)],
+      'tempo change value is not a Tempo object' => [ Tempo::QNPM.new(30),
+        :tempo_changes => { 1 => Change::Gradual.new(30,1) } ],
+      'tempo change value is not a valid Tempo type' => [ Tempo::QNPM.new(30),
+        :tempo_changes => { 1 => Change::Gradual.new(Tempo::BPM.new(120),1) } ],
+      'invalid part' => [ Tempo::QNPM.new(30), :parts => { "piano" => Part.new(-0.1) }],
+      'invalid program' => [ Tempo::QNPM.new(30), :program => Program.new([2..0]) ],
+    }.each do |context_str,args|
+      context context_str do
+        it 'should return false' do
+          NoteScore.new(*args).should be_invalid
+        end
+      end 
+    end
+  end
+end

data/spec/model/tempo_spec.rb

@@ -1,23 +1,23 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Tempo do
-  describe '#==' do
-    context 'same bpm and beat duration' do
-      it 'should return true' do
-        [
-          [120,nil],
-          [120,0.25.to_r],
-          [300,"3/8".to_r]
-        ].each do |bpm,bd|
-          Tempo.new(bpm,bd).should eq(Tempo.new(bpm,bd))
-        end
-      end
+  describe '#initialize' do
+    it 'should assign given value' do
+      Tempo.new(3).value.should eq(3)
     end
     
-    context 'different bpm or beat duration' do
-      it 'should return false' do
-        Tempo.new(120,nil).should_not eq(Tempo.new(120,"1/4".to_r))
-        Tempo.new(200,2).should_not eq(Tempo.new(200,2.1))
+    context 'given negative value' do
+      it 'should raise NonPositiveError' do
+        expect { Tempo.new(-3) }.to raise_error(NonPositiveError)
+      end
+    end
+  end
+  
+  [ :qnpm, :bpm, :npm, :nps ].each do |sym|
+    describe "Tempo::#{sym}" do
+      it "should print tempo value + '#{sym}'" do
+        klass = Tempo.const_get(sym.upcase)
+        klass.new(20).to_s.should eq("20#{sym}")
       end
     end
   end

data/spec/packing/{score_packing_spec.rb → measure_score_packing_spec.rb}

@@ -1,8 +1,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-describe Score do
+describe MeasureScore do
   before :all do
-    @score = Score.new(FOUR_FOUR,120) do |s|
+    @score = MeasureScore.new(FOUR_FOUR,Tempo::BPM.new(120)) do |s|
       s.program = Program.new([0...2, 0...2,2...4,0...2])
       s.parts["lead"] = Part.new(Dynamics::MF) do |p|
         riff = "/6Bb3 /4 /12Db4= /6Db4= /36Db4 /36Eb4 /36Db4 /6Ab3 /12Db4 \
@@ -52,8 +52,8 @@ describe Score do
       end
     end
     
-    it 'should pack start tempo as plain numeric value' do
-      @h['start_tempo'].should be_a Numeric
+    it 'should pack start tempo as string' do
+      @h['start_tempo'].should be_a String
     end
     
     it 'should pack tempo changes as whatver type Change#pack returns' do
@@ -64,6 +64,12 @@ describe Score do
       end
     end
     
+    it 'should pack tempo change values as strings' do
+      @h['tempo_changes'].each do |offset,packed_v|
+        packed_v[0].should be_a String
+      end
+    end
+    
     it 'should pack program as whatever type Program#pack returns' do
       t = @score.program.pack.class
       @h['program'].should be_a t
@@ -87,11 +93,11 @@ describe Score do
   
   describe '.unpack' do
     before :all do
-      @score2 = Score.unpack @h
+      @score2 = MeasureScore.unpack @h
     end
     
-    it 'should return a Score' do
-      @score2.should be_a Score
+    it 'should return a MeasureScore' do
+      @score2.should be_a MeasureScore
     end
     
     it 'should successfuly unpack the parts' do

data/spec/packing/note_score_packing_spec.rb

@@ -0,0 +1,100 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe NoteScore do
+  before :all do
+    @score = NoteScore.new(Tempo::QNPM.new(30)) do |s|
+      s.program = Program.new([0...2, 0...2,2...4,0...2])
+      s.parts["lead"] = Part.new(Dynamics::MF) do |p|
+        riff = "/6Bb3 /4 /12Db4= /6Db4= /36Db4 /36Eb4 /36Db4 /6Ab3 /12Db4 \
+                /6Bb3 /4 /12Db4= /4Db4=                      /8=Db4 /8C4".to_notes
+        p.notes = riff + riff.map {|n| n.transpose(2) }
+      end
+      
+      s.parts["bass"] = Part.new(Dynamics::MP) do |p|
+        riff = "/6Bb2 /4 /3Ab2 /6F2 /12Ab2 \
+                /6Bb2 /4 /3Ab2 /4Ab2".to_notes
+        p.notes = riff + riff.map {|n| n.transpose(2) }
+      end
+    end
+    
+    @h = @score.pack
+  end
+  
+  describe '#pack' do
+    it 'should return a hash' do
+      @h.should be_a Hash
+    end
+    
+    it 'should return a hash with keys: "parts", "program", ...' do
+      @h.keys.should include("parts")
+      @h.keys.should include("start_tempo")
+      @h.keys.should include("tempo_changes")
+      @h.keys.should include("program")
+    end
+    
+    it 'should pack start tempo as string' do
+      @h['start_tempo'].should be_a String
+    end
+    
+    it 'should pack tempo changes as whatver type Change#pack returns' do
+      @h['tempo_changes'].each do |offset,packed_v|
+        change_v = @score.tempo_changes[offset]
+        t = change_v.pack.class
+        packed_v.should be_a t
+      end
+    end
+    
+    it 'should pack tempo change values as strings' do
+      @h['tempo_changes'].each do |offset,packed_v|
+        packed_v[0].should be_a String
+      end
+    end
+
+    it 'should pack program as whatever type Program#pack returns' do
+      t = @score.program.pack.class
+      @h['program'].should be_a t
+    end
+    
+    it 'should pack program segments as strings' do
+      @h['program'].each {|x| x.should be_a String }
+    end
+
+    it 'should pack parts as hash' do
+      @h['parts'].should be_a Hash
+    end
+    
+    it 'should pack parts as whatever Part#pack returns' do
+      @score.parts.each do |name,part|
+        packing = part.pack
+        @h['parts'][name].should eq packing
+      end
+    end
+  end
+  
+  describe '.unpack' do
+    before :all do
+      @score2 = NoteScore.unpack @h
+    end
+    
+    it 'should return a NoteScore' do
+      @score2.should be_a NoteScore
+    end
+    
+    it 'should successfuly unpack the parts' do
+      @score2.parts.should eq @score.parts
+    end
+    
+    it 'should successfuly unpack the start tempo' do
+      @score2.start_tempo.should eq @score.start_tempo
+    end
+
+    it 'should successfuly unpack the tempo changes' do
+      @score2.tempo_changes.should eq @score.tempo_changes
+    end
+
+    it 'should successfuly unpack the program' do
+      @score2.program.should eq @score.program
+    end
+  end
+end
+

data/spec/packing/part_packing_spec.rb

@@ -4,7 +4,7 @@ describe Part do
   before :all do
     @p = Part.new(
       Dynamics::MP,
-      notes: Parsing::notes("/4Bb2 /8 /8F3= /2F3 /4Bb2 /8 /8F3= /2F3"),
+      notes: Note.split_parse("/4Bb2 /8 /8F3= /2F3 /4Bb2 /8 /8F3= /2F3"),
       dynamic_changes: {
         1 => Change::Immediate.new(Dynamics::PP),
         2 => Change::Gradual.new(Dynamics::FF, 2.0)