music-transcription 0.17.1 → 0.19.0

data/spec/parsing/convenience_methods_spec.rb

@@ -1,100 +1,99 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-dur_stuff = ['should parse as single duration',
-{
+class_cases = { 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])]
-}]
+  },
+  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) 
+  },
+  Pitch => {
+    'C2' => C2,
+    'Db4' => Db4,
+    'A#9' => Bb9
+  },
+  Meter => {
+    '2/2' => Meter.new(2,"1/2".to_r),
+    "4/4" => Meter.new(4,"1/4".to_r),
+    "6/8" => Meter.new(6,"1/8".to_r),
+    "12/3" => Meter.new(12,"1/3".to_r),
+    "133/55" => Meter.new(133,"1/55".to_r),
+  },
+  Segment => {
+  }
+}
 
-meter_stuff = ['should parse as meter',
-{
-  '2/2' => Meter.new(2,"1/2".to_r),
-  "4/4" => Meter.new(4,"1/4".to_r),
-  "6/8" => Meter.new(6,"1/8".to_r),
-  "12/3" => Meter.new(12,"1/3".to_r),
-  "133/55" => Meter.new(133,"1/55".to_r),
-}]
+class_cases.each do |klass,cases|
+  describe("#{klass}.parse") do
+    it "should produce a single #{klass}" do
+      cases.each do |str,tgt|
+        klass.parse(str).should eq(tgt)
+      end
+    end
+  end
+  
+  describe("#{klass}.split_parse") do
+    context 'joined with whitespace, using default pattern' do
+      it "should produce multiple of #{klass}" do
+        str = cases.keys.join(" ")
+        klass.split_parse(str).should eq(cases.values)
+      end
+    end
+    
+    context 'joined by custom separator, using matching pattern' do
+      it "should raise produce multiple of #{klass}" do
+        str = cases.keys.join(";")
+        klass.split_parse(str,";").should eq(cases.values)
+      end
+    end
+  end
+end
 
 {
-  :duration => dur_stuff,
-  :dur => dur_stuff,
-  :durations => durs_stuff,
-  :durs => durs_stuff,
-  :pitch => pitch_stuff,
-  :pitches => pitches_stuff,
-  :note => note_stuff,
-  :notes => notes_stuff,
-  :meter => meter_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
+  Duration => [:to_d, :to_dur, :to_duration],
+  Pitch => [:to_p, :to_pitch],
+  Note => [:to_n, :to_note],
+  Meter => [:to_meter],
+}.each do |klass,str_parse_methods|
+  describe 'String' do
+    str_parse_methods.each do |method|
+      describe "\##{method}" do
+        it "should return a #{klass}" do
+          class_cases[klass].each do |str,tgt|
+            str.send(method).should eq(tgt)
+          end
+        end
       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,
-  :to_meter => meter_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
+  Duration => [:to_ds, :to_durs, :to_durations],
+  Pitch => [:to_ps, :to_pitches],
+  Note => [:to_ns, :to_notes],
+}.each do |klass,str_parse_methods|
+  describe 'String' do
+    str_parse_methods.each do |method|
+      describe "\##{method}" do
+        context 'joined with whitespace' do
+          it "should return multiple of #{klass}" do
+            str = class_cases[klass].keys.join(" ")
+            str.send(method).should eq(class_cases[klass].values)
+          end
+        end
+        
+        context 'joined by custom separator, using matching pattern' do
+          it "should raise produce multiple of #{klass}" do
+            str = class_cases[klass].keys.join(";")
+            str.send(method,";").should eq(class_cases[klass].values)
+          end
+        end
       end
     end
   end
 end
-

data/spec/parsing/numbers/nonnegative_float_spec.rb

@@ -3,9 +3,26 @@ 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|
+  ["0.0","0e1","2e2","1.0","0.50","05.003e-10","1.555e+2","3.443214","0.001","0000.0030000"].each do |str|
+    res = parser.parse(str)
+    f = str.to_f
+    
     it "should parse '#{str}'" do
