musicality 0.11.1 → 0.12.0

data/spec/notation/parsing/convenience_methods_spec.rb

@@ -9,7 +9,7 @@ class_cases = { Duration => {
   Note => {
     '/2' => Note::half,
     '99/10C2' => Note.new('99/10'.to_r, [C2]),
-    '5/2Db4,Eb5.' => Note.new('5/2'.to_r, [Db4,Eb5], articulation:STACCATO) 
+    '5/2Db4,Eb5.' => Note.new('5/2'.to_r, [Db4,Eb5], articulation:STACCATO)
   },
   Pitch => {
     'C2' => C2,
@@ -31,23 +31,23 @@ 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)
+        expect(klass.parse(str)).to 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)
+        expect(klass.split_parse(str)).to 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)
+        expect(klass.split_parse(str,";")).to eq(cases.values)
       end
     end
   end
@@ -64,7 +64,7 @@ end
       describe "\##{method}" do
         it "should return a #{klass}" do
           class_cases[klass].each do |str,tgt|
-            str.send(method).should eq(tgt)
+            expect(str.send(method)).to eq(tgt)
           end
         end
       end
@@ -72,6 +72,45 @@ end
   end
 end
 
+# Failure cases
+describe 'String' do
+  # Duration parsing
+  [:to_d, :to_dur, :to_duration].each do |method|
+    describe "\##{method}" do
+      it "should fail to parse 'A'" do
+        expect { 'A'.send(method) }.to raise_error(ParseError)
+      end
+    end
+  end
+
+  # Pitch parsing
+  [:to_p, :to_pitch].each do |method|
+    describe "\##{method}" do
+      it "should fail to parse '/2'" do
+        expect { '/2'.send(method) }.to raise_error(ParseError)
+      end
+    end
+  end
+
+  # Note parsing
+  [:to_n, :to_note].each do |method|
+    describe "\##{method}" do
+      it "should fail to parse 'A'" do
+        expect { 'A'.send(method) }.to raise_error(ParseError)
+      end
+    end
+  end
+
+  # Meter parsing
+  [:to_meter].each do |method|
+    describe "\##{method}" do
+      it "should fail to parse 'A'" do
+        expect { 'A'.send(method) }.to raise_error(ParseError)
+      end
+    end
+  end
+end
+
 {
   Duration => [:to_ds, :to_durs, :to_durations],
   Pitch => [:to_ps, :to_pitches],
@@ -83,14 +122,14 @@ end
         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)
+            expect(str.send(method)).to 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)
+            expect(str.send(method,";")).to eq(class_cases[klass].values)
           end
         end
       end

data/spec/notation/parsing/duration_nodes_spec.rb

@@ -2,7 +2,7 @@ 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),
@@ -11,17 +11,17 @@ describe Parsing::NumDenNode do
     res = dur_parser.parse(str)
     context str do
       it 'should parse as NumDenNode' do
-        res.should be_a Parsing::NumDenNode
+        expect(res).to be_a Parsing::NumDenNode
       end
 
       describe '#to_r' do
         r = res.to_r
         it 'should produce a Rational' do
-          r.should be_a Rational
+          expect(r).to be_a Rational
         end
-        
+
         it 'should produce value matching input str' do
-          r.should eq tgt
+          expect(r).to eq tgt
         end
       end
     end
@@ -38,17 +38,17 @@ describe Parsing::NumOnlyNode do
     res = dur_parser.parse(str)
     context str do
       it 'should parse as NumOnlyNode' do
-        res.should be_a Parsing::NumOnlyNode
+        expect(res).to be_a Parsing::NumOnlyNode
       end
 
       describe '#to_r' do
         r = res.to_r
         it 'should produce a Rational' do
-          r.should be_a Rational
+          expect(r).to be_a Rational
         end
-        
+
         it 'should produce value matching input str' do
-          r.should eq tgt
+          expect(r).to eq tgt
         end
       end
     end
@@ -65,17 +65,17 @@ describe Parsing::DenOnlyNode do
     res = dur_parser.parse(str)
     context str do
       it 'should parse as DenOnlyNode' do
-        res.should be_a Parsing::DenOnlyNode
+        expect(res).to be_a Parsing::DenOnlyNode
       end
 
       describe '#to_r' do
         r = res.to_r
         it 'should produce a Rational' do
-          r.should be_a Rational
+          expect(r).to be_a Rational
         end
-        
+
         it 'should produce value matching input str' do
-          r.should eq tgt
+          expect(r).to eq tgt
         end
       end
     end

data/spec/notation/parsing/duration_parsing_spec.rb

@@ -6,12 +6,12 @@ describe Parsing::DurationParser 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
@@ -19,7 +19,7 @@ describe Parsing::DurationParser do
           @valid[:numbers].each do |d|
             str = expr.gsub('n',"#{n}")
             str = str.gsub('d',"#{d}")
-            dur_parser.parse(str).should_not be nil
+            expect(dur_parser.parse(str)).to_not be nil
           end
         end
       end
@@ -33,13 +33,13 @@ describe Parsing::DurationParser do
           @valid[:numbers].each do |d|
             str = expr.gsub('n',"#{n}")
             str = str.gsub('d',"#{d}")
-            dur_parser.parse(str).should be nil
+            expect(dur_parser.parse(str)).to 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
@@ -47,13 +47,13 @@ describe Parsing::DurationParser do
           @invalid[:numbers].each do |d|
             str = expr.gsub('n',"#{n}")
             str = str.gsub('d',"#{d}")
-            dur_parser.parse(str).should be nil
+            expect(dur_parser.parse(str)).to 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
@@ -61,10 +61,10 @@ describe Parsing::DurationParser do
           @invalid[:numbers].each do |d|
             str = expr.gsub('n',"#{n}")
             str = str.gsub('d',"#{d}")
-            dur_parser.parse(str).should be nil
+            expect(dur_parser.parse(str)).to be nil
           end
         end
       end
     end
-  end  
+  end
 end

data/spec/notation/parsing/key_parsing_spec.rb

@@ -0,0 +1,19 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe Parsing::KeyParser do
+  before :all do
+    @parser = Parsing::KeyParser.new
+  end
+
+  {
+    "Cmaj" => Musicality::Keys::C_MAJOR,
+    "F#min" => Musicality::Keys::Fs_MINOR,
+    "Fmin" => Musicality::Keys::F_MINOR,
+    "Bbmaj" => Musicality::Keys::Bb_MAJOR
+  }.each do |str, key|
+    it "should parse #{str}" do
+      expect(@parser).to parse(str)
+      expect(str.to_key).to eq(key)
+    end
+  end
+end

data/spec/notation/parsing/link_nodes_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe Parsing::LinkNode do
   parser = Parsing::LinkParser.new
-  
+
   {
     LINK_SYMBOLS[Link::Tie] => Link::Tie.new,
     (LINK_SYMBOLS[Link::Glissando] + Db2.to_s) => Link::Glissando.new(Db2),
@@ -11,19 +11,19 @@ describe Parsing::LinkNode do
     res = parser.parse(str)
     context str do
       it 'should parse as LinkNode' do
-        res.should be_a Parsing::LinkNode
+        expect(res).to 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
+          expect(l).to be_a Link
         end
-        
+
         it 'should produce pitch matching input str' do
-          l.should eq tgt
+          expect(l).to eq tgt
         end
       end
     end
-  end  
+  end
 end

data/spec/notation/parsing/link_parsing_spec.rb

@@ -4,16 +4,16 @@ describe Parsing::LinkParser do
   before :all do
     @parser = Parsing::LinkParser.new
   end
-  
+
   it "should parse #{LINK_SYMBOLS[Link::Tie]}" do
-    @parser.should parse(LINK_SYMBOLS[Link::Tie])
+    expect(@parser).to parse(LINK_SYMBOLS[Link::Tie])
   end
 
   it "should parse #{LINK_SYMBOLS[Link::Glissando]} with target pitch" do
-    @parser.should parse(LINK_SYMBOLS[Link::Glissando] + C3.to_s)
+    expect(@parser).to parse(LINK_SYMBOLS[Link::Glissando] + C3.to_s)
   end
 
   it "should parse #{LINK_SYMBOLS[Link::Portamento]} with target pitch" do
-    @parser.should parse(LINK_SYMBOLS[Link::Portamento] + C3.to_s)
+    expect(@parser).to parse(LINK_SYMBOLS[Link::Portamento] + C3.to_s)
   end
 end

data/spec/notation/parsing/meter_parsing_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe Parsing::MeterParser do
   parser = Parsing::MeterParser.new
-  
+
   {
     '4/4' => FOUR_FOUR,
     '2*3/8' => SIX_EIGHT,
@@ -11,13 +11,13 @@ describe Parsing::MeterParser do
     '3/4' => THREE_FOUR
   }.each do |str,met|
     res = parser.parse(str)
-    
+
     it "should parse #{str}" do
-      res.should_not be nil
+      expect(res).to_not be nil
     end
-    
+
     it 'should produce node that properly converts to meter' do
-      res.to_meter.should eq met
+      expect(res.to_meter).to eq met
     end
   end
 end

data/spec/notation/parsing/note_node_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 NOTE_PARSER = Parsing::NoteParser.new
 
 describe Parsing::NoteNode do
-  context 'rest note' do  
+  context 'rest note' do
     {
       '/2' => Note.new(Rational(1,2)),
       '4/2' => Note.new(Rational(4,2)),
@@ -13,17 +13,17 @@ describe Parsing::NoteNode do
       res = NOTE_PARSER.parse(str)
       context str do
         it 'should parse as NoteNode' do
-          res.should be_a Parsing::NoteNode
+          expect(res).to be_a Parsing::NoteNode
         end
-  
+
         describe '#to_note' do
           n = res.to_note
           it 'should produce a Note' do
-            n.should be_a Note
+            expect(n).to be_a Note
           end
-          
+
           it 'should produce value matching input str' do
-            n.should eq tgt
+            expect(n).to eq tgt
           end
         end
       end
@@ -38,20 +38,20 @@ describe Parsing::NoteNode do
       "56/33B1!" => Note.new(Rational(56,33),[B1],articulation:STACCATISSIMO),
     }.each do |str,tgt|
       res = NOTE_PARSER.parse(str)
-      
+
       context str do
         it 'should parse as `Node' do
-          res.should be_a Parsing::NoteNode
+          expect(res).to be_a Parsing::NoteNode
         end
-  
+
         describe '#to_note' do
           n = res.to_note
           it 'should produce a Note' do
-            n.should be_a Note
+            expect(n).to be_a Note
           end
-          
+
           it 'should produce value matching input str' do
-            n.should eq tgt
+            expect(n).to eq tgt
           end
         end
       end
@@ -69,18 +69,18 @@ describe Parsing::NoteNode do
       res = NOTE_PARSER.parse(str)
       context str do
         it 'should parse as NoteNode' do
-          res.should be_a Parsing::NoteNode
+          expect(res).to be_a Parsing::NoteNode
         end
-  
+
         describe '#to_note' do
           n = res.to_note
 
           it 'should produce a Note' do
-            n.should be_a Note
+            expect(n).to be_a Note
           end
-          
+
           it 'should produce value matching input str' do
-            n.should eq tgt
+            expect(n).to eq tgt
           end
         end
       end
@@ -96,7 +96,7 @@ describe Parsing::NoteNode do
           it 'should produce a Note with marks set correctly' do
             str = "#{begin_marks_str}/4Bb2#{end_marks_str}"
             n = NOTE_PARSER.parse(str).to_note
-            n.marks.should eq(begin_marks+end_marks)
+            expect(n.marks).to eq(begin_marks+end_marks)
           end
         end
       end
@@ -107,7 +107,7 @@ describe Parsing::NoteNode do
     it 'should produce a Note with marks set to []' do
       str = "/4Bb2"
       n = NOTE_PARSER.parse(str).to_note
-      n.marks.should eq([])
+      expect(n.marks).to eq([])
     end
   end
 end

data/spec/notation/parsing/note_parsing_spec.rb

@@ -4,7 +4,7 @@ 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'],
@@ -26,11 +26,11 @@ describe Parsing::NoteParser do
     'begins marks at the end' => ['1Bb3('],
     'end marks at the beginning ' => [')3C3']
   }
