music-utils 1.1.2 → 1.2.0

data/.gitignore

@@ -5,4 +5,7 @@
 pkg/
 
 # Gems
-Gemfile.lock
+Gemfile.lock
+
+# vim swap files
+*.swp

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.2.0 (May 25, 2011)
+
+Features:
+
+  - Added functionality to calculate the highest note of an interval 
+
 ## 1.1.2 (May 21, 2011)
 
 Features:

data/README.md

@@ -10,21 +10,27 @@ Examples
 ### Intervals
 
 Simples:
-  
+
     MusicUtils.number(:do, :mi)                   #=> 3 (3th)
     MusicUtils.semitones(:do, :mi)                #=> 4 (semi-tones)
     MusicUtils.quality(:do, :mi)                  #=> M (major)
 
 Compounds:
 
-    MusicUtils.number(:do, :mi, 1)                #=> 3 (3th)
+    MusicUtils.number(:do, :mi, 1)                #=> 10 (10th)
     MusicUtils.semitones(:do, :mi, 1)             #=> 16 (semi-tones)
     MusicUtils.quality(:do, :mi, 1)               #=> M (major)
 
 Short Notation:
 
-    MusicUtils.short(:do, :mi)                    #=> M2
-    MusicUtils.short(:do, :mi, 1)                 #=> M9
+    MusicUtils.short(:do, :mi)                    #=> M3
+    MusicUtils.short(:do, :mi, 1)                 #=> M10
+
+Highest note of interval:
+
+    MusicUtils.high_note(:do, :P5)                #=> :sol
+    MusicUtils.high_note(:fas, :m3)               #=> :la
+
 
 ### Scales
 
@@ -60,7 +66,6 @@ To run the tests:
 To Do
 -----
 
-* Fix octave semitones count bug 
 * Add validations (notes, alterations, etc) 
 * Add support to pentatonic scale and others
 

data/lib/music-utils.rb

@@ -25,9 +25,16 @@ module MusicUtils
     Interval.new(note1, note2, step).short
   end
   
+  # Returns the second note of an interval
+  # calculates from its first note and number 
+  # and quality in short notation
+  def MusicUtils.high_note(from, short)
+    Interval.high_note(from, short)
+  end
+  
   # Returns a scale 
   def MusicUtils.scale(from, scale)
     Scales.scale(from, scale)
   end
 
-end
+end

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

@@ -49,20 +49,9 @@ module MusicUtils
       count = count + (12 * @step) if @step > 0
       
       # counting notes alterations
-      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 += Interval.alter_impact_in_semitones(@note1_alt, true)
+      count += Interval.alter_impact_in_semitones(@note2_alt, false)
+  
       count
     end
     
@@ -77,7 +66,52 @@ module MusicUtils
     def short
       quality + number.to_s 
     end
-  
+
+    # Returns the higher note of an interval
+    # calculates from its first note and number 
+    # and quality in short notation
+    def self.high_note(from, short)
+      quality, number = parse_short(short)
+      
+      while number > 7
+        number = number - 7
+      end
+      
+      from_note, from_alter = Note.parse(from)
+
+      to_note = Scales.diatonic_scale_from(from_note)[number - 1]
+      intervals = Scales::QUALITIES[number].key(quality)
+      intervals += alter_impact_in_semitones(from_alter, false)
+      
+      from_note_index = Scales.cromatic_index(from_note.to_sym)
+      to_note_index = from_note_index + intervals
+
+      while to_note_index > 11
+        to_note_index = to_note_index - 12
+      end
+
+      Scales::CROMATIC_SCALE[to_note_index].select do |note|  
+        raw_note, alter = Note.parse(note)
+        raw_note == to_note
+      end.first
+    end
+
+    # Short notation parser method
+    def self.parse_short(sn)
+      short = sn.to_s
+    
+      quality = short[0..1]
+      number = short[2..3].to_i
+      
+      if quality == Scales::DIMP or quality == Scales::AUGP
+        # nothing to do
+      else
+        quality = short[0]
+        number = short[1..2].to_i
+      end
+      [quality, number]
+    end
+
     private
   
     # Common loop to search note 2 
