music-utils 0.3.20 → 0.4.0

data/CHANGELOG.md

@@ -1,5 +1,17 @@
-## 0.0.1 (April 23, 2011)
+## 0.0.1 (March 23, 2011)
 
 Features:
 
-  - Added support to full diatonic scale in quality method
+  - First commit
+  
+## 0.3.20 (April 26, 2011)
+
+Features:
+
+  - Added support to full diatonic scale in quality method
+  
+## 0.4.0 (April 26, 2011)
+
+Features:
+
+  - Added support for notes alterations

data/README.md

@@ -10,6 +10,7 @@ Simple intervals:
   * Interval.new('do', 'mi', 0).number    #=> 3 (3th)
   * Interval.new('do', 'mi', 0).semitone  #=> 4 (semi-tones)
   * Interval.new('do', 'mi', 0).quality   #=> M (major)
+  * Interval.new('do#', 'mi', 0).quality   #=> m (major)
 
 Compound intervals:
   
@@ -19,7 +20,7 @@ Compound intervals:
 
 To Do
 -----
-  * Add support to note alterations
+  * Add more rspec examples 
 
 Copyright
 ---------

data/lib/interval.rb

@@ -2,12 +2,12 @@
 module Scales
   DIATONIC_SCALE = ['do', 're', 'mi', 'fa', 'sol', 'la', 'si']
   QUALITIES = {
-        2 => {0 => 'd', 1 => 'm', 2 => 'M', 3 => 'A'},
-        3 => {2 => 'd', 3 => 'm', 4 => 'M', 5 => 'A'},
+        2 => {0 => 'd', 1 => 'm', 2 => 'M', 3 => 'A', 4 => 'AA'},
+        3 => {1 => 'dd', 2 => 'd', 3 => 'm', 4 => 'M', 5 => 'A', 6 => 'AA'},
         4 => {3 => 'dd', 4 => 'd', 5 => 'P', 6 => 'A', 7 => 'AA'},
         5 => {5 => 'dd', 6 => 'd', 7 => 'P', 8 => 'A', 9 => 'AA'},
-        6 => {7 => 'd', 8 => 'm', 9 => 'M', 10 => 'A'},
-        7 => {9 => 'd', 10 => 'm', 11 => 'M', 12 => 'A'},
+        6 => {6 => 'dd', 7 => 'd', 8 => 'm', 9 => 'M', 10 => 'A', 11 => 'AA'},
+        7 => {8 => 'dd', 9 => 'd', 10 => 'm', 11 => 'M', 12 => 'A', 13 => 'AA'},
         8 => {10 => 'dd', 11 => 'd', 12 => 'P', 13 => 'A', 14 => 'AA'}
       }
 end
@@ -25,16 +25,16 @@ class Interval
   # It classifies the diatonic interval
   def number
     # initialize counter and index of scale
-    i = DIATONIC_SCALE.index(@note1)
+    i = DIATONIC_SCALE.index(@note1[0..1])
     count = 1
 
     # No unison
-    if @note1 == @note2
+    if @note1[0..1] == @note2[0..1]
       count += 1; i += 1
     end
   
     # Counting notes
-    while DIATONIC_SCALE[i] != @note2
+    while DIATONIC_SCALE[i] != @note2[0..1]
       i += 1
       if i > DIATONIC_SCALE.length
         i = 0; next 
@@ -48,16 +48,16 @@ class Interval
   # Returns the number of semitones
   def semitone
     # initialize counter and index of scale
-    i = DIATONIC_SCALE.index(@note1)
+    i = DIATONIC_SCALE.index(@note1[0..1])
     count = 0
 
     # No unison
-    if @note1 == @note2
+    if @note1[0..1] == @note2[0..1]
       count += 1; i += 1
     end
   
     # Counting semi-tones
-    while DIATONIC_SCALE[i] != @note2
+    while DIATONIC_SCALE[i] != @note2[0..1]
       i += 1
       if i > DIATONIC_SCALE.length
         i = 0; next 
@@ -72,6 +72,22 @@ class Interval
     end
     
     count = count + (12 * @step) if @step > 0
+    
+    # Counting notes alterations
+    alter = @note1[2..3]
+    
+    alter.each_char do |c|
+      count += 1 if c == 'b'
+      count -= 1 if c == '#'
+    end
+
+    alter = @note2[2..3]
+
+    alter.each_char do |c|
+      count -= 1 if c == 'b'
+      count += 1 if c == '#'
+    end
+
     count
   end
   

data/music-utils.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   # Basic Info
   s.name          = 'music-utils'
-  s.version       = '0.3.20'
+  s.version       = '0.4.0'
   s.summary       = 'music-utils'
   s.description   = 'Utils for music'
   s.platform      = Gem::Platform::RUBY

data/spec/interval_spec.rb

@@ -24,7 +24,12 @@ describe Interval do
       i = Interval.new('do', 'mi', 0)
       i.semitone.should == 4
     end
-      
+
+    it "simple interval dob-mi# should be 6 semitones" do
+      i = Interval.new('dob', 'mi#', 0)
+      i.semitone.should == 6
+    end
+
     it "simple interval do-do should be 12 semitones" do
       i = Interval.new('do', 'do', 0)
       i.semitone.should == 12
@@ -46,7 +51,17 @@ describe Interval do
       i = Interval.new('do', 'mi', 0)
       i.quality.should == 'M'
     end
-    
+  
+    it "quality of interval do#-mi should be m" do
+      i = Interval.new('do#', 'mi', 0)
+      i.quality.should == 'm'
+    end
+
+    it "quality of interval dob-mi# should be AA" do
+      i = Interval.new('dob', 'mi#', 0)
+      i.quality.should == 'AA'
+    end
+  
     it "quality of interval do-do should be P" do
       i = Interval.new('do', 'do', 0)
       i.quality.should == 'P'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: music-utils
 version: !ruby/object:Gem::Version
-  version: 0.3.20
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-04-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &24133836 !ruby/object:Gem::Requirement
+  requirement: &77436860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24133836
+  version_requirements: *77436860
 description: Utils for music
 email:
 - jorgeluis700@gmail.com
@@ -54,7 +54,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -731370575
+      hash: -975623391
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: