music-utils 1.1.1 → 1.1.2

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.1.2 (May 21, 2011)
+
+Features:
+
+  - Fixed bugs in semitones count
+  
+
 ## 1.1.1 (May 20, 2011)
 
 Features:

data/README.md

@@ -60,7 +60,9 @@ To run the tests:
 To Do
 -----
 
+* Fix octave semitones count bug 
 * Add validations (notes, alterations, etc) 
+* Add support to pentatonic scale and others
 
 
 Copyright

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

@@ -30,11 +30,11 @@ module MusicUtils
   
     # Returns the number of semitones
     def semitones
+      return CROMATIC_SCALE.length if @note1 == @note2
+      
       # initialize counter and index of scale
       i = note1_index 
       count = 0
-  
-      count, i = no_unison(count, i)
       
       # counting semi-tones
       until_find_note2(i) do |ii|
@@ -82,12 +82,12 @@ module MusicUtils
   
     # Common loop to search note 2 
     def until_find_note2(i)
-      length = DIATONIC_SCALE.length
+      length = DIATONIC_SCALE.length - 1
       # search note2
       while DIATONIC_SCALE[i] != @note2
         i += 1
         if i > length
-          i = 0; next 
+          i = 0; 
         end
         yield i
       end
@@ -96,7 +96,12 @@ module MusicUtils
     # Jumps to the next note if note 1 and note 2 are the same
     def no_unison(count, i)   
       if @note1 == @note2
-        count += 1; i += 1
+        if DIATONIC_SCALE[i] == Scales::FA or DIATONIC_SCALE[i] == Scales::DO
+          count += 1
+        else
+          count += 2
+        end
+        i += 1
       end
       [count, i]
     end

data/lib/music-utils/version.rb

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

data/spec/music-utils_spec.rb

@@ -90,6 +90,29 @@ describe MusicUtils do
         it "compound interval do-si should be 21 semitones" do
           MusicUtils.semitones(DO, SI, 1).should == 23 
         end
+        it "compound interval do-do should be 21 semitones" do
+          MusicUtils.semitones(DO, DO).should == 12 
+        end
+      end
+      context "Diatonic from others" do
+        it "simple interval so-la should be 2 semitones" do
+          MusicUtils.semitones(SOL, LA).should == 2 
+        end
+        it "simple interval re-do should be 10 semitones" do
+          MusicUtils.semitones(RE, DO).should == 10
+        end
+        it "simple interval fa-re should be 9 semitones" do
+          MusicUtils.semitones(FA, RE).should == 9
+        end
+        it "simple interval si-mi should be 5 semitones" do
+          MusicUtils.semitones(SI, MI).should == 5
+        end
+        it "simple interval mi-si should be 7 semitones" do
+          MusicUtils.semitones(MI, SI).should == 7
+        end
+        it "simple interval fa-do should be 7 semitones" do
+          MusicUtils.semitones(FA, DO).should == 7
+        end
       end
     end
     

metadata

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