music-transcription 0.9.2 → 0.10.0

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

@@ -0,0 +1,95 @@
+# Autogenerated from a Treetop grammar. Edits may be lost.
+
+
+module Music
+module Transcription
+module Parsing
+
+module PositiveInteger
+  include Treetop::Runtime
+
+  def root
+    @root ||= :positive_integer
+  end
+
+  include NonnegativeInteger
+
+  module PositiveInteger0
+    def nonnegative_integer
+      elements[2]
+    end
+  end
+
+  module PositiveInteger1
+    def to_i
+      text_value.to_i
+    end
+  end
+
+  def _nt_positive_integer
+    start_index = index
+    if node_cache[:positive_integer].has_key?(index)
+      cached = node_cache[:positive_integer][index]
+      if cached
+        node_cache[:positive_integer][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0, s0 = index, []
+    s1, i1 = [], index
+    loop do
+      if has_terminal?(@regexps[gr = '\A[0]'] ||= Regexp.new(gr), :regexp, index)
+        r2 = true
+        @index += 1
+      else
+        terminal_parse_failure('[0]')
+        r2 = nil
+      end
+      if r2
+        s1 << r2
+      else
+        break
+      end
+    end
+    r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+    s0 << r1
+    if r1
+      if has_terminal?(@regexps[gr = '\A[1-9]'] ||= Regexp.new(gr), :regexp, index)
+        r3 = true
+        @index += 1
+      else
+        terminal_parse_failure('[1-9]')
+        r3 = nil
+      end
+      s0 << r3
+      if r3
+        r4 = _nt_nonnegative_integer
+        s0 << r4
+      end
+    end
+    if s0.last
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0.extend(PositiveInteger0)
+      r0.extend(PositiveInteger1)
+    else
+      @index = i0
+      r0 = nil
+    end
+
+    node_cache[:positive_integer][start_index] = r0
+
+    r0
+  end
+
+end
+
+class PositiveIntegerParser < Treetop::Runtime::CompiledParser
+  include PositiveInteger
+end
+
+
+end
+end
+end

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

@@ -0,0 +1,19 @@
+module Music
+module Transcription
+module Parsing
+
+grammar PositiveInteger
+  include NonnegativeInteger
+  
+  rule positive_integer
+    [0]* [1-9] nonnegative_integer {
+      def to_i
+        text_value.to_i
+      end
+    }
+  end
+end
+
+end
+end
+end

data/lib/music-transcription/part.rb

@@ -8,11 +8,11 @@ class Part
   
   attr_reader :start_dynamic, :dynamic_changes, :notes
   
+  @@check_methods = [:ensure_start_dynamic, :ensure_dynamic_change_values_range ]
   def initialize start_dynamic, notes: [], dynamic_changes: {}
     @notes = notes
     @start_dynamic = start_dynamic
     @dynamic_changes = dynamic_changes
-    @check_methods = [:ensure_start_dynamic, :ensure_dynamic_change_values_range ]
     
     yield(self) if block_given?
   end

data/lib/music-transcription/program.rb

@@ -10,11 +10,9 @@ class Program
   
   attr_accessor :segments
 
-  # A new instance of Program.
-  # @param [Hash] args Hashed arguments. Required key is :segments.
+  @@check_methods = [:ensure_increasing_segments, :ensure_nonnegative_segments]
   def initialize segments = []
     @segments = segments
-    @check_methods = [:ensure_increasing_segments, :ensure_nonnegative_segments]
   end
 
   # @return [Float] the sum of all program segment lengths
@@ -22,7 +20,6 @@ class Program
     segments.inject(0.0) { |length, segment| length + (segment.last - segment.first) }
   end
   
-    # compare to another Program
   def == other
     return other.respond_to?(:segments) && @segments == other.segments
   end

data/lib/music-transcription/score.rb

@@ -6,6 +6,7 @@ class Score
   
   attr_reader :start_meter, :start_tempo, :parts, :program, :meter_changes, :tempo_changes
   
+  @@check_methods = [ :check_start_tempo, :check_tempo_changes, :check_meter_changes ]
   def initialize start_meter, start_tempo, meter_changes: {}, tempo_changes: {}, parts: {}, program: Program.new
     @start_meter = start_meter
     @start_tempo = start_tempo
@@ -13,7 +14,6 @@ class Score
     @tempo_changes = tempo_changes
     @parts = parts
     @program = program
-    @check_methods = [ :check_start_tempo, :check_tempo_changes, :check_meter_changes ]
     
     yield(self) if block_given?
   end

data/lib/music-transcription/validatable.rb

@@ -3,10 +3,25 @@
 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 validate
     @errors = []
     
-    @check_methods.each do |check_method|
+    
+    check_methods.each do |check_method|
       begin
         send(check_method)
       rescue StandardError => e

data/lib/music-transcription/version.rb

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

data/lib/music-transcription.rb

@@ -17,3 +17,17 @@ require 'music-transcription/tempo'
 require 'music-transcription/meter'
 require 'music-transcription/meters'
 require 'music-transcription/score'
+
+require 'treetop'
+require 'music-transcription/parsing/nonnegative_integer_parsing'
+require 'music-transcription/parsing/positive_integer_parsing'
+require 'music-transcription/parsing/pitch_parsing'
+require 'music-transcription/parsing/pitch_node'
+require 'music-transcription/parsing/duration_parsing'
+require 'music-transcription/parsing/duration_nodes'
+require 'music-transcription/parsing/articulation_parsing'
+require 'music-transcription/parsing/link_parsing'
+require 'music-transcription/parsing/link_nodes'
+require 'music-transcription/parsing/note_parsing'
+require 'music-transcription/parsing/note_nodes'
+require 'music-transcription/parsing/convenience_methods'

data/music-transcription.gemspec

@@ -29,4 +29,6 @@ DESCRIPTION
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'pry-nav'
   gem.add_development_dependency 'pry-stack_explorer'
+  
+  gem.add_dependency 'treetop'
 end

data/spec/parsing/articulation_parsing_spec.rb

@@ -0,0 +1,23 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Parsing::ArticulationParser do
+  parser = Parsing::ArticulationParser.new
+  
+  {
+    '=' => SLUR,
+    '-' => LEGATO,
+    '_' => TENUTO,
+    '%' => PORTATO,
+    '.' => STACCATO,
+    "'" => STACCATISSIMO
+  }.each do |str,art|
+    res = parser.parse(str)
+    it "should parse '#{str}'" do
+      res.should_not be nil
+    end
+    
+    it 'should return a node to responds to :to_articulation correctly' do
+      res.to_articulation.should eq art
+    end
+  end
+end

data/spec/parsing/convenience_methods_spec.rb

@@ -0,0 +1,89 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+dur_stuff = ['should parse as single duration',
+{
+  '/2' => "1/2".to_r,
+  '5/29' => "5/29".to_r,
+  '200/' => "200/1".to_r,
+  '66' => "66/1".to_r
+}]
+
+durs_stuff = ['should parse as whitespace-separated durations',
+{
+  '/2 5/29 200/ 66' => ["1/2".to_r,"5/29".to_r,"200/1".to_r,"66/1".to_r],
+  "/2\t5/29\n200/   \t\n  66" => ["1/2".to_r,"5/29".to_r,"200/1".to_r,"66/1".to_r],
+}]
+
+pitch_stuff = ['should parse as single pitch',
+{
+  'C2' => C2,
+  'Db4' => Db4,
+  'A#9' => Bb9
+}]
+
+pitches_stuff = ['should parse as whitespace-separated pitches',
+{
+  'C2 C2 D2 C2' => [C2,C2,D2,C2],
+  "Bb2\tF5  \n  Gb7" => [Bb2,F5,Gb7],
+}]
+
+note_stuff = ['should parse as a single note',
+{
+  '/2' => Note::half,
+  '99/10C2' => Note.new('99/10'.to_r, [C2]),
+  '5/2.Db4,Eb5' => Note.new('5/2'.to_r, [Db4,Eb5], articulation:STACCATO)
+}]
+
+notes_stuff = ['should parse as whitespace-separated notes',
+{
+  '/2 /2 /4' => [Note::half,Note::half,Note::quarter],
+  "/4C4  \t  /4D4" => [Note::quarter([C4]),Note::quarter([D4])],
+  "/2Db2\t/2C2  \n /2C2" => [Note::half([Db2]), Note::half([C2]), Note::half([C2])]
+}]
+
+{
+  :duration => dur_stuff,
+  :dur => dur_stuff,
+  :durations => durs_stuff,
+  :durs => durs_stuff,
+  :pitch => pitch_stuff,
+  :pitches => pitches_stuff,
+  :note => note_stuff,
+  :notes => notes_stuff
+}.each do |mod_fun,descr_cases|
+  describe("Parsing::" + mod_fun.to_s) do 
+    descr, cases = descr_cases
+    it descr do
+      cases.each do |s,tgt|
+        Parsing.send(mod_fun,s).should eq tgt
+      end
+    end
+  end
+end
+
+{
+  :to_d => dur_stuff,
+  :to_dur => dur_stuff,
+  :to_duration => dur_stuff,
+  :to_ds => durs_stuff,
+  :to_durs => durs_stuff,
+  :to_durations => durs_stuff,
+  :to_p => pitch_stuff,
+  :to_pitch => pitch_stuff,
+  :to_ps=> pitches_stuff,
+  :to_pitches => pitches_stuff,
+  :to_n => note_stuff,
+  :to_note => note_stuff,
+  :to_ns => notes_stuff,
+  :to_notes => notes_stuff
+}.each do |inst_meth,descr_cases|
+  describe("String#" + inst_meth.to_s) do 
+    descr, cases = descr_cases
+    it descr do
+      cases.each do |s,tgt|
+        s.send(inst_meth).should eq tgt
+      end
+    end
+  end
+end
+

data/spec/parsing/duration_nodes_spec.rb

@@ -0,0 +1,83 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Parsing::NumDenNode do
+  dur_parser = Parsing::DurationParser.new
+  
+  {
+    '1/2' => Rational(1,2),
+    '5/100' => Rational(5,100),
+    '007/777' => Rational(7,777)
+  }.each do |str,tgt|
+    res = dur_parser.parse(str)
+    context str do
+      it 'should parse as NumDenNode' do
+        res.should be_a Parsing::NumDenNode
+      end
+
+      describe '#to_r' do
+        r = res.to_r
+        it 'should produce a Rational' do
+          r.should be_a Rational
+        end
+        
+        it 'should produce value matching input str' do
+          r.should eq tgt
+        end
+      end
+    end
+  end
+end
+
+describe Parsing::NumOnlyNode do
+  dur_parser = Parsing::DurationParser.new
+    {
+    '1/' => Rational(1,1),
+    '5' => Rational(5,1),
+    '007/' => Rational(7,1)
+  }.each do |str,tgt|
+    res = dur_parser.parse(str)
+    context str do
+      it 'should parse as NumOnlyNode' do
+        res.should be_a Parsing::NumOnlyNode
+      end
+
+      describe '#to_r' do
+        r = res.to_r
+        it 'should produce a Rational' do
+          r.should be_a Rational
+        end
+        
+        it 'should produce value matching input str' do
+          r.should eq tgt
+        end
+      end
+    end
+  end
+end
+
+describe Parsing::DenOnlyNode do
+  dur_parser = Parsing::DurationParser.new
+  {
+    '/2' => Rational(1,2),
+    '/100' => Rational(1,100),
+    '/777' => Rational(1,777)
+  }.each do |str,tgt|
+    res = dur_parser.parse(str)
+    context str do
+      it 'should parse as DenOnlyNode' do
+        res.should be_a Parsing::DenOnlyNode
+      end
+
+      describe '#to_r' do
+        r = res.to_r
+        it 'should produce a Rational' do
+          r.should be_a Rational
+        end
+        
+        it 'should produce value matching input str' do
+          r.should eq tgt
+        end
+      end
+    end
+  end
+end

data/spec/parsing/duration_parsing_spec.rb

@@ -0,0 +1,70 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Parsing::DurationParser do
+  dur_parser = Parsing::DurationParser.new
+  before :all do
+    @valid = {
+      :numbers => [1,5,50,3999,01,0010,0000005050],
+    }
+    
+    @invalid = {
+      :numbers => [0,00],
+    }    
+  end
+  
+  context 'valid (non-zero) numerator and denominator' do
+    ["n","n/","n/d","/d"].each do |expr|
+      it "should parse durations of the form #{expr}" do
+        @valid[:numbers].each do |n|
+          @valid[:numbers].each do |d|
+            str = expr.gsub('n',"#{n}")
+            str = str.gsub('d',"#{d}")
+            dur_parser.parse(str).should_not be nil
+          end
+        end
+      end
+    end
+  end
+
+  context 'invalid (zero) numerator and valid denominator' do
+    ["n","n/","n/d"].each do |expr|
+      it "should parse durations of the form #{expr}" do
+        @invalid[:numbers].each do |n|
+          @valid[:numbers].each do |d|
+            str = expr.gsub('n',"#{n}")
+            str = str.gsub('d',"#{d}")
+            dur_parser.parse(str).should be nil
+          end
+        end
+      end
+    end
+  end
+    
+  context 'valid numerator and invalid (zero) denominator' do
+    ["n/d","/d"].each do |expr|
+      it "should parse durations of the form #{expr}" do
+        @valid[:numbers].each do |n|
+          @invalid[:numbers].each do |d|
+            str = expr.gsub('n',"#{n}")
+            str = str.gsub('d',"#{d}")
+            dur_parser.parse(str).should be nil
+          end
+        end
+      end
+    end
+  end
+  
+  context 'invalid numerator and invalid denominator' do
+    ["n","n/","n/d","/d"].each do |expr|
+      it "should parse durations of the form #{expr}" do
+        @invalid[:numbers].each do |n|
+          @invalid[:numbers].each do |d|
+            str = expr.gsub('n',"#{n}")
+            str = str.gsub('d',"#{d}")
+            dur_parser.parse(str).should be nil
+          end
+        end
+      end
+    end
+  end  
+end