music-utils 0.5.1 → 0.5.2

data/lib/interval.rb

@@ -25,22 +25,14 @@ class Interval
   # It classifies the diatonic interval
   def number
     # initialize counter and index of scale
-    i = DIATONIC_SCALE.index(@note1[0..1])
+    i = note1_index
     count = 1
 
-    # No unison
-    if @note1[0..1] == @note2[0..1]
-      count += 1; i += 1
-    end
-  
+    count, i = no_unison(count, i)
+
     # Counting notes
-    while DIATONIC_SCALE[i] != @note2[0..1]
-      i += 1
-      if i > DIATONIC_SCALE.length
-        i = 0; next 
-      end
-      count += 1
-    end
+    until_find_note2(i) { count += 1 }
+
     count = count + (8 * @step) - 1 if @step > 0
     count
   end
@@ -48,21 +40,13 @@ class Interval
   # Returns the number of semitones
   def semitone
     # initialize counter and index of scale
-    i = DIATONIC_SCALE.index(@note1[0..1])
+    i = note1_index 
     count = 0
 
-    # No unison
-    if @note1[0..1] == @note2[0..1]
-      count += 1; i += 1
-    end
-  
-    # Counting semi-tones
-    while DIATONIC_SCALE[i] != @note2[0..1]
-      i += 1
-      if i > DIATONIC_SCALE.length
-        i = 0; next 
-      end
-
+    count, i = no_unison(count, i)
+    
+    # counting semi-tones
+    until_find_note2(i) do |i|
       # from 'mi' to 'fa' and 'si' to 'do' there 1 semi-tone
       if DIATONIC_SCALE[i] == 'fa' or DIATONIC_SCALE[i] == 'do'
         count += 1
@@ -73,7 +57,7 @@ class Interval
     
     count = count + (12 * @step) if @step > 0
     
-    # Counting notes alterations
+    # counting notes alterations
     alter = @note1[2..3]
     
     alter.each_char do |c|
@@ -102,5 +86,32 @@ class Interval
   def short
     quality + number.to_s 
   end
+
+  private
+
+  # Common loop to search note 2 
+  def until_find_note2(i)
+    # search note2
+    while DIATONIC_SCALE[i] != @note2[0..1]
+      i += 1
+      if i > DIATONIC_SCALE.length
+        i = 0; next 
+      end
+      yield i
+    end
+  end
+  
+  # Jumps to the next note if note 1 and note 2 are the same
+  def no_unison(count, i)   
+    if @note1[0..1] == @note2[0..1]
+      count += 1; i += 1
+    end
+    [count, i]
+  end
+  
+  # Returns index of note 1
+  def note1_index
+    DIATONIC_SCALE.index(@note1[0..1])
+  end
  
 end

data/music-utils.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   # Basic Info
   s.name          = 'music-utils'
-  s.version       = '0.5.1'
+  s.version       = '0.5.2'
   s.summary       = 'music-utils'
   s.description   = 'Utils for music. At the moment only one class to classify intervals.'
   s.platform      = Gem::Platform::RUBY

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: music-utils
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-04-27 00:00:00.000000000Z
+date: 2011-04-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &23354172 !ruby/object:Gem::Requirement
+  requirement: &24028992 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23354172
+  version_requirements: *24028992
 description: Utils for music. At the moment only one class to classify intervals.
 email:
 - jorgeluis700@gmail.com
@@ -54,7 +54,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -794356655
+      hash: 934369633
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: