music-utils 1.0.2 → 1.1.0

data/CHANGELOG.md

@@ -1,8 +1,17 @@
+## 1.1.0 (May 19, 2011)
+
+Features:
+
+  - Added functionality to create major and minor scales
+  - Minor performance improvement to qualify intervals
+  
+
 ## 1.0.2 (May 12, 2011)
 
 Features:
 
   - Fixed do-sol bug
+  - Fixed bug on 6th number quality
   
 
 ## 1.0.1 (May 6, 2011)

data/README.md

@@ -1,30 +1,25 @@
 music-utils
 =========
 
-Utils for music. At the moment only to classify interval.
+Utils for music. For now to classify music intervals and create scales.
 
 Examples
 --------
-Simple intervals:
+Simple and Compound intervals:
   
-  * MusicUtils.number('do', 'mi')         #=> 3 (3th)
-  * MusicUtils.semitones('do', 'mi')      #=> 4 (semi-tones)
-  * MusicUtils.quality('do', 'mi')        #=> M (major)
-  * MusicUtils.quality('do#', 'mi')       #=> m (minor)
-
-Compound intervals:
-  
-  * MusicUtils.number('do', 'mi', 1)      #=> 10 (10th)
-  * MusicUtils.semitones('do', 'mi', 1)   #=> 16 (semi-tones)
-  * MusicUtils.quality('do', 'mi', 1)     #=> M (major)
-  * MusicUtils.quality('dob', 'mi#', 1)   #=> AA (augmented plus)
+    MusicUtils.number(:do, :mi)                 #=> 3 (3th)
+    MusicUtils.semitones(:do, :mi, 1)           #=> 16 (semi-tones)
+    MusicUtils.quality(:do, :mi)                #=> M (major)
 
 Short Notation:
 
-  * MusicUtils.short('do', 're')          #=> M2
-  * MusicUtils.short('do', 're', 1)       #=> M9
-  * MusicUtils.short('do#', 'mi')         #=> m3
-  * MusicUtils.short('do#', 'mi', 1)      #=> m10
+    MusicUtils.short(:do, :re)                  #=> M2
+    MusicUtils.short(:do, :re, 1)               #=> M9
+
+Create scales:
+
+    MusicUtils.scale(:fa, MusicUtils::MAJ_SCALE) #=> [:fa, :sol, :la, :sib, :do, :re, :mi]
+
 
 Installation
 -----------

data/Rakefile

@@ -26,4 +26,10 @@ Bundler::GemHelper.install_tasks
 desc "Clean automatically generated files"
 task :clean do
   FileUtils.rm_rf "pkg"
-end
+end
+
+# Profiler tasks
+desc "Run profiler"
+task :profile do
+  `ruby -w -rprofile benchmark/music-utils_bm.rb 10000`
+end

data/benchmark/music-utils_bm.rb

@@ -4,27 +4,36 @@ require 'music-utils'
 require 'music-utils/scales/scales'
 require 'benchmark'
 
-n = 100_000
+n = (ARGV[0].to_i != 0) ? ARGV[0].to_i : 100000
 label_width = 60
 
+# Helper method to print benchmarks titles 
+def title(desc, n)
+  puts '-' * 105
+  puts desc + ' ' + n.to_s + ' times: '
+end
+
+# Benchmarks
+
+title 'Classifying do-mi interval', n
 Benchmark.bm(label_width) do |b|
-  b.report('Classifying do-mi interval with strings (number):') do 
+  b.report('with strings (number):') do 
     n.times { MusicUtils.number('do', 'mi') }
   end
-  b.report('Classifying do-mi interval with strings (quality):') do 
+  b.report('with strings (quality):') do 
     n.times { MusicUtils.quality('do', 'mi') }
   end
-  b.report('Classifying do-mi interval with strings (short notation):') do 
+  b.report('with strings (short notation):') do 
     n.times { MusicUtils.short('do', 'mi') }
   end
   
-  b.report('Classifying do-mi interval with scales (number):') do
+  b.report('with scales (number):') do
     n.times { MusicUtils.number(Scales::DO, Scales::MI) }
   end
-  b.report('Classifying do-mi interval with scales (quality):') do
+  b.report('with scales (quality):') do
     n.times { MusicUtils.quality(Scales::DO, Scales::MI) }
   end
-  b.report('Classifying do-mi interval with scales (short notation):') do
+  b.report('with scales (short notation):') do
     n.times { MusicUtils.short(Scales::DO, Scales::MI) }
   end
 end