@@ -110,7 +144,18 @@ module MusicUtils
     def note1_index
       DIATONIC_SCALE.index(@note1)
     end
-    
+
+    def self.alter_impact_in_semitones(alter, from_note)
+      impact = 0
+      case alter
+        when Scales::FLAT   ; impact = from_note ?  1 : -1
+        when Scales::SHARP  ; impact = from_note ? -1 :  1
+        when Scales::DFLAT  ; impact = from_note ?  2 : -2
+        when Scales::DSHARP ; impact = from_note ? -2 :  2
+      end
+      impact
+    end
+
   end
   
 end

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

@@ -57,7 +57,18 @@ module Scales
   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]]
+  CROMATIC_SCALE = [[SIS, DO, REFF], 
+                    [SISS, 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]
@@ -86,19 +97,7 @@ module Scales
   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
+    i = cromatic_index(from)
     
     scale = []
     scale << from
@@ -148,5 +147,23 @@ module Scales
     diatonic_scale
   end
 
+  # Returns index of the note in the cromatic scale
+  def Scales.cromatic_index(from)
+    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
+    i
+  end    
+
 end
 end

data/lib/music-utils/version.rb

@@ -1,3 +1,3 @@
 module MusicUtils
-  VERSION = '1.1.2'
+  VERSION = '1.2.0'
 end

data/spec/music-utils_spec.rb

@@ -166,6 +166,144 @@ describe MusicUtils do
       end
     end
     
+    context "Calculate higher note of intervals from sol" do
+      it "the higher note of m2 from sol should be laf" do
+        MusicUtils.high_note(:sol, :m2).should == :laf
+      end
+      it "the higher note of M2 from sol should be la" do
+        MusicUtils.high_note(:sol, :M2).should == :la
+      end
+      it "the higher note of m3 from sol should be sif" do
+        MusicUtils.high_note(:sol, :m3).should == :sif
+      end
+      it "the higher note of M3 from sol should be si" do
+        MusicUtils.high_note(:sol, :M3).should == :si
+      end
+      it "the higher note of d4 from sol should be dof" do
+        MusicUtils.high_note(:sol, :d4).should == :dof
+      end
+      it "the higher note of P4 from sol should be do" do
+        MusicUtils.high_note(:sol, :P4).should == :do
+      end
+      it "the higher note of A4 from sol should be dos" do
+        MusicUtils.high_note(:sol, :A4).should == :dos
+      end
+      it "the higher note of AA4 from sol should be doss" do
+        MusicUtils.high_note(:sol, :AA4).should == :doss
+      end
+      it "the higher note of dd5 from sol should be reff" do
+        MusicUtils.high_note(:sol, :dd5).should == :reff
+      end
+      it "the higher note of d5 from sol should be ref" do
+        MusicUtils.high_note(:sol, :d5).should == :ref
+      end
+      it "the higher note of P5 from sol should be re" do
+        MusicUtils.high_note(:sol, :P5).should == :re
+      end
+      it "the higher note of A5 from sol should be res" do
+        MusicUtils.high_note(:sol, :A5).should == :res
+      end
+      it "the higher note of AA5 from sol should be ress" do
+        MusicUtils.high_note(:sol, :AA5).should == :ress
+      end
+      it "the higher note of dd6 from sol should be miff" do
+        MusicUtils.high_note(:sol, :dd6).should == :miff
+      end
+      it "the higher note of d6 from sol should be mif" do
+        MusicUtils.high_note(:sol, :d6).should == :mif
+      end
+      it "the higher note of m6 from sol should be mi" do
+        MusicUtils.high_note(:sol, :m6).should == :mi
+      end
+      it "the higher note of M6 from sol should be mis" do
+        MusicUtils.high_note(:sol, :M6).should == :mis
+      end
+      it "the higher note of A6 from sol should be miss" do
+        MusicUtils.high_note(:sol, :A6).should == :miss
+      end
+      it "the higher note of dd7 from sol should be faff" do
+        MusicUtils.high_note(:sol, :dd7).should == :faff
+      end
+      it "the higher note of d7 from sol should be faf" do
+        MusicUtils.high_note(:sol, :d7).should == :faf
+      end
+      it "the higher note of m7 from sol should be fa" do
+        MusicUtils.high_note(:sol, :m7).should == :fa
+      end
+      it "the higher note of M7 from sol should be fas" do
+        MusicUtils.high_note(:sol, :M7).should == :fas
+      end
+      it "the higher note of A7 from sol should be fass" do
+        MusicUtils.high_note(:sol, :A7).should == :fass
+      end
+    end
+    context "Calculate higher note of intervals from fas" do
+      # From sol
+      it "the higher note of m2 from fas should be " do
+        MusicUtils.high_note(:fas, :m2).should == :sol
+      end
+      it "the higher note of M2 from fas should be " do
+        MusicUtils.high_note(:fas, :M2).should == :sols
+      end
+      it "the higher note of m3 from fas should be " do
+        MusicUtils.high_note(:fas, :m3).should == :la
+      end
+      it "the higher note of M3 from fas should be " do
+        MusicUtils.high_note(:fas, :M3).should == :las
+      end
+      it "the higher note of d4 from fas should be " do
+        MusicUtils.high_note(:fas, :d4).should == :sif
+      end
+      it "the higher note of P4 from fas should be " do
+        MusicUtils.high_note(:fas, :P4).should == :si
+      end
+      it "the higher note of A4 from fas should be " do
+        MusicUtils.high_note(:fas, :A4).should == :sis
+      end
+      it "the higher note of AA4 from fas should be " do
+        MusicUtils.high_note(:fas, :AA4).should == :siss
+      end
+      it "the higher note of dd5 from fas should be " do
+        MusicUtils.high_note(:fas, :dd5).should == :dof
+      end
+      it "the higher note of d5 from fas should be " do
+        MusicUtils.high_note(:fas, :d5).should == :do
+      end
+      it "the higher note of P5 from fas should be " do
+        MusicUtils.high_note(:fas, :P5).should == :dos
+      end
+      it "the higher note of A5 from fas should be " do
+        MusicUtils.high_note(:fas, :A5).should == :doss
+      end
+      it "the higher note of dd6 from fas should be " do
+        MusicUtils.high_note(:fas, :dd6).should == :ref
+      end
+      it "the higher note of d6 from fas should be " do
+        MusicUtils.high_note(:fas, :d6).should == :re
+      end
+      it "the higher note of m6 from fas should be " do
+        MusicUtils.high_note(:fas, :m6).should == :res
+      end
+      it "the higher note of M6 from fas should be " do
+        MusicUtils.high_note(:fas, :M6).should == :ress
+      end
+      it "the higher note of dd7 from fas should be " do
+        MusicUtils.high_note(:fas, :dd7).should == :miff
+      end
+      it "the higher note of d7 from fas should be " do
+        MusicUtils.high_note(:fas, :d7).should == :mif
+      end
+      it "the higher note of m7 from fas should be " do
+        MusicUtils.high_note(:fas, :m7).should == :mi
+      end
+      it "the higher note of M7 from fas should be " do
+        MusicUtils.high_note(:fas, :M7).should == :mis
+      end
+      it "the higher note of A7 from fas should be " do
+				# comments
+        MusicUtils.high_note(:fas, :A7).should == :miss
+      end
+    end
   end
 
   context "Scales" do
@@ -317,4 +455,4 @@ describe MusicUtils do
     end
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: music-utils
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-21 00:00:00.000000000Z
+date: 2011-05-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &85936420 !ruby/object:Gem::Requirement
+  requirement: &85461120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *85936420
+  version_requirements: *85461120
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &85936230 !ruby/object:Gem::Requirement
+  requirement: &85460930 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *85936230
+  version_requirements: *85460930
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &85936000 !ruby/object:Gem::Requirement
+  requirement: &85460700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *85936000
+  version_requirements: *85460700
 description: Utils to classify music intervals, create scales and more. See README.md
   and CHANGELOG.md on homepage for more info.
 email: