musicality 0.9.0 → 0.10.0

data/spec/notation/parsing/note_node_spec.rb

@@ -88,9 +88,9 @@ describe Parsing::NoteNode do
   end
 
   context 'with marks' do
-    [[BEGIN_SLUR],[BEGIN_SLUR, BEGIN_TRIPLET],[BEGIN_TRIPLET]].each do |begin_marks|
+    [[BEGIN_SLUR],[]].each do |begin_marks|
       begin_marks_str = begin_marks.map {|m| m.to_s}.join
-      [[END_SLUR],[END_SLUR, END_TRIPLET],[END_TRIPLET]].each do |end_marks|
+      [[END_SLUR],[]].each do |end_marks|
         end_marks_str = end_marks.map {|m| m.to_s}.join
         describe '#to_note' do
           it 'should produce a Note with marks set correctly' do

data/spec/notation/parsing/note_parsing_spec.rb

@@ -12,7 +12,7 @@ describe Parsing::NoteParser do
     'with articulation' => ['/4C2.',"5/3Db3,Bb2,E5.",'/2D3,F4_'],
     'with accent' => ['/4C2','3/2Db3,Bb4'],
     'with links' => ['/2C2~','/2C2:D2','/4D4:E4,G4;A5.'],
-    'with marks' => ['(3/4Bb3]', '[/2F3,G3)', '[(2/4C3', '([1B2', '/3B2,C2)]', '2/3D4])'],
+    'with marks' => ['(3/4Bb3', '/2F3,G3)', '(2/4C3', '(1B2', '/3B2,C2)', '(2/3D4)'],
     'with single pitch + articulation + link + accent' => [
       '(3/4D2~','5/8F2;G2.','/8Db4:Db5','/3G4;B4_'],
     'with multiple pitches + articulation + links + accent' => [
@@ -23,8 +23,8 @@ describe Parsing::NoteParser do
     'duration + accent + link' => ['1/4;','/2:','2/3~'],
     'single pith with bad letter' => ['5/3Hb3'],
     'single pitch without octave' => ['/33E)'],
-    'begins marks at the end' => ['1Bb3(', '2Bb3['],
-    'end marks at the beginning ' => [']1B5', ')3C3']
+    'begins marks at the end' => ['1Bb3('],
+    'end marks at the beginning ' => [')3C3']
   }
   
   valid_cases.each do |descr, strs|

data/spec/performance/conversion/note_sequence_extractor_spec.rb

@@ -221,5 +221,28 @@ describe NoteSequenceExtractor do
         @seqs[0].duration.should be <= (@notes[0].duration + @notes[1].duration)
       end
     end
+
+    context 'three notes with single pitch, tie between first two, portamento between last two' do
+      before :all do
+        @notes = "/8Eb4~ /8Eb4:C5 3/4C5".to_notes
+        @seqs = NoteSequenceExtractor.new(@notes).extract_sequences
+      end
+
+      it 'should produce a single sequence' do
+        expect(@seqs.size).to eq(1)
+      end
+
+      it 'should have same full duration as the notes together' do
+        expected_dur = @notes.map {|n| n.duration }.inject(0,:+)
+        seq = @seqs.first
+        expect(seq.full_duration).to eq(expected_dur)
+      end
+
+      it 'should have duration less than the notes together' do
+        max_dur = @notes.map {|n| n.duration }.inject(0,:+)
+        seq = @seqs.first
+        expect(seq.duration).to be < max_dur
+      end
+    end
   end
 end

data/spec/performance/model/note_sequence_spec.rb

@@ -15,11 +15,10 @@ describe NoteSequence do
   end
 
   before :all do
-    @element_arys = [
-      [ NoteSequence::Element.new(0.5, B2, Attack::NONE) ],
-      [ NoteSequence::Element.new(0.5, A2, Attack::NORMAL), 
-        NoteSequence::Element.new(0.5, B2, Attack::NONE),
-        NoteSequence::Element.new(0.5, B2, Attack::ACCENT) ],
+    @element_ary = [
+      NoteSequence::Element.new(0.5, A2, Attack::NORMAL), 
+      NoteSequence::Element.new(0.5, B2, Attack::NONE),
+      NoteSequence::Element.new(0.5, B2, Attack::ACCENT)
     ]
     @offsets = [ 0, -5, 7, 77 ]
   end
@@ -37,7 +36,7 @@ describe NoteSequence do
     context 'with at least one element' do
       it 'should return offsets of each element' do
         @offsets.each do |offset|
-          @element_arys.each do |els|
+          @element_ary.combination(@element_ary.size-1).each do |els|
             seq = NoteSequence.new(offset, Separation::NORMAL, els)
             offsets = seq.offsets
             expect(offsets.size).to eq(els.size)
@@ -51,4 +50,49 @@ describe NoteSequence do
       end
     end
   end
+
+  describe '#stop' do
+    context 'no elements' do
+      it 'should raise RuntimeError' do
+        ns = NoteSequence.new(1.2, Separation::NORMAL, [])
+        expect { ns.stop }.to raise_error(RuntimeError)
+      end
+    end
+  end
+
+  describe '#duration' do
+    context 'no elements' do
+      it 'should raise RuntimeError' do
+        ns = NoteSequence.new(1.2, Separation::NORMAL, [])
+        expect { ns.duration }.to raise_error(RuntimeError)
+      end
+    end
+  end
+
+  describe '#full_duration' do
+    context 'no elements' do
+      it 'should return 0' do
+        ns = NoteSequence.new(1.2, Separation::NORMAL, [])
+        expect(ns.full_duration).to eq(0)
+      end
+    end
+
+    context 'with one element' do
+      it 'should return element duration' do
+        @element_ary.each do |el|
+          ns = NoteSequence.new(1.2, Separation::NORMAL, [el])
+          expect(ns.full_duration).to eq(el.duration)
+        end
+      end
+    end
+
+    context 'with multiple elements' do
+      it 'should return the sum of element durations' do
+        els = [ NoteSequence::Element.new(0.5, D4, Attack::NORMAL),
+          NoteSequence::Element.new(0.25, F3, Attack::TENUTO) ]
+        ns = NoteSequence.new(1.2, Separation::NORMAL, els)
+        expect(ns.full_duration).to eq(0.75)
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: musicality
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - James Tunnell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-01 00:00:00.000000000 Z
+date: 2016-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,20 +108,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.5'
-- !ruby/object:Gem::Dependency
-  name: ruby-osc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.4'
 description: "The library is based around an abstract representation for music notation.
   \\\n                          From here, functions are built up to make composing
   elaborate pieces in this notation representation more manageable. \\\n                          Finally,
@@ -175,7 +161,6 @@ files:
 - lib/musicality/composition/util/repeating_sequence.rb
 - lib/musicality/errors.rb
 - lib/musicality/notation/conversion/change_conversion.rb
-- lib/musicality/notation/conversion/measure_note_map.rb
 - lib/musicality/notation/conversion/note_time_converter.rb
 - lib/musicality/notation/conversion/score_conversion.rb
 - lib/musicality/notation/conversion/score_converter.rb
@@ -288,6 +273,7 @@ files:
 - lib/musicality/version.rb
 - musicality.gemspec
 - spec/composition/convenience_methods_spec.rb
+- spec/composition/dsl/score_methods_spec.rb
 - spec/composition/generation/random_rhythm_generator_spec.rb
 - spec/composition/model/pitch_class_spec.rb
 - spec/composition/model/pitch_classes_spec.rb
@@ -301,7 +287,6 @@ files:
 - spec/composition/util/repeating_sequence_spec.rb
 - spec/musicality_spec.rb
 - spec/notation/conversion/change_conversion_spec.rb
-- spec/notation/conversion/measure_note_map_spec.rb
 - spec/notation/conversion/note_time_converter_spec.rb
 - spec/notation/conversion/score_conversion_spec.rb
 - spec/notation/conversion/score_converter_spec.rb
@@ -374,6 +359,7 @@ specification_version: 4
 summary: Music notation, composition, and performance
 test_files:
 - spec/composition/convenience_methods_spec.rb
+- spec/composition/dsl/score_methods_spec.rb
 - spec/composition/generation/random_rhythm_generator_spec.rb
 - spec/composition/model/pitch_class_spec.rb
 - spec/composition/model/pitch_classes_spec.rb
@@ -387,7 +373,6 @@ test_files:
 - spec/composition/util/repeating_sequence_spec.rb
 - spec/musicality_spec.rb
 - spec/notation/conversion/change_conversion_spec.rb
-- spec/notation/conversion/measure_note_map_spec.rb
 - spec/notation/conversion/note_time_converter_spec.rb
 - spec/notation/conversion/score_conversion_spec.rb
 - spec/notation/conversion/score_converter_spec.rb

data/lib/musicality/notation/conversion/measure_note_map.rb

@@ -1,40 +0,0 @@
-module Musicality
-
-module Conversion
-  # Convert offsets from measure-based to note-based.
-  # @param [Array] measure_offsets Measure offsets to be converted
-  # @param [Hash] measure_durations Map measure durations to measure offsets where the duration takes effect.
-  # @raise [NonZeroError] if first measure duration is not mapped to offset 0
-  def self.measure_note_map measure_offsets, measure_durations
-    mnoff_map = {}
-    moffs = measure_offsets.uniq.sort
-    mdurs = measure_durations.sort
-    cur_noff = 0.to_r
-    j = 0 # next measure offset to be converted
-    
-    if mdurs[0][0] != 0
-      raise NonZeroError, "measure offset of 1st measure duration must be 0, not #{mdurs[0][0]}"
-    end
-    
-    (0...mdurs.size).each do |i|
-      cur_moff, cur_mdur = mdurs[i]
-      if i < (mdurs.size - 1)
-        next_moff = mdurs[i+1][0]        
-      else
-        next_moff = Float::INFINITY
-      end
-      
-      while(j < moffs.size && moffs[j] <= next_moff) do
-        moff = moffs[j]
-        mnoff_map[moff] = cur_noff + (moff - cur_moff)*cur_mdur
-        j += 1
-      end
-      
-      cur_noff += (next_moff - cur_moff) * cur_mdur
-    end
-    
-    return mnoff_map
-  end
-end
-
-end

data/spec/notation/conversion/measure_note_map_spec.rb

@@ -1,73 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
-
-describe 'Conversion.measure_note_map' do
-  before :all do
-    mdurs = Hash[ [[0, (3/4)], [1, (1/2)], [3, (3/4)]] ]
-    @moffs = [ 0, 1, 3, 4, 5, 6, 7, 8, 11, 14, 17, 20, (45/2)]
-    @mnoff_map = Conversion.measure_note_map(@moffs,mdurs)
-  end
-  
-  it 'should return a Hash' do
-    @mnoff_map.should be_a Hash
-  end
-  
-  it 'should have same size as array returned by #measure_offsets' do
-    @mnoff_map.size.should eq(@moffs.size)
-  end
-  
-  it 'should have a key for each offset in the array returned by #measure_offsets' do
-    @mnoff_map.keys.sort.should eq(@moffs)
-  end
-  
-  context 'single measure duration at 0' do
-    it 'should mutiply all measure offsets by start measure duration' do
-      [TWO_FOUR,SIX_EIGHT,FOUR_FOUR,THREE_FOUR].each do |meter|
-        mdur = meter.measure_duration
-        mdurs = { 0 => mdur }
-        tgt = @moffs.map {|moff| moff * mdur}
-        Conversion.measure_note_map(@moffs,mdurs).values.sort.should eq(tgt)
-      end
-    end
-  end
-  
-  context '1 meter change' do
-    before :all do
-      @first_mc_off = 3
-      @start_meter = THREE_FOUR
-      @new_meter = TWO_FOUR
-      @score = Score::Tempo.new(@start_meter, 120,
-        meter_changes: { @first_mc_off => Change::Immediate.new(@new_meter) },
-        tempo_changes: {
-          "1/2".to_r => Change::Gradual.linear(100,1),
-          2 => Change::Immediate.new(120),
-          3 => Change::Immediate.new(100),
-          3.1 => Change::Gradual.linear(100,1),
-          5 => Change::Immediate.new(120),
-          6 => Change::Immediate.new(100),
-        }
-      )
-      @moffs = @score.measure_offsets
-      @mdurs = @score.measure_durations
-      @mnoff_map = Conversion.measure_note_map(@moffs,@mdurs)
-    end
-    
-    it 'should mutiply all measure offsets that occur on or before 1st meter change offset by start measure duration' do
-      moffs = @moffs.select{ |x| x <= @first_mc_off }
-      tgt = moffs.map do |moff|
-        moff * @start_meter.measure_duration
-      end.sort
-      src = @mnoff_map.select {|k,v| k <= @first_mc_off }
-      src.values.sort.should eq(tgt)
-    end
-    
-    it 'should, for any measure offsets occurring after 1st meter change offset, add 1st_meter_change_offset * 1st_measure_duration to \
-        new_measure_duration * (offset - 1st_meter_change_offset)' do
-      moffs = @moffs.select{ |x| x > @first_mc_off }
-      tgt = moffs.map do |moff|
-        @first_mc_off * @start_meter.measure_duration + (moff - @first_mc_off) * @new_meter.measure_duration
-      end.sort
-      src = @mnoff_map.select {|k,v| k > @first_mc_off }
-      src.values.sort.should eq(tgt)
-    end
-  end
-end