data/lib/music-utils.rb

@@ -24,5 +24,10 @@ module MusicUtils
   def MusicUtils.short(note1, note2, step = 0)
     Interval.new(note1, note2, step).short
   end
+  
+  # Returns a scale 
+  def MusicUtils.scale(from, scale)
+    Scales.scale(from, scale)
+  end
 
 end

data/lib/music-utils/interval/interval.rb

@@ -1,30 +1,18 @@
 require 'music-utils/scales/scales'
+require 'music-utils/note/note'
 
-# This class represents a music interval
 module MusicUtils
   
+  # This class represents a music interval
   class Interval
     include Scales
   
     def initialize(note1, note2, step)
-      
-      # SOL is the only note of length = 3
-      n = 0
-      n += 1 if note1[0..2].to_sym == SOL
-
-      @note1 = note1[0..1 + n].to_sym 
-      @note1_alt = note1[2 + n..3 + n]
-  
-      # SOL is the only note of length = 3
-      n = 0
-      n += 1 if note2[0..2].to_sym == SOL
-
-      @note2 = note2[0..1 + n].to_sym
-      @note2_alt = note2[2 + n..3 + n]
-      
+      @note1, @note1_alt = MusicUtils::Note.parse(note1)
+      @note2, @note2_alt = MusicUtils::Note.parse(note2)
       @step = step
     end
-  
+    
     # It classifies the diatonic interval
     def number
       # initialize counter and index of scale
@@ -61,16 +49,20 @@ module MusicUtils
       count = count + (12 * @step) if @step > 0
       
       # counting notes alterations
-      count += 1 if @note1_alt == Scales::FLAT
-      coutn += 2 if @note1_alt == Scales::DFLAT
-      count -= 1 if @note1_alt == Scales::SHARP
-      count -= 1 if @note1_alt == Scales::DSHARP
-  
-      count -= 1 if @note2_alt == Scales::FLAT
-      count -= 2 if @note2_alt == Scales::DFLAT
-      count += 1 if @note2_alt == Scales::SHARP
-      count -= 2 if @note2_alt == Scales::DSHARP
-  
+      case @note1_alt
+        when Scales::FLAT   ; count += 1
+        when Scales::SHARP  ; count -= 1
+        when Scales::DFLAT  ; count += 2
+        when Scales::DSHARP ; count -= 2
+      end
+
+      case @note2_alt
+        when Scales::FLAT   ; count -= 1
+        when Scales::SHARP  ; count += 1
+        when Scales::DFLAT  ; count -= 2
+        when Scales::DSHARP ; count += 2
+      end
+
       count
     end
     
@@ -90,10 +82,11 @@ module MusicUtils
   
     # Common loop to search note 2 
     def until_find_note2(i)
+      length = DIATONIC_SCALE.length
       # search note2
       while DIATONIC_SCALE[i] != @note2
         i += 1
-        if i > DIATONIC_SCALE.length
+        if i > length
           i = 0; next 
         end
         yield i
@@ -112,7 +105,7 @@ module MusicUtils
     def note1_index
       DIATONIC_SCALE.index(@note1)
     end
-  
+    
   end
   
 end

data/lib/music-utils/note/note.rb

@@ -0,0 +1,21 @@
+module MusicUtils
+
+  # Represents a music note
+  class Note
+  
+    # Parse notes to obtaining the raw note and its alterations separately
+    def self.parse(note)
+      n = 0
+  
+      # SOL is the only note of length = 3
+      n += 1 if note[0..2].to_sym == MusicUtils::SOL
+      
+      note_aux = note[0..1 + n].to_sym
+      note_alt = note[2 + n..3 + n]
+    
+      [note_aux, note_alt]
+    end      
+  
+  end
+
+end

data/lib/music-utils/scales/scales.rb

@@ -1,3 +1,5 @@
+require 'music-utils/note/note'
+
 # Scales module
 module Scales
   
@@ -11,49 +13,54 @@ module Scales
   SI  = :si
   
   DIATONIC_SCALE = [DO, RE, MI, FA, SOL, LA, SI]
-
+  
   # Alterations:
-  FLAT    = 'b'
+  FLAT    = 'f'
   DFLAT   = FLAT + FLAT
-  SHARP   = '#'
+  SHARP   = 's'
   DSHARP  = SHARP + SHARP
 
   # Altered notes