-      parser.parse(str).should_not be nil
+      res.should_not be nil
     end
+
+    it 'should return node that is convertible to float using #to_f method' do
+      res.to_f.should eq(f)
+    end
+    
+    it 'should return node that is convertible to float using #to_num method' do
+      res.to_num.should eq(f)
+    end
+  end
+  
+  ["-1.0","-0e1"].each do |str|
+    it "should not parse '#{str}'" do
+      parser.should_not parse(str)
+    end    
   end
 end

data/spec/parsing/numbers/positive_float_spec.rb

@@ -0,0 +1,28 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe Parsing::PositiveFloatParser do
+  parser = Parsing::PositiveFloatParser.new
+
+  ["2e2","1.0","0.50","05.003e-10","1.555e+2","3.443214","0.001","0000.0030000"].each do |str|
+    res = parser.parse(str)
+    f = str.to_f
+    
+    it "should parse '#{str}'" do
+      res.should_not be nil
+    end
+
+    it 'should return node that is convertible to float using #to_f method' do
+      res.to_f.should eq(f)
+    end
+    
+    it 'should return node that is convertible to float using #to_num method' do
+      res.to_num.should eq(f)
+    end
+  end
+  
+  ["-2.0","-1.55e-2","0.0","0e1"].each do |str|
+    it "should not parse '#{str}'" do
+      parser.should_not parse(str)
+    end    
+  end
+end

data/spec/parsing/numbers/positive_integer_spec.rb

@@ -4,14 +4,25 @@ describe Parsing::PositiveIntegerParser do
   parser = Parsing::PositiveIntegerParser.new
 
   ["1","50","05","502530"].each do |str|
+    res = parser.parse(str)
+    i = str.to_i
+    
     it "should parse '#{str}'" do
-      parser.parse(str).should_not be nil
+      res.should_not be nil
+    end
+
+    it 'should return node that is convertible to integer using #to_i method' do
+      res.to_i.should eq(i)
+    end
+    
+    it 'should return node that is convertible to integer using #to_num method' do
+      res.to_num.should eq(i)
     end
   end
 
   ["0"].each do |str|
     it "should not parse '#{str}'" do
-      parser.parse(str).should be nil
+      parser.should_not parse(str)
     end
   end
 end

data/spec/parsing/numbers/positive_rational_spec.rb

@@ -0,0 +1,28 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe Parsing::PositiveRationalParser do
+  parser = Parsing::PositiveRationalParser.new
+
+  ["1/2","50/50","050/003","502530/1","01/1"].each do |str|
+    res = parser.parse(str)
+    r = str.to_r
+    
+    it "should parse '#{str}'" do
+      res.should_not be nil
+    end
+
+    it 'should return node that is convertible to rational using #to_r method' do
+      res.to_r.should eq(r)
+    end
+    
+    it 'should return node that is convertible to rational using #to_num method' do
+      res.to_num.should eq(r)
+    end
+  end
+
+  ["0/0","0/10","0000/1"].each do |str|
+    it "should not parse '#{str}'" do
+      parser.should_not parse(str)
+    end
+  end
+end

data/spec/parsing/tempo_parsing_spec.rb

@@ -0,0 +1,21 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Parsing::TempoParser do
+  parser = Parsing::TempoParser.new
+  
+  [120,200,2.5,Rational(1,2),1.55e2].each do |val|
+    [:bpm,:qnpm,:npm,:nps].each do |type|
+      tempo = Tempo.const_get(type.upcase).new(val)
+      str = tempo.to_s
+      res = parser.parse(str)
+      
+      it "should parse #{str}" do
+        res.should_not be nil
+      end
+      
+      it 'should produce node that converts to back to original tempo via #to_tempo' do
+        res.to_tempo.should eq(tempo)
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: music-transcription
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.19.0
 platform: ruby
 authors:
 - James Tunnell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -174,19 +174,21 @@ files:
 - lib/music-transcription/model/change.rb
 - lib/music-transcription/model/dynamics.rb
 - lib/music-transcription/model/link.rb
+- lib/music-transcription/model/measure_score.rb
 - lib/music-transcription/model/meter.rb
 - lib/music-transcription/model/meters.rb
 - lib/music-transcription/model/note.rb
+- lib/music-transcription/model/note_score.rb
 - lib/music-transcription/model/part.rb
 - lib/music-transcription/model/pitch.rb
 - lib/music-transcription/model/pitches.rb
 - 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/measure_score_packing.rb
+- lib/music-transcription/packing/note_score_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
@@ -207,30 +209,39 @@ files:
 - 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_float_parsing.rb
+- lib/music-transcription/parsing/numbers/positive_float_parsing.treetop
 - lib/music-transcription/parsing/numbers/positive_integer_parsing.rb
 - lib/music-transcription/parsing/numbers/positive_integer_parsing.treetop
+- lib/music-transcription/parsing/numbers/positive_rational_parsing.rb
+- lib/music-transcription/parsing/numbers/positive_rational_parsing.treetop
+- lib/music-transcription/parsing/parseable.rb
 - 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/segment_parsing.rb
 - lib/music-transcription/parsing/segment_parsing.treetop
+- lib/music-transcription/parsing/tempo_parsing.rb
+- lib/music-transcription/parsing/tempo_parsing.treetop
 - lib/music-transcription/validatable.rb
 - lib/music-transcription/version.rb
 - music-transcription.gemspec
 - spec/model/change_spec.rb
 - spec/model/link_spec.rb
+- spec/model/measure_score_spec.rb
 - spec/model/meter_spec.rb
+- spec/model/note_score_spec.rb
 - spec/model/note_spec.rb
 - spec/model/part_spec.rb
 - spec/model/pitch_spec.rb
 - spec/model/program_spec.rb
-- spec/model/score_spec.rb
 - spec/model/tempo_spec.rb
 - spec/music-transcription_spec.rb
 - spec/packing/change_packing_spec.rb
+- spec/packing/measure_score_packing_spec.rb
+- spec/packing/note_score_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
@@ -243,10 +254,13 @@ files:
 - 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_float_spec.rb
 - spec/parsing/numbers/positive_integer_spec.rb
+- spec/parsing/numbers/positive_rational_spec.rb
 - spec/parsing/pitch_node_spec.rb
 - spec/parsing/pitch_parsing_spec.rb
 - spec/parsing/segment_parsing_spec.rb
+- spec/parsing/tempo_parsing_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/jamestunnell/music-transcription
 licenses:
@@ -276,18 +290,20 @@ summary: Classes for representing music notational features like pitch, note, lo
 test_files:
 - spec/model/change_spec.rb
 - spec/model/link_spec.rb
+- spec/model/measure_score_spec.rb
 - spec/model/meter_spec.rb
+- spec/model/note_score_spec.rb
 - spec/model/note_spec.rb
 - spec/model/part_spec.rb
 - spec/model/pitch_spec.rb
 - spec/model/program_spec.rb
-- spec/model/score_spec.rb
 - spec/model/tempo_spec.rb
 - spec/music-transcription_spec.rb
 - spec/packing/change_packing_spec.rb
+- spec/packing/measure_score_packing_spec.rb
+- spec/packing/note_score_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
@@ -300,9 +316,12 @@ test_files:
 - 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_float_spec.rb
 - spec/parsing/numbers/positive_integer_spec.rb
+- spec/parsing/numbers/positive_rational_spec.rb
 - spec/parsing/pitch_node_spec.rb
 - spec/parsing/pitch_parsing_spec.rb
 - spec/parsing/segment_parsing_spec.rb
+- spec/parsing/tempo_parsing_spec.rb
 - spec/spec_helper.rb
 has_rdoc: