music-transcription 0.9.2 → 0.10.0

data/spec/parsing/link_nodes_spec.rb

@@ -0,0 +1,30 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Parsing::LinkNode do
+  parser = Parsing::LinkParser.new
+  
+  {
+    '=C4' => Link::Slur.new(C4),
+    '/Db2' => Link::Portamento.new(Db2),
+    '~C#2' => Link::Glissando.new(Db2),
+    '-Db2' => Link::Legato.new(Db2),
+  }.each do |str,tgt|
+    res = parser.parse(str)
+    context str do
+      it 'should parse as LinkNode' do
+        res.should be_a Parsing::LinkNode
+      end
+      
+      describe '#to_pitch' do
+        l = res.to_link
+        it 'should produce a Link object' do
+          l.should be_a Link
+        end
+        
+        it 'should produce pitch matching input str' do
+          l.should eq tgt
+        end
+      end
+    end
+  end  
+end

data/spec/parsing/link_parsing_spec.rb

@@ -0,0 +1,23 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Parsing::LinkParser do
+  before :all do
+    @parser = Parsing::LinkParser.new
+  end
+  
+  it 'should parse a "=C2"' do
+    @parser.parse("=C2").should_not be nil
+  end
+  
+  it 'should parse a "-C2"' do
+    @parser.parse("-C2").should_not be nil
+  end
+  
+  it 'should parse a "~C2"' do
+    @parser.parse("~C2").should_not be nil
+  end
+  
+  it 'should parse a "/C2"' do
+    @parser.parse("/C2").should_not be nil
+  end
+end

data/spec/parsing/nonnegative_integer_spec.rb

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

data/spec/parsing/note_nodes_spec.rb

@@ -0,0 +1,84 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+NOTE_PARSER = Parsing::NoteParser.new
+
+describe Parsing::RestNoteNode 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 RestNoteNode' do
+        res.should be_a Parsing::RestNoteNode
+      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
+
+describe Parsing::MonophonicNoteNode 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::MonophonicNoteNode
+      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
+
+describe Parsing::PolyphonicNoteNode 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::PolyphonicNoteNode
+      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

data/spec/parsing/note_parsing_spec.rb

@@ -0,0 +1,43 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Parsing::NoteParser do
+  before :all do
+    @parser = Parsing::NoteParser.new
+  end
+  
+   valid_cases = {
+    'duration only' => ['1/4','/2','1','55/33'],
+    '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'],
+    'with accent' => ['/4C2!','3/2Db3,Bb4!'],
+    'with links' => ['/2C2=','/2C2=D2','/4D4-E4,G4~A5'],
+    'with single pitch + articulation + link + accent' => [
+      '3/4.D2=!','5/8=F2=!','/8Db4-Db5!','/3_G4~B4!'],
+    'with multiple pitches + articulation + links + accent' => [
+      '5/4.D2=,G4-A4,C3~D3!','5/8-F2=D4,B4/A4!'],
+  }
+  invalid_cases = {
+    'single pitch' => ['/4C22','5/3Hb-3','/33E-2'],
+    'multiple pitches' => ['/4C20,C3,c5','5/3Db3,Bb-1,E5','/33H8,F1,B9'],
+    'with articulation' => ['/4[C2',"5/3>Db3"],
+    'with accent' => ['/4C2['],
+    'with links' => ['/2C2)'],
+  }
+  
+  valid_cases.each do |descr, strs|
+    context(descr + ' (valid)') do
+      it 'should parse' do
+        strs.each {|s| @parser.should parse(s) }
+      end
+    end
+  end
+
+  invalid_cases.each do |descr, strs|
+    context(descr + ' (invalid)') do
+      it 'should not parse' do
+        strs.each {|s| @parser.should_not parse(s) }
+      end
+    end
+  end
+end

data/spec/parsing/pitch_node_spec.rb

@@ -0,0 +1,32 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Parsing::PitchNode do
+  parser = Parsing::PitchParser.new
+  
+  {
+    'C4' => C4,
+    'Db2' => Db2,
+    'C#2' => Db2,
+    'Db2' => Db2,
+    'F7' => F7,
+    'B1' => B1,
+  }.each do |str,tgt|
+    res = parser.parse(str)
+    context str do
+      it 'should parse as PitchNode' do
+        res.should be_a Parsing::PitchNode
+      end
+      
+      describe '#to_pitch' do
+        p = res.to_pitch
+        it 'should produce a Pitch object' do
+          p.should be_a Pitch
+        end
+        
+        it 'should produce pitch matching input str' do
+          p.should eq tgt
+        end
+      end
+    end
+  end  
+end

