music-transcription 0.11.0 → 0.13.0

data/spec/packing/score_packing_spec.rb

@@ -0,0 +1,122 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Score do
+  before :all do
+    @score = Score.new(FOUR_FOUR,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 \
+                /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", "start_meter", ...' do
+      @h.keys.should include("parts")
+      @h.keys.should include("start_meter")
+      @h.keys.should include("meter_changes")
+      @h.keys.should include("start_tempo")
+      @h.keys.should include("tempo_changes")
+      @h.keys.should include("program")
+    end
+    
+    it 'should pack start meter as a string' do
+      @h['start_meter'].should be_a String
+    end
+    
+    it 'should pack meter changes as whatver type Change#pack returns' do
+      @h['meter_changes'].each do |offset,packed_v|
+        change_v = @score.meter_changes[offset]
+        t = change_v.pack.class
+        packed_v.should be_a t
+      end
+    end
+
+    it 'should pack meter change values as strings' do
+      @h['meter_changes'].each do |offset,packed_v|
+        packed_v[0].should be_a String
+      end
+    end
+    
+    it 'should pack start tempo as plain numeric value' do
+      @h['start_tempo'].should be_a Numeric
+    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 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 = Score.unpack @h
+    end
+    
+    it 'should return a Score' do
+      @score2.should be_a Score
+    end
+    
+    it 'should successfuly unpack the parts' do
+      @score2.parts.should eq @score.parts
+    end
+    
+    it 'should successfuly unpack the start meter' do
+      @score2.start_meter.should eq @score.start_meter
+    end
+
+    it 'should successfuly unpack the start tempo' do
+      @score2.start_tempo.should eq @score.start_tempo
+    end
+
+    it 'should successfuly unpack the meter changes' do
+      @score2.meter_changes.should eq @score.meter_changes
+    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/parsing/meter_parsing_spec.rb

@@ -5,9 +5,9 @@ describe Parsing::MeterParser do
   
   {
     '4/4' => FOUR_FOUR,
-    '6/8' => SIX_EIGHT,
+    '2*3/8' => SIX_EIGHT,
     '12/3' => Meter.new(12,"1/3".to_r),
-    '9/8' => Meter.new(9,"1/8".to_r),
+    '3*3/8' => Meter.new(3,"3/8".to_r),
     '3/4' => THREE_FOUR
   }.each do |str,met|
     res = parser.parse(str)

data/spec/parsing/note_node_spec.rb

@@ -0,0 +1,87 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+NOTE_PARSER = Parsing::NoteParser.new
+
+describe Parsing::NoteNode do
+  context 'rest note' do  
+    {
+      '/2' => Note.new(Rational(1,2)),
+      '4/2' => Note.new(Rational(4,2)),
+      '28' => Note.new(Rational(28,1)),
+      '56/33' => Note.new(Rational(56,33)),
+    }.each do |str,tgt|
+      res = NOTE_PARSER.parse(str)
+      context str do
+        it 'should parse as NoteNode' do
+          res.should be_a Parsing::NoteNode
+        end
+  
+        describe '#to_note' do
+          n = res.to_note
+          it 'should produce a Note' do
+            n.should be_a Note
+          end
+          
+          it 'should produce value matching input str' do
+            n.should eq tgt
+          end
+        end
+      end
+    end
+  end
+
+  context 'monophonic note' do
+    {
+      '/2=C2=C2' => Note.new(Rational(1,2),[C2],articulation:SLUR, links:{C2=>Link::Slur.new(C2)}),
+      '4/2.D#6' => Note.new(Rational(4,2),[Eb6],articulation:STACCATO),
+      '28%Eb7!' => Note.new(Rational(28,1),[Eb7],articulation:PORTATO, accented: true),
+      "56/33'B1" => Note.new(Rational(56,33),[B1],articulation:STACCATISSIMO),
+    }.each do |str,tgt|
+      res = NOTE_PARSER.parse(str)
+      
+      context str do
+        it 'should parse as MonophonicNoteNode' do
+          res.should be_a Parsing::NoteNode
+        end
+  
+        describe '#to_note' do
+          n = res.to_note
+          it 'should produce a Note' do
+            n.should be_a Note
+          end
+          
+          it 'should produce value matching input str' do
+            n.should eq tgt
+          end
+        end
+      end
+    end
+  end
+
+  context 'polyphonic note' do
+    {
+      '/2C2,D2,E2-F2' => Note.new(Rational(1,2),[C2,D2,E2],links:{E2=>Link::Legato.new(F2)}),
+      '4/2.D#6,G4' => Note.new(Rational(4,2),[Eb6,G4], articulation:STACCATO),
+      '28_Eb7,D7,G7' => Note.new(Rational(28,1),[Eb7,D7,G7],articulation:TENUTO),
+      '56/33B1,B2,B3,B4,B5!' => Note.new(Rational(56,33),[B1,B2,B3,B4,B5], accented: true),
+    }.each do |str,tgt|
+      res = NOTE_PARSER.parse(str)
+      context str do
+        it 'should parse as PolyphonicNoteNode' do
+          res.should be_a Parsing::NoteNode
+        end
+  
+        describe '#to_note' do
+          n = res.to_note
+          it 'should produce a Note' do
+            n.should be_a Note
+          end
+          
+          it 'should produce value matching input str' do
+            n.should eq tgt
+          end
+        end
+      end
+    end
+  end
+end

data/spec/parsing/note_parsing_spec.rb

@@ -7,6 +7,9 @@ describe Parsing::NoteParser do
   
    valid_cases = {
     'duration only' => ['1/4','/2','1','55/33'],
+    'duration + accent' => ['1/4!','/2!'],
+    'duration + articulation' => ['1/4.','/2%','2/3='],
+    'duration + articulation + accent' => ['1/4.!','/2%!','2/3=!'],
     'single pitch' => ['/4C2','5/3Db3','/33E#8'],
     'multiple pitches' => ['/4C2,C3,c5','5/3Db3,Bb2,E5','/33E#8,F1,B9'],
     'with articulation' => ['/4.C2',"5/3'Db3,Bb2,E5",'/33=F3','5-B2','/2_D3,F4'],

data/spec/parsing/numbers/nonnegative_float_spec.rb

@@ -0,0 +1,11 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe Parsing::NonnegativeFloatParser do
+  parser = Parsing::NonnegativeFloatParser .new
+
+  ["1.0","0.50","05.003e-10","1.555e+2","3.443214"].each do |str|
+    it "should parse '#{str}'" do
+      parser.parse(str).should_not be nil
+    end
+  end
+end

data/spec/parsing/{nonnegative_integer_spec.rb → numbers/nonnegative_integer_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe Parsing::NonnegativeIntegerParser do
   parser = Parsing::NonnegativeIntegerParser.new

data/spec/parsing/numbers/nonnegative_rational_spec.rb

@@ -0,0 +1,11 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe Parsing::NonnegativeRationalParser do
+  parser = Parsing::NonnegativeRationalParser.new
+
+  ["1/2","0/50","05/003","502530/1","0/1"].each do |str|
+    it "should parse '#{str}'" do
+      parser.parse(str).should_not be nil
+    end
+  end
+end

data/spec/parsing/{positive_integer_spec.rb → numbers/positive_integer_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe Parsing::PositiveIntegerParser do
   parser = Parsing::PositiveIntegerParser.new

data/spec/parsing/segment_parsing_spec.rb

@@ -0,0 +1,27 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Parsing::SegmentParser do
+  parser = Parsing::SegmentParser.new
+
+  cases = {
+    "ints" => ["0...4",0...4],
+    "plain floats" => ["0.0..4.0",0.0...4.0],
+    "sci floats" => ["1.3e-10...5",1.3e-10...5],
+    "int/float" => ["45..46.5",45...46.5],
+    "float/int" => ["4.5...5",4.5...5],
+    "rationals" => ["2/3..3/2",Rational(2,3)...Rational(3,2)],
+    "float/rational" => ["3.5..10/6",3.5...Rational(10,6)]
+  }.each do |descr,str_tgt|
+    context descr do
+      str,tgt = str_tgt
+      res = parser.parse(str)
+      it 'should parse' do
+        res.should_not be nil
+      end
+      
+      it 'should return node that converts to exclusive range via #to_range' do
+        res.to_range.should eq tgt
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: music-transcription
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.13.0
 platform: ruby
 authors:
 - James Tunnell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2014-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -156,14 +156,18 @@ files:
 - README.rdoc
 - Rakefile
 - bin/transcribe
+- examples/hip.rb
 - examples/hip.yml
-- examples/make_hip.rb
-- examples/make_missed_connection.rb
-- examples/make_song1.rb
-- examples/make_song2.rb
+- examples/hip_packed.yml
+- examples/missed_connection.rb
 - examples/missed_connection.yml
+- examples/missed_connection_packed.yml
+- examples/song1.rb
 - examples/song1.yml
+- examples/song1_packed.yml
+- examples/song2.rb
 - examples/song2.yml
+- examples/song2_packed.yml
 - lib/music-transcription.rb
 - lib/music-transcription/errors.rb
 - lib/music-transcription/model/articulations.rb
@@ -179,6 +183,10 @@ files:
 - lib/music-transcription/model/program.rb
 - lib/music-transcription/model/score.rb
 - lib/music-transcription/model/tempo.rb
+- lib/music-transcription/packing/change_packing.rb
+- lib/music-transcription/packing/part_packing.rb
+- lib/music-transcription/packing/program_packing.rb
+- lib/music-transcription/packing/score_packing.rb
 - lib/music-transcription/parsing/articulation_parsing.rb
 - lib/music-transcription/parsing/articulation_parsing.treetop
 - lib/music-transcription/parsing/convenience_methods.rb
@@ -190,16 +198,22 @@ files:
 - lib/music-transcription/parsing/link_parsing.treetop
 - lib/music-transcription/parsing/meter_parsing.rb
 - lib/music-transcription/parsing/meter_parsing.treetop
-- lib/music-transcription/parsing/nonnegative_integer_parsing.rb
-- lib/music-transcription/parsing/nonnegative_integer_parsing.treetop
-- lib/music-transcription/parsing/note_nodes.rb
+- lib/music-transcription/parsing/note_node.rb
 - lib/music-transcription/parsing/note_parsing.rb
 - lib/music-transcription/parsing/note_parsing.treetop
+- lib/music-transcription/parsing/numbers/nonnegative_float_parsing.rb
+- lib/music-transcription/parsing/numbers/nonnegative_float_parsing.treetop
+- lib/music-transcription/parsing/numbers/nonnegative_integer_parsing.rb
+- lib/music-transcription/parsing/numbers/nonnegative_integer_parsing.treetop
+- lib/music-transcription/parsing/numbers/nonnegative_rational_parsing.rb
+- lib/music-transcription/parsing/numbers/nonnegative_rational_parsing.treetop
+- lib/music-transcription/parsing/numbers/positive_integer_parsing.rb
+- lib/music-transcription/parsing/numbers/positive_integer_parsing.treetop
 - lib/music-transcription/parsing/pitch_node.rb
 - lib/music-transcription/parsing/pitch_parsing.rb
 - lib/music-transcription/parsing/pitch_parsing.treetop
-- lib/music-transcription/parsing/positive_integer_parsing.rb
-- lib/music-transcription/parsing/positive_integer_parsing.treetop
+- lib/music-transcription/parsing/segment_parsing.rb
+- lib/music-transcription/parsing/segment_parsing.treetop
 - lib/music-transcription/validatable.rb
 - lib/music-transcription/version.rb
 - music-transcription.gemspec
@@ -213,6 +227,10 @@ files:
 - spec/model/score_spec.rb
 - spec/model/tempo_spec.rb
 - spec/music-transcription_spec.rb
+- spec/packing/change_packing_spec.rb
+- spec/packing/part_packing_spec.rb
+- spec/packing/program_packing_spec.rb
+- spec/packing/score_packing_spec.rb
 - spec/parsing/articulation_parsing_spec.rb
 - spec/parsing/convenience_methods_spec.rb
 - spec/parsing/duration_nodes_spec.rb
@@ -220,12 +238,15 @@ files:
 - spec/parsing/link_nodes_spec.rb
 - spec/parsing/link_parsing_spec.rb
 - spec/parsing/meter_parsing_spec.rb
-- spec/parsing/nonnegative_integer_spec.rb
-- spec/parsing/note_nodes_spec.rb
+- spec/parsing/note_node_spec.rb
 - spec/parsing/note_parsing_spec.rb
+- spec/parsing/numbers/nonnegative_float_spec.rb
+- spec/parsing/numbers/nonnegative_integer_spec.rb
+- spec/parsing/numbers/nonnegative_rational_spec.rb
+- spec/parsing/numbers/positive_integer_spec.rb
 - spec/parsing/pitch_node_spec.rb
 - spec/parsing/pitch_parsing_spec.rb
-- spec/parsing/positive_integer_spec.rb
+- spec/parsing/segment_parsing_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/jamestunnell/music-transcription
 licenses:
@@ -263,6 +284,10 @@ test_files:
 - spec/model/score_spec.rb
 - spec/model/tempo_spec.rb
 - spec/music-transcription_spec.rb
+- spec/packing/change_packing_spec.rb
+- spec/packing/part_packing_spec.rb
+- spec/packing/program_packing_spec.rb
+- spec/packing/score_packing_spec.rb
 - spec/parsing/articulation_parsing_spec.rb
 - spec/parsing/convenience_methods_spec.rb
 - spec/parsing/duration_nodes_spec.rb
@@ -270,11 +295,14 @@ test_files:
 - spec/parsing/link_nodes_spec.rb
 - spec/parsing/link_parsing_spec.rb
 - spec/parsing/meter_parsing_spec.rb
-- spec/parsing/nonnegative_integer_spec.rb
-- spec/parsing/note_nodes_spec.rb
+- spec/parsing/note_node_spec.rb
 - spec/parsing/note_parsing_spec.rb
+- spec/parsing/numbers/nonnegative_float_spec.rb
+- spec/parsing/numbers/nonnegative_integer_spec.rb
+- spec/parsing/numbers/nonnegative_rational_spec.rb
+- spec/parsing/numbers/positive_integer_spec.rb
 - spec/parsing/pitch_node_spec.rb
 - spec/parsing/pitch_parsing_spec.rb
-- spec/parsing/positive_integer_spec.rb
+- spec/parsing/segment_parsing_spec.rb
 - spec/spec_helper.rb
 has_rdoc: 

data/lib/music-transcription/parsing/note_nodes.rb

@@ -1,64 +0,0 @@
-module Music
-module Transcription
-module Parsing
-  class NoteNode < Treetop::Runtime::SyntaxNode
-    def primitives env
-      [ self.to_note ]
-    end
-  end
-  
-  class RestNoteNode < NoteNode
-    def to_note    
-      Music::Transcription::Note.new(duration.to_r)
-    end
-  end
-
-  class MonophonicNoteNode < NoteNode
-    def to_note
-      pitches = [ pl.pitch.to_pitch ]
-      
-      links = {}
-      unless pl.the_link.empty?
-        links[pitches[0]] = pl.the_link.to_link
-      end
-      
-      artic = Music::Transcription::Articulations::NORMAL
-      unless art.empty?
-        artic = art.to_articulation
-      end
-      
-      accent_flag = acc.empty? ? false : true
-      Music::Transcription::Note.new(duration.to_r,
-        pitches, links: links, articulation: artic, accented: accent_flag)
-    end
-  end
-
-  class PolyphonicNoteNode < NoteNode
-    def to_note
-      pitches = [ pl.pitch.to_pitch ]
-      
-      links = {}
-      unless pl.the_link.empty?
-        links[pitches[0]] = pl.the_link.to_link
-      end
-      
-      more_pitches.elements.each do |mp|
-        pitches.push mp.pl.pitch.to_pitch
-        unless mp.pl.the_link.empty?
-          links[pitches[-1]] = mp.pl.the_link.to_link
-        end
-      end
-      
-      artic = Music::Transcription::Articulations::NORMAL
-      unless art.empty?
-        artic = art.to_articulation
-      end
-      
-      accent_flag = acc.empty? ? false : true
-      Music::Transcription::Note.new(duration.to_r,
-        pitches, links: links, articulation: artic, accented: accent_flag)
-    end
-  end
-end
-end
-end