-  
+
   valid_cases.each do |descr, strs|
     context(descr + ' (valid)') do
       it 'should parse' do
-        strs.each {|s| @parser.should parse(s) }
+        strs.each {|s| expect(@parser).to parse(s) }
       end
     end
   end
@@ -38,7 +38,7 @@ describe Parsing::NoteParser do
   invalid_cases.each do |descr, strs|
     context(descr + ' (invalid)') do
       it 'should not parse' do
-        strs.each {|s| @parser.should_not parse(s) }
+        strs.each {|s| expect(@parser).to_not parse(s) }
       end
     end
   end

data/spec/notation/parsing/numbers/nonnegative_float_spec.rb

@@ -6,23 +6,23 @@ describe Parsing::NonnegativeFloatParser do
   ["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
-      res.should_not be nil
+      expect(res).to_not be nil
     end
 
     it 'should return node that is convertible to float using #to_f method' do
-      res.to_f.should eq(f)
+      expect(res.to_f).to eq(f)
     end
-    
+
     it 'should return node that is convertible to float using #to_num method' do
-      res.to_num.should eq(f)
+      expect(res.to_num).to eq(f)
     end
   end
-  
+
   ["-1.0","-0e1"].each do |str|
     it "should not parse '#{str}'" do
-      parser.should_not parse(str)
-    end    
+      expect(parser).to_not parse(str)
+    end
   end
 end

data/spec/notation/parsing/numbers/nonnegative_integer_spec.rb

@@ -5,11 +5,11 @@ describe Parsing::NonnegativeIntegerParser do
 
   ["1","50","05","502530","0"].each do |str|
     it "should parse '#{str}'" do
-      parser.parse(str).should_not be nil
+      expect(parser.parse(str)).to_not be nil
     end
   end
 
   it 'should not parse an empty string' do
-    parser.parse("").should be nil
+    expect(parser.parse("")).to be nil
   end
 end

data/spec/notation/parsing/numbers/nonnegative_rational_spec.rb

@@ -5,7 +5,7 @@ describe Parsing::NonnegativeRationalParser do
 
   ["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
+    expect(parser.parse(str)).to_not be nil
     end
   end
 end

data/spec/notation/parsing/numbers/positive_float_spec.rb

@@ -6,23 +6,23 @@ describe Parsing::PositiveFloatParser do
   ["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
+      expect(res).to_not be nil
     end
 
     it 'should return node that is convertible to float using #to_f method' do
-      res.to_f.should eq(f)
+      expect(res.to_f).to eq(f)
     end
-    
+
     it 'should return node that is convertible to float using #to_num method' do
-      res.to_num.should eq(f)
+      expect(res.to_num).to 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    
+      expect(parser).to_not parse(str)
+    end
   end
 end

data/spec/notation/parsing/numbers/positive_integer_spec.rb

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

data/spec/notation/parsing/numbers/positive_rational_spec.rb

@@ -6,23 +6,23 @@ describe Parsing::PositiveRationalParser do
   ["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
+      expect(res).to_not be nil
     end
 
     it 'should return node that is convertible to rational using #to_r method' do
-      res.to_r.should eq(r)
+      expect(res.to_r).to eq(r)
     end
-    
+
     it 'should return node that is convertible to rational using #to_num method' do
-      res.to_num.should eq(r)
+      expect(res.to_num).to eq(r)
     end
   end
 
   ["0/0","0/10","0000/1"].each do |str|
     it "should not parse '#{str}'" do
-      parser.should_not parse(str)
+      expect(parser).to_not parse(str)
     end
   end
 end

data/spec/notation/parsing/pitch_node_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe Parsing::PitchNode do
   parser = Parsing::PitchParser.new
-  
+
   {
     'C4' => C4,
     'Db2' => Db2,
@@ -19,19 +19,19 @@ describe Parsing::PitchNode do
     res = parser.parse(str)
     context str do
       it 'should parse as PitchNode' do
-        res.should be_a Parsing::PitchNode
+        expect(res).to 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
+          expect(p).to be_a Pitch
         end
-        
+
         it 'should produce pitch matching input str' do
-          p.should eq tgt
+          expect(p).to eq tgt
         end
       end
     end
-  end  
+  end
 end