music 0.5.0 → 0.5.1

data/Gemfile.lock

@@ -1,37 +1,37 @@
 PATH
   remote: .
   specs:
-    music-utils (0.5.0)
+    music (0.5.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.2)
-      activesupport (= 3.2.2)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
-    activesupport (3.2.2)
+    activesupport (3.2.3)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     builder (3.0.0)
     diff-lcs (1.1.3)
     i18n (0.6.0)
-    multi_json (1.1.0)
+    multi_json (1.3.5)
     rake (0.9.2.2)
-    rspec (2.9.0)
-      rspec-core (~> 2.9.0)
-      rspec-expectations (~> 2.9.0)
-      rspec-mocks (~> 2.9.0)
-    rspec-core (2.9.0)
-    rspec-expectations (2.9.1)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.0)
+    rspec-expectations (2.10.0)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
+    rspec-mocks (2.10.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activemodel (>= 3.0)
+  activemodel (>= 3.2.0)
   bundler (>= 1.1.3)
-  music-utils!
+  music!
   rake (>= 0.9)
   rspec

data/lib/music/chord.rb

@@ -28,6 +28,16 @@ module Music
         :diminished
       when [4, 8]
         :augmented
+      when [4, 7, 11]
+        :major_7
+      when [3, 7, 10]
+        :minor_7
+      when [3, 6, 9]
+        :diminished_7
+      when [3, 6, 10]
+        :half_diminished_7
+      when [4, 8, 10]
+        :augmented_7
       end
 
       [@notes.first.letter, quality]

data/lib/music/version.rb

@@ -1,3 +1,3 @@
 module Music
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

data/spec/classes/chord_spec.rb

@@ -28,28 +28,38 @@ describe Music::Chord do
   end
 
   describe '#describe' do
-    describe 'major chords' do
+    describe "triads" do
       it 'should recognize C major' do
         Chord.new(['C4', 'E4', 'G4']).describe.should == ['C', :major]
       end
-    end
 
-    describe 'minor chords' do
       it 'should recognize C minor' do
         Chord.new(['C4', 'Eb4', 'G4']).describe.should == ['C', :minor]
       end
-    end
 
-    describe 'diminished chords' do
       it 'should recognize C diminished' do
         Chord.new(['C4', 'Eb4', 'Gb4']).describe.should == ['C', :diminished]
       end
-    end
-
-    describe 'augmented chords' do
       it 'should recognize C augmented' do
         Chord.new(['C4', 'E4', 'G#4']).describe.should == ['C', :augmented]
       end
     end
+    describe "seven chords" do
+      it 'should recognize Cmaj7' do
+        Chord.new(['C4', 'E4', 'G4', 'B4']).describe.should == ['C', :major_7]
+      end
+      it 'should recognize Cmin7' do
+        Chord.new(['C4', 'Eb4', 'G4', 'Bb4']).describe.should == ['C', :minor_7]
+      end
+      it 'should recognize Cdim7' do
+        Chord.new(['C4', 'Eb4', 'Gb4', 'A4']).describe.should == ['C', :diminished_7]
+      end
+      it 'should recognize Cmin7b5' do
+        Chord.new(['C4', 'Eb4', 'Gb4', 'Bb4']).describe.should == ['C', :half_diminished_7]
+      end
+      it 'should recognize Caug7' do
+        Chord.new(['C4', 'E4', 'G#4', 'Bb4']).describe.should == ['C', :augmented_7]
+      end
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: music
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Brian Underwood
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-15 00:00:00 Z
+date: 2012-05-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -106,8 +106,6 @@ files:
 - spec/classes/hash_spec.rb
 - spec/classes/note_spec.rb
 - spec/spec_helper.rb
-- test/helper.rb
-- test/test_music.rb
 homepage: http://github.com/cheerfulstoic/music
 licenses: 
 - MIT

data/test/helper.rb

@@ -1,18 +0,0 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'music'
-
-class Test::Unit::TestCase
-end

data/test/test_music.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestMusic < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end