data/spec/parsing/pitch_parsing_spec.rb

@@ -0,0 +1,23 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Parsing::PitchParser do
+  before :all do
+    @parser = Parsing::PitchParser.new
+  end
+  
+  it 'should parse "C4"' do
+    @parser.parse("C4").should_not be nil
+  end
+  
+  it 'should parse "C#9"' do
+    @parser.parse("C#9").should_not be nil
+  end
+  
+  it 'should parse "Ab0"' do
+    @parser.parse("Ab0").should_not be nil
+  end
+  
+  it 'should parse "G#2"' do
+    @parser.parse("G#2").should_not be nil
+  end
+end

data/spec/parsing/positive_integer_spec.rb

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

data/spec/spec_helper.rb

@@ -29,3 +29,15 @@ RSpec::Matchers.define :be_invalid do
     obj.invalid?
   end
 end
+
+RSpec::Matchers.define :parse do |str|
+  match do |parser|
+    !parser.parse(str).nil?
+  end
+end
+
+RSpec::Matchers.define :parse_as do |str,nodeclass|
+  match do |parser|
+    parser.parse(str).is_a?(nodeclass)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: music-transcription
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - James Tunnell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: treetop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: "The goal of music-transcription is the abstract representation of standard
   \nmusical features such as pitch, note, loudness, tempo, etc. Establishing\na common
   representation enables composition and performance.\n"
@@ -159,6 +173,25 @@ files:
 - lib/music-transcription/meter.rb
 - lib/music-transcription/meters.rb
 - lib/music-transcription/note.rb
+- lib/music-transcription/parsing/articulation_parsing.rb
+- lib/music-transcription/parsing/articulation_parsing.treetop
+- lib/music-transcription/parsing/convenience_methods.rb
+- lib/music-transcription/parsing/duration_nodes.rb
+- lib/music-transcription/parsing/duration_parsing.rb
+- lib/music-transcription/parsing/duration_parsing.treetop
+- lib/music-transcription/parsing/link_nodes.rb
+- lib/music-transcription/parsing/link_parsing.rb
+- lib/music-transcription/parsing/link_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_parsing.rb
+- lib/music-transcription/parsing/note_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/part.rb
 - lib/music-transcription/pitch.rb
 - lib/music-transcription/pitches.rb
@@ -173,6 +206,18 @@ files:
 - spec/meter_spec.rb
 - spec/music-transcription_spec.rb
 - spec/note_spec.rb
+- spec/parsing/articulation_parsing_spec.rb
+- spec/parsing/convenience_methods_spec.rb
+- spec/parsing/duration_nodes_spec.rb
+- spec/parsing/duration_parsing_spec.rb
+- spec/parsing/link_nodes_spec.rb
+- spec/parsing/link_parsing_spec.rb
+- spec/parsing/nonnegative_integer_spec.rb
+- spec/parsing/note_nodes_spec.rb
+- spec/parsing/note_parsing_spec.rb
+- spec/parsing/pitch_node_spec.rb
+- spec/parsing/pitch_parsing_spec.rb
+- spec/parsing/positive_integer_spec.rb
 - spec/part_spec.rb
 - spec/pitch_spec.rb
 - spec/program_spec.rb
@@ -210,6 +255,18 @@ test_files:
 - spec/meter_spec.rb
 - spec/music-transcription_spec.rb
 - spec/note_spec.rb
+- spec/parsing/articulation_parsing_spec.rb
+- spec/parsing/convenience_methods_spec.rb
+- spec/parsing/duration_nodes_spec.rb
+- spec/parsing/duration_parsing_spec.rb
+- spec/parsing/link_nodes_spec.rb
+- spec/parsing/link_parsing_spec.rb
+- spec/parsing/nonnegative_integer_spec.rb
+- spec/parsing/note_nodes_spec.rb
+- spec/parsing/note_parsing_spec.rb
+- spec/parsing/pitch_node_spec.rb
+- spec/parsing/pitch_parsing_spec.rb
+- spec/parsing/positive_integer_spec.rb
 - spec/part_spec.rb
 - spec/pitch_spec.rb
 - spec/program_spec.rb