-  DOF   = DO.to_s + FLAT
-  DOFF  = DO.to_s + DFLAT
-  DOS   = DO.to_s + SHARP
-  DOSS  = DO.to_s + DSHARP
+  DOF   = (DO.to_s + FLAT).to_sym
+  DOFF  = (DO.to_s + DFLAT).to_sym
+  DOS   = (DO.to_s + SHARP).to_sym
+  DOSS  = (DO.to_s + DSHARP).to_sym
   
-  REF   = RE.to_s + FLAT
-  REFF  = RE.to_s + DFLAT
-  RES   = RE.to_s + SHARP
-  RESS  = RE.to_s + DSHARP
+  REF   = (RE.to_s + FLAT).to_sym
+  REFF  = (RE.to_s + DFLAT).to_sym
+  RES   = (RE.to_s + SHARP).to_sym
+  RESS  = (RE.to_s + DSHARP).to_sym
   
-  MIF   = MI.to_s + FLAT
-  MIFF  = MI.to_s + DFLAT
-  MIS   = MI.to_s + SHARP
-  MISS  = MI.to_s + DSHARP
+  MIF   = (MI.to_s + FLAT).to_sym
+  MIFF  = (MI.to_s + DFLAT).to_sym
+  MIS   = (MI.to_s + SHARP).to_sym
+  MISS  = (MI.to_s + DSHARP).to_sym
   
-  FAF   = FA.to_s + FLAT
-  FAFF  = FA.to_s + DFLAT
-  FAS   = FA.to_s + SHARP
-  FASS  = FA.to_s + DSHARP
+  FAF   = (FA.to_s + FLAT).to_sym
+  FAFF  = (FA.to_s + DFLAT).to_sym
+  FAS   = (FA.to_s + SHARP).to_sym
+  FASS  = (FA.to_s + DSHARP).to_sym
   
-  SOLF   = SOL.to_s + FLAT
-  SOLFF  = SOL.to_s + DFLAT
-  SOLS   = SOL.to_s + SHARP
-  SOLSS  = SOL.to_s + DSHARP
+  SOLF  = (SOL.to_s + FLAT).to_sym
+  SOLFF = (SOL.to_s + DFLAT).to_sym
+  SOLS  = (SOL.to_s + SHARP).to_sym
+  SOLSS = (SOL.to_s + DSHARP).to_sym
 
-  LAF   = LA.to_s + FLAT
-  LAFF  = LA.to_s + DFLAT
-  LAS   = LA.to_s + SHARP
-  LASS  = LA.to_s + DSHARP
+  LAF   = (LA.to_s + FLAT).to_sym
+  LAFF  = (LA.to_s + DFLAT).to_sym
+  LAS   = (LA.to_s + SHARP).to_sym
+  LASS  = (LA.to_s + DSHARP).to_sym
 
-  SIF   = SI.to_s + FLAT
-  SIFF  = SI.to_s + DFLAT
-  SIS   = SI.to_s + SHARP
-  SISS  = SI.to_s + DSHARP
+  SIF   = (SI.to_s + FLAT).to_sym
+  SIFF  = (SI.to_s + DFLAT).to_sym
+  SIS   = (SI.to_s + SHARP).to_sym
+  SISS  = (SI.to_s + DSHARP).to_sym
 
+  CROMATIC_SCALE = [[SIS, DO, REFF], [DOS, REF], [DOSS, RE, MIFF], [RES, MIF, FAFF], [RESS, MI, FAF], [MIS, FA, SOLFF], [MISS, FAS, SOLF], [FASS, SOL, LAFF], [SOLS, LAF], [SOLSS, LA, SIFF], [LAS, SIF], [LASS, SI, DOF]]
+  MAJ_SCALE = [2, 2, 1, 2, 2, 2, 1]
+  NATURAL_MIN_SCALE = [2, 1, 2, 2, 1, 2, 2]
+  MELODIC_MIN_SCALE = [2, 1, 2, 2, 1, 2, 1]
+  
   # Qualities
   PERF = 'P'
   MAJ = 'M'
@@ -73,5 +80,71 @@ module Scales
         7 => {8 => DIMP, 9 => DIM, 10 => MIN, 11 => MAJ, 12 => AUG, 13 => AUGP},
         8 => {10 => DIMP, 11 => DIM, 12 => PERF, 13 => AUG, 14 => AUGP}
       }
+  
+  # Create scale from a note and scale structure    
+  def Scales.scale(from, scale_struct)
+    from = from.to_sym
+    
+    i = 0
+    find_it = false
+    CROMATIC_SCALE.each do |e|
+      if e.is_a?(Array)
+        e.each do |ee|
+          find_it = true if from == ee
+        end
+      else
+        find_it = true if from == e
+      end
+      break if find_it
+      i += 1
+    end
+    
+    scale = []
+    scale << from
+
+    from_note, from_alter = MusicUtils::Note.parse(from)
+    
+    diatonic_scale = diatonic_scale_from(from_note)
+    diatonic_scale.delete(from_note)
+
+    length = CROMATIC_SCALE.length
+
+    scale_struct.each do |shift|
+      if i + shift > length - 1
+        i = (i + shift) - (length)
+        shift = 0
+      end
+
+      CROMATIC_SCALE[i + shift].each do |e|
+        e_note, e_alter = MusicUtils::Note.parse(e)
+          
+        if diatonic_scale.first == e_note
+          scale << e
+          diatonic_scale.delete(diatonic_scale.first)
+          break
+        end 
+      end
+      i += shift
+    end
+
+    scale
+  end
+  
+  # Create a diatonic scale starting with the  "from" note
+  def Scales.diatonic_scale_from(from)
+    diatonic_scale = []
+    length = DIATONIC_SCALE.length
+    i = DIATONIC_SCALE.index(from)
+    c = 0
+    while c < length
+      diatonic_scale << DIATONIC_SCALE[i]
+      i += 1
+      c += 1
+      if i > length - 1
+        i = 0
+      end 
+    end
+    diatonic_scale
+  end
 
 end

data/lib/music-utils/version.rb

@@ -1,3 +1,3 @@
 module MusicUtils
-  VERSION = '1.0.2'
+  VERSION = '1.1.0'
 end

data/spec/interval/interval_spec.rb

@@ -27,7 +27,7 @@ describe  MusicUtils::Interval do
     end
 
     it "simple interval dob-mi# should be 6 semitones" do
-      i = Interval.new('dob', 'mi#', 0)
+      i = Interval.new('dof', 'mis', 0)
       i.semitones.should == 6
     end
 
@@ -54,12 +54,12 @@ describe  MusicUtils::Interval do
     end
   
     it "quality of interval do#-mi should be m" do
-      i = Interval.new('do#', 'mi', 0)
+      i = Interval.new('dos', 'mi', 0)
       i.quality.should == 'm'
     end
 
     it "quality of interval do#-mi should be m" do
-      i = Interval.new('do#', 'mi', 0)
+      i = Interval.new('dos', 'mi', 0)
       i.quality.should == 'm'
     end
 
@@ -69,7 +69,7 @@ describe  MusicUtils::Interval do
     end
 
     it "quality of compound interval dob-mi# should be AA" do
-      i = Interval.new('dob', 'mi#', 1)
+      i = Interval.new('dof', 'mis', 1)
       i.quality.should == 'AA'
     end
   
@@ -92,12 +92,12 @@ describe  MusicUtils::Interval do
     end
 
     it "the short notation of do#-mi interval should be m3" do
-      i = Interval.new('do#', 'mi', 0)
+      i = Interval.new('dos', 'mi', 0)
       i.short.should == 'm3'
     end
   
     it "the short notation of do#-mi compound interval should be m10" do
-      i = Interval.new('do#', 'mi', 1)
+      i = Interval.new('dos', 'mi', 1)
       i.short.should == 'm10'
     end
 

data/spec/music-utils_spec.rb

@@ -6,29 +6,131 @@ describe MusicUtils do
   context "Intervals" do
 
     context "By number" do
-      it "the number of simple interval do-mi should be a 3rd" do
-        MusicUtils.number(DO, MI).should == 3
-      end
-      it "the number of do-mi compound interval should be a 10th" do
-        MusicUtils.number(DO, MI, 1).should == 10
+      context "Diatonic from DO" do
+        it "the number of simple interval do-re should be a 2th" do
+          MusicUtils.number(DO, RE).should == 2
+        end
+        it "the number of do-re compound interval should be a 9th" do
+          MusicUtils.number(DO, RE, 1).should == 9
+        end
+        it "the number of simple interval do-mi should be a 3rd" do
+          MusicUtils.number(DO, MI).should == 3
+        end
+        it "the number of do-mi compound interval should be a 10th" do
+          MusicUtils.number(DO, MI, 1).should == 10
+        end
+        it "the number of simple interval do-fa should be a 4th" do
+          MusicUtils.number(DO, FA).should == 4
+        end
+        it "the number of do-fa compound interval should be a 11th" do
+          MusicUtils.number(DO, FA, 1).should == 11
+        end
+        it "the number of simple interval do-sol should be a 5th" do
+          MusicUtils.number(DO, SOL).should == 5
+        end
+        it "the number of do-sol compound interval should be a 12th" do
+          MusicUtils.number(DO, SOL, 1).should == 12
+        end
+        it "the number of simple interval do-la should be a 6th" do
+          MusicUtils.number(DO, LA).should == 6
+        end
+        it "the number of do-la compound interval should be a 13th" do
+          MusicUtils.number(DO, LA, 1).should == 13
+        end
+        it "the number of simple interval do-si should be a 7th" do
+          MusicUtils.number(DO, SI).should == 7
+        end
+        it "the number of do-si compound interval should be a 14th" do
+          MusicUtils.number(DO, SI, 1).should == 14
+        end
+        it "the number of simple interval do-do should be a 8th" do
+          MusicUtils.number(DO, DO).should == 8
+        end
+        it "the number of do-do compound interval should be a 15th" do
+          MusicUtils.number(DO, DO, 1).should == 15
+        end
       end
     end
       
-    context "By semitones" do  
-      it "simple interval do-mi should be 4 semitones" do
-        MusicUtils.semitones(DO, MI).should == 4
-      end
-      it "compound interval do-mi should be 16 semitones" do
-        MusicUtils.semitones(DO, MI, 1).should == 16
+    context "By semitones" do
+      context "Diatonic from DO" do
+        it "simple interval do-re should be 2 semitones" do
+          MusicUtils.semitones(DO, RE).should == 2
+        end
+        it "compound interval do-re should be 14 semitones" do
+          MusicUtils.semitones(DO, RE, 1).should == 14
+        end
+        it "simple interval do-mi should be 4 semitones" do
+          MusicUtils.semitones(DO, MI).should == 4
+        end
+        it "compound interval do-mi should be 16 semitones" do
+          MusicUtils.semitones(DO, MI, 1).should == 16
+        end
+        it "simple interval do-fa should be 5 semitones" do
+          MusicUtils.semitones(DO, FA).should == 5
+        end
+        it "compound interval do-fa should be 17 semitones" do
+          MusicUtils.semitones(DO, FA, 1).should == 17 
+        end
+        it "simple interval do-sol should be 7 semitones" do
+          MusicUtils.semitones(DO, SOL).should == 7
+        end
+        it "compound interval do-sol should be 17 semitones" do
+          MusicUtils.semitones(DO, SOL, 1).should == 19 
+        end
+        it "simple interval do-la should be 9 semitones" do
+          MusicUtils.semitones(DO, LA).should == 9
+        end
+        it "compound interval do-la should be 21 semitones" do
+          MusicUtils.semitones(DO, LA, 1).should == 21 
+        end
+        it "simple interval do-si should be 11 semitones" do
+          MusicUtils.semitones(DO, SI).should == 11
+        end
+        it "compound interval do-si should be 21 semitones" do
+          MusicUtils.semitones(DO, SI, 1).should == 23 
+        end
       end
     end
     
-    context "By quality" do  
-      it "quality of interval do-mi should be M" do
-        MusicUtils.quality(DO, MI).should == 'M'
-      end
-      it "quality of compound interval do-mi should be M" do
-        MusicUtils.quality(DO, MI, 1).should == 'M'
+    context "By quality" do
+      context "Diatonic from DO" do
+        it "quality of interval do-re should be M" do
+          MusicUtils.quality(DO, RE).should == 'M'
+        end
+        it "quality of compound interval do-re should be M" do
+          MusicUtils.quality(DO, RE, 1).should == 'M'
+        end
+        it "quality of interval do-mi should be M" do
+          MusicUtils.quality(DO, MI).should == 'M'
+        end
+        it "quality of compound interval do-mi should be M" do
+          MusicUtils.quality(DO, MI, 1).should == 'M'
+        end
+        it "quality of interval do-fa should be P" do
+          MusicUtils.quality(DO, FA).should == 'P'
+        end
+        it "quality of compound interval do-fa should be P" do
+          MusicUtils.quality(DO, FA, 1).should == 'P'
+        end
+        it "quality of interval do-sol should be P" do
+          MusicUtils.quality(DO, SOL).should == 'P'
+        end
+        it "quality of compound interval do-sol should be P" do
+          MusicUtils.quality(DO, SOL, 1).should == 'P'
+        end
+        it "quality of interval do-la should be m" do
+          MusicUtils.quality(DO, LA).should == 'm'
+        end
+        it "quality of compound interval do-la should be m" do
+          MusicUtils.quality(DO, LA, 1).should == 'm'
+        end
+        it "quality of interval do-si should be M" do
+          MusicUtils.quality(DO, SI).should == 'M'
+        end
+        it "quality of compound interval do-si should be M" do
+          MusicUtils.quality(DO, SI, 1).should == 'M'
+        end
       end
     end
 
@@ -43,4 +145,153 @@ describe MusicUtils do
     
   end
 
+  context "Scales" do
+    context "Major scale" do
+      context "Natural notes" do
+        it "the major scale of DO should be [DO, RE, MI, FA, SOL, LA, SI, DO]" do
+          MusicUtils.scale(DO, MAJ_SCALE).should == [DO, RE, MI, FA, SOL, LA, SI]
+        end
+        it "the major scale of RE should be [RE, MI, FAS, SOL, LA, SI, DOS, RE]" do
+          MusicUtils.scale(RE, MAJ_SCALE).should == [RE, MI, FAS, SOL, LA, SI, DOS]
+        end
+        it "the major scale of MI should be [MI, FAS, SOLS, LA, SI, DOS, RES, MI]" do
+          MusicUtils.scale(MI, MAJ_SCALE).should == [MI, FAS, SOLS, LA, SI, DOS, RES]
+        end
+        it "the major scale of FA should be [FA, SOL, LA, SIF, DO, RE, MI, FA]" do
+          MusicUtils.scale(FA, MAJ_SCALE).should == [FA, SOL, LA, SIF, DO, RE, MI]
+        end
+        it "the major scale of SOL should be [SOL, LA, SI, DO, RE, MI, FAS, SOL]" do
+          MusicUtils.scale(SOL, MAJ_SCALE).should == [SOL, LA, SI, DO, RE, MI, FAS]
+        end
+        it "the major scale of LA should be [LA, SI, DOS, RE, MI, FAS, SOLS, LA]" do
+          MusicUtils.scale(LA, MAJ_SCALE).should == [LA, SI, DOS, RE, MI, FAS, SOLS]
+        end
+        it "the major scale of SI should be [SI, DOS, RES, MI, FAS, SOLS, LAS, SI]" do
+          MusicUtils.scale(SI, MAJ_SCALE).should == [SI, DOS, RES, MI, FAS, SOLS, LAS]
+        end
+      end
+      context "Sharped notes" do
+        it "the major scale of DO# should be [DOS, RES, MIS, FAS, SOLS, LAS, SIS]" do
+          MusicUtils.scale(DOS, MAJ_SCALE).should == [DOS, RES, MIS, FAS, SOLS, LAS, SIS]
+        end
+        it "the major scale of RE# should be [RES, MIS, FASS, SOLS, LAS, SIS, DOSS]" do
+          MusicUtils.scale(RES, MAJ_SCALE).should == [RES, MIS, FASS, SOLS, LAS, SIS, DOSS]
+        end
+        it "the major scale of MI# should be [MIS, FASS, SOLSS, LAS, SIS, DOSS, RESS]" do
+          MusicUtils.scale(MIS, MAJ_SCALE).should == [MIS, FASS, SOLSS, LAS, SIS, DOSS, RESS]
+        end
+        it "the major scale of FA# should be [FAS, SOLS, LAS, SI, DOS, RES, MISS]" do
+          MusicUtils.scale(FAS, MAJ_SCALE).should == [FAS, SOLS, LAS, SI, DOS, RES, MIS]
+        end
+        it "the major scale of SOL# should be [SOLS, LAS, SIS, DOS, RES, MIS, FASS]" do
+          MusicUtils.scale(SOLS, MAJ_SCALE).should == [SOLS, LAS, SIS, DOS, RES, MIS, FASS]
+        end
+        it "the major scale of LA# should be [SOLS, LAS, SIS, DOS, RES, MIS, FASS]" do
+          MusicUtils.scale(LAS, MAJ_SCALE).should == [LAS, SIS, DOSS, RES, MIS, FASS, SOLSS]
+        end
+        it "the major scale of SI# should be [SIS, DOSS, RESS, MIS, FASS, SOLSS, LASS]" do
+          MusicUtils.scale(SIS, MAJ_SCALE).should == [SIS, DOSS, RESS, MIS, FASS, SOLSS, LASS]
+        end
+      end
+      context "Flated notes" do
+        it "the major scale of DOb should be [DOF, REF, MIF, FAF, SOLF, LAF, SIF]" do
+          MusicUtils.scale(DOF, MAJ_SCALE).should == [DOF, REF, MIF, FAF, SOLF, LAF, SIF]
+        end
+        it "the major scale of REb should be [REF, MIF, FA, SOLF, LAF, SIF, DO]" do
+          MusicUtils.scale(REF, MAJ_SCALE).should == [REF, MIF, FA, SOLF, LAF, SIF, DO]
+        end
+        it "the major scale of MIb should be [MIF, FA, SOL, LAF, SIF, DO, RE]" do
+          MusicUtils.scale(MIF, MAJ_SCALE).should == [MIF, FA, SOL, LAF, SIF, DO, RE]
+        end
+        it "the major scale of FAb should be [FAF, SOLF, LAF, SIFF, DOF, REF, MIF]" do
+          MusicUtils.scale(FAF, MAJ_SCALE).should == [FAF, SOLF, LAF, SIFF, DOF, REF, MIF]
+        end
+        it "the major scale of SOLb should be [SOLF, LAF, SIF, DOF, REF, MIF, FA]" do
+          MusicUtils.scale(SOLF, MAJ_SCALE).should == [SOLF, LAF, SIF, DOF, REF, MIF, FA]
+        end
+        it "the major scale of LAb should be [LAF, SIF, DO, REF, MIF, FA, SOL]" do
+          MusicUtils.scale(LAF, MAJ_SCALE).should == [LAF, SIF, DO, REF, MIF, FA, SOL]
+        end
+        it "the major scale of SIb should be [SIF, DO, RE, MIF, FA, SOL, LA]" do
+          MusicUtils.scale(SIF, MAJ_SCALE).should == [SIF, DO, RE, MIF, FA, SOL, LA]
+        end
+      end
+      context "Natural Minor scale" do
+        # [2, 1, 2, 2, 1, 2]
+        context "Natural notes" do
+          it "the natural minor scale of DO should be [DO, RE, MIF, FA, SOL, LAF, SIF]" do
+            MusicUtils.scale(DO, NATURAL_MIN_SCALE).should == [DO, RE, MIF, FA, SOL, LAF, SIF]
+          end
+          it "the natural minor scale of RE should be [RE, MI, FA, SOL, LA, SIF, DO]" do
+            MusicUtils.scale(RE, NATURAL_MIN_SCALE).should == [RE, MI, FA, SOL, LA, SIF, DO]
+          end
+          it "the natural minor scale of MI should be [MI, FAS, SOL, LA, SI, DO, RE]" do
+            MusicUtils.scale(MI, NATURAL_MIN_SCALE).should == [MI, FAS, SOL, LA, SI, DO, RE]
+          end
+          it "the natural minor scale of FA should be [FA, SOL, LAF, SIF, DO, REF, MIF]" do
+            MusicUtils.scale(FA, NATURAL_MIN_SCALE).should == [FA, SOL, LAF, SIF, DO, REF, MIF]
+          end
+          it "the natural minor scale of SOL should be [SOL, LA, SIF, DO, RE, MIF, FA]" do
+            MusicUtils.scale(SOL, NATURAL_MIN_SCALE).should == [SOL, LA, SIF, DO, RE, MIF, FA]
+          end
+          it "the natural minor scale of LA should be [LA, SI, DO, RE, MI, FA, SOL]" do
+            MusicUtils.scale(LA, NATURAL_MIN_SCALE).should == [LA, SI, DO, RE, MI, FA, SOL]
+          end
+          it "the natural minor scale of SI should be [SI, DOS, RES, MI, FAS, SOLS, LAS, SI]" do
+            MusicUtils.scale(SI, NATURAL_MIN_SCALE).should == [SI, DOS, RE, MI, FAS, SOL, LA]
+          end
+        end
+        # [2, 1, 2, 2, 1, 2]
+        context "Sharped notes" do
+          it "the natural minor scale of DO# should be [DO, RE, MIF, FA, SOL, LAF, SIF]" do
+            MusicUtils.scale(DOS, NATURAL_MIN_SCALE).should == [DOS, RES, MI, FAS, SOLS, LA, SI]
+          end
+          it "the natural minor scale of RE# should be [RE, MI, FA, SOL, LA, SIF, DO]" do
+            MusicUtils.scale(RES, NATURAL_MIN_SCALE).should == [RES, MIS, FAS, SOLS, LAS, SI, DOS]
+          end
+          it "the natural minor scale of MI# should be [MI, FAS, SOL, LA, SI, DO, RE]" do
+           MusicUtils.scale(MIS, NATURAL_MIN_SCALE).should == [MIS, FASS, SOLS, LAS, SIS, DOS, RES]
+          end
+          it "the natural minor scale of FA# should be [FA, SOL, LAF, SIF, DO, REF, MIF]" do
+            MusicUtils.scale(FAS, NATURAL_MIN_SCALE).should == [FAS, SOLS, LA, SI, DOS, RE, MI]
+          end
+          it "the natural minor scale of SOL# should be [SOL, LA, SIF, DO, RE, MIF, FA]" do
+            MusicUtils.scale(SOLS, NATURAL_MIN_SCALE).should == [SOLS, LAS, SI, DOS, RES, MI, FAS]
+          end
+          it "the natural minor scale of LA# should be [LA, SI, DO, RE, MI, FA, SOL]" do
+            MusicUtils.scale(LAS, NATURAL_MIN_SCALE).should == [LAS, SIS, DOS, RES, MIS, FAS, SOLS]
+          end
+          it "the natural minor scale of SI# should be [SI, DOS, RES, MI, FAS, SOLS, LAS, SI]" do
+            MusicUtils.scale(SIS, NATURAL_MIN_SCALE).should == [SIS, DOSS, RES, MIS, FASS, SOLS, LAS]
+          end
+        end
+        # [2, 1, 2, 2, 1, 2]
+        context "Flated notes" do
+          it "the natural minor scale of DOb should be [DOF, REF, MIFF, FAF, SOLF, LAFF, SIFF]" do
+            MusicUtils.scale(DOF, NATURAL_MIN_SCALE).should == [DOF, REF, MIFF, FAF, SOLF, LAFF, SIFF]
+          end
+          it "the natural minor scale of REb should be [REF, MIF, FAF, SOLF, LAF, SIFF, DOF]" do
+            MusicUtils.scale(REF, NATURAL_MIN_SCALE).should == [REF, MIF, FAF, SOLF, LAF, SIFF, DOF]
+          end
+          it "the natural minor scale of MIb should be [MIF, FA, SOLF, LAF, SIF, DOF, REF]" do
+            MusicUtils.scale(MIF, NATURAL_MIN_SCALE).should == [MIF, FA, SOLF, LAF, SIF, DOF, REF]
+          end
+          it "the natural minor scale of FAb should be [FAF, SOLF, LAFF, SIFF, DOF, REFF, MIFF]" do
+            MusicUtils.scale(FAF, NATURAL_MIN_SCALE).should == [FAF, SOLF, LAFF, SIFF, DOF, REFF, MIFF]
+          end
+          it "the natural minor scale of SOLb should be [SOLF, LAF, SIFF, DOF, REF, MIFF, FAF]" do
+            MusicUtils.scale(SOLF, NATURAL_MIN_SCALE).should == [SOLF, LAF, SIFF, DOF, REF, MIFF, FAF]
+          end
+          it "the natural minor scale of LAb should be [LAF, SIF, DOF, REF, MIF, FAF, SOLF]" do
+            MusicUtils.scale(LAF, NATURAL_MIN_SCALE).should == [LAF, SIF, DOF, REF, MIF, FAF, SOLF]
+          end
+          it "the natural minor scale of SIb should be [SIF, DO, REF, MIF, FA, SOLF, LAF]" do
+            MusicUtils.scale(SIF, NATURAL_MIN_SCALE).should == [SIF, DO, REF, MIF, FA, SOLF, LAF]
+          end
+        end
+      end
+      
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: music-utils
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-12 00:00:00.000000000Z
+date: 2011-05-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &84854900 !ruby/object:Gem::Requirement
+  requirement: &75690210 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *84854900
+  version_requirements: *75690210
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &84854710 !ruby/object:Gem::Requirement
+  requirement: &75690020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84854710
+  version_requirements: *75690020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &84854480 !ruby/object:Gem::Requirement
+  requirement: &75689790 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84854480
+  version_requirements: *75689790
 description: Utils for music. At the moment only to classify intervals.
 email:
 - jorgeluis700@gmail.com
@@ -60,6 +60,7 @@ files:
 - benchmark/music-utils_bm.rb
 - lib/music-utils.rb
 - lib/music-utils/interval/interval.rb
+- lib/music-utils/note/note.rb
 - lib/music-utils/scales/scales.rb
 - lib/music-utils/version.rb
 - music-utils.gemspec