music-utils 1.0.1 → 1.0.2

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.0.2 (May 12, 2011)
+
+Features:
+
+  - Fixed do-sol bug
+  
+
 ## 1.0.1 (May 6, 2011)
 
 Features:

data/Rakefile

@@ -12,6 +12,13 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.fail_on_error = false
 end
 
+desc "Run benchmarks"
+task :bench do
+  Dir["benchmark/**/*_bm.rb"].each do |f|
+    eval(File.read(f))
+  end
+end
+
 # Gems tasks
 require "bundler"
 Bundler::GemHelper.install_tasks

data/benchmark/music-utils_bm.rb

@@ -5,15 +5,26 @@ require 'music-utils/scales/scales'
 require 'benchmark'
 
 n = 100_000
+label_width = 60
 
-Benchmark.bmbm(15) do |b|
-  b.report('with strings:') do 
+Benchmark.bm(label_width) do |b|
+  b.report('Classifying do-mi interval with strings (number):') do 
+    n.times { MusicUtils.number('do', 'mi') }
+  end
+  b.report('Classifying do-mi interval with strings (quality):') do 
+    n.times { MusicUtils.quality('do', 'mi') }
+  end
+  b.report('Classifying do-mi interval with strings (short notation):') do 
     n.times { MusicUtils.short('do', 'mi') }
   end
-  b.report('with symbols:') do
-    n.times { MusicUtils.short(:do, :mi) }
+  
+  b.report('Classifying do-mi interval with scales (number):') do
+    n.times { MusicUtils.number(Scales::DO, Scales::MI) }
+  end
+  b.report('Classifying do-mi interval with scales (quality):') do
+    n.times { MusicUtils.quality(Scales::DO, Scales::MI) }
   end
-  b.report('with scales:') do
+  b.report('Classifying do-mi interval with scales (short notation):') do
     n.times { MusicUtils.short(Scales::DO, Scales::MI) }
   end
 end

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

@@ -7,10 +7,21 @@ module MusicUtils
     include Scales
   
     def initialize(note1, note2, step)
-      @note1 = note1[0..1].to_sym
-      @note1_alt = note1[2..3]
-      @note2 = note2[0..1].to_sym
-      @note2_alt = note2[2..3]
+      
+      # 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]
+      
       @step = step
     end
   

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

@@ -2,21 +2,57 @@
 module Scales
   
   # Notes
-  DO = :do
-  RE = :re
-  MI = :mi
-  FA = :fa
+  DO  = :do
+  RE  = :re
+  MI  = :mi
+  FA  = :fa
   SOL = :sol
-  LA = :la
-  SI = :si
+  LA  = :la
+  SI  = :si
   
   DIATONIC_SCALE = [DO, RE, MI, FA, SOL, LA, SI]
 
   # Alterations:
-  FLAT = 'b'
-  DFLAT = FLAT + FLAT
-  SHARP = '#'
-  DSHARP = SHARP + SHARP
+  FLAT    = 'b'
+  DFLAT   = FLAT + FLAT
+  SHARP   = '#'
+  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
+  
+  REF   = RE.to_s + FLAT
+  REFF  = RE.to_s + DFLAT
+  RES   = RE.to_s + SHARP
+  RESS  = RE.to_s + DSHARP
+  
+  MIF   = MI.to_s + FLAT
+  MIFF  = MI.to_s + DFLAT
+  MIS   = MI.to_s + SHARP
+  MISS  = MI.to_s + DSHARP
+  
+  FAF   = FA.to_s + FLAT
+  FAFF  = FA.to_s + DFLAT
+  FAS   = FA.to_s + SHARP
+  FASS  = FA.to_s + DSHARP
+  
+  SOLF   = SOL.to_s + FLAT
+  SOLFF  = SOL.to_s + DFLAT
+  SOLS   = SOL.to_s + SHARP
+  SOLSS  = SOL.to_s + DSHARP
+
+  LAF   = LA.to_s + FLAT
+  LAFF  = LA.to_s + DFLAT
+  LAS   = LA.to_s + SHARP
+  LASS  = LA.to_s + DSHARP
+
+  SIF   = SI.to_s + FLAT
+  SIFF  = SI.to_s + DFLAT
+  SIS   = SI.to_s + SHARP
+  SISS  = SI.to_s + DSHARP
 
   # Qualities
   PERF = 'P'
@@ -33,7 +69,7 @@ module Scales
         3 => {1 => DIMP, 2 => DIM, 3 => MIN, 4 => MAJ, 5 => AUG, 6 => AUGP},
         4 => {3 => DIMP, 4 => DIM, 5 => PERF, 6 => AUG, 7 => AUGP},
         5 => {5 => DIMP, 6 => DIM, 7 => PERF, 8 => AUG, 9 => AUGP},
-        6 => {6 => DIMP, 7 => DIM, 8 => MIN, 9 => MAJ, 10 => AUG, 11 => AUGP},
+        6 => {7 => DIMP, 8 => DIM, 9 => MIN, 10 => MAJ, 11 => AUG, 12 => AUGP},
         7 => {8 => DIMP, 9 => DIM, 10 => MIN, 11 => MAJ, 12 => AUG, 13 => AUGP},
         8 => {10 => DIMP, 11 => DIM, 12 => PERF, 13 => AUG, 14 => AUGP}
       }

data/lib/music-utils/version.rb

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

data/spec/interval/interval_spec.rb

@@ -101,6 +101,11 @@ describe  MusicUtils::Interval do
       i.short.should == 'm10'
     end
 
+    it "the short notation of do-sol interval should be P5" do
+      i = Interval.new('do', 'sol', 0)
+      i.short.should == 'P5'
+    end
+
   end
 end
 

data/spec/music-utils_spec.rb

@@ -1,42 +1,43 @@
 require 'music-utils'
 
 describe MusicUtils do
-
+  include Scales
+  
   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
+        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
+        MusicUtils.number(DO, MI, 1).should == 10
       end
     end
       
     context "By semitones" do  
       it "simple interval do-mi should be 4 semitones" do
-        MusicUtils.semitones('do', 'mi').should == 4
+        MusicUtils.semitones(DO, MI).should == 4
       end
       it "compound interval do-mi should be 16 semitones" do
-        MusicUtils.semitones('do', 'mi', 1).should == 16
+        MusicUtils.semitones(DO, MI, 1).should == 16
       end
     end
     
     context "By quality" do  
       it "quality of interval do-mi should be M" do
-        MusicUtils.quality('do', 'mi').should == 'M'
+        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'
+        MusicUtils.quality(DO, MI, 1).should == 'M'
       end
     end
 
     context "By short notation" do  
       it "the short notation of do#-mi interval should be m3" do
-        MusicUtils.short('do#', 'mi').should == 'm3'
+        MusicUtils.short(DOS, MI).should == 'm3'
       end
       it "the short notation of do#-mi compound interval should be m10" do
-        MusicUtils.short('do#', 'mi', 1).should == 'm10'
+        MusicUtils.short(DOS, MI, 1).should == 'm10'
       end
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: music-utils
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-08 00:00:00.000000000Z
+date: 2011-05-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &83068570 !ruby/object:Gem::Requirement
+  requirement: &84854900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *83068570
+  version_requirements: *84854900
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &83068380 !ruby/object:Gem::Requirement
+  requirement: &84854710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *83068380
+  version_requirements: *84854710
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &83109790 !ruby/object:Gem::Requirement
+  requirement: &84854480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *83109790
+  version_requirements: *84854480
 description: Utils for music. At the moment only to classify intervals.
 email:
 - jorgeluis700@gmail.com