Changeset 26114

Timestamp:

12/08/08 16:34:57 (4 years ago)

Author:

bayashi

Message:

add 'scale' method & add some tests

Location:

lang/perl/Music-Chord-Note/trunk

Files:

• Changes (modified) (1 diff)
• META.yml (modified) (2 diffs)
• lib/Music/Chord/Note.pm (modified) (4 diffs)
• t/01.rehearsal.t (modified) (2 diffs)

lang/perl/Music-Chord-Note/trunk/Changes

@@ -1 +1 @@
 Revision history for Music-Chord-Note
 
+0.0.3  mon Dec 08 16:16:16 2008
+       add scale func & test
+       
 0.0.2  mon Dec 01 12:12:12 2008
        fixed chord list.

lang/perl/Music-Chord-Note/trunk/META.yml

@@ -1 +1 @@
 ---
 name: Music-Chord-Note
-version: 0.0.2
+version: 0.0.3
 author:
   - 'Dai Okabayashi <bayashi@cpan.org>'
@@ -14 +14 @@
   Music::Chord::Note:
     file: lib/Music/Chord/Note.pm
-    version: 0.0.2
+    version: 0.0.3
 generated_by: Module::Build version 0.3
 meta-spec:

lang/perl/Music-Chord-Note/trunk/lib/Music/Chord/Note.pm

@@ -5 +5 @@
 use Carp qw( croak );
 
-our $VERSION = '0.0.2';
+our $VERSION = '0.0.3';
 
 my @tone_list = ('C', 'C#', 'D', 'D#', 'E', 'F', 'F#', 'G', 'G#', 'A', 'A#', 'B',
@@ -79 +79 @@
 };
 
-sub new {
+sub new
+{
     my $class = shift;
     bless {}, $class;
 }
 
-sub chord {
+sub chord
+{
     my ($self, $chord_name) = @_;
+
     croak "No CHORD_NAME!" unless $chord_name;
     my ($tonic, $kind) = ($chord_name =~ /([A-G][b#]?)(.+)?/);
-    croak("unknown chord $chord_name") unless defined $tonic;
+    croak "unknown chord $chord_name" unless defined $tonic;
     $kind = 'base' unless $kind;
     my $scalic = $scalic_value->{$tonic};
-    croak("undefined kind of chord $kind($chord_name)") unless defined $base_chord_list->{$kind};
+    croak "undefined kind of chord $kind($chord_name)"
+        unless defined $base_chord_list->{$kind};
+
     my @keys;
-    for my $scale ( split(/\,/, $base_chord_list->{$kind}) ){
+    for my $scale ( split /\,/, $base_chord_list->{$kind} ){
         my $note = $scale + $scalic;
         $note = int($note % 24) + 12 if $note > 23;
-        push(@keys, $tone_list[$note]);
+        push @keys, $tone_list[$note];
     }
+
     return @keys;
+}
+
+sub scale
+{
+    my $self = shift;
+    my $note = shift || return;
+
+    $note =~ s/^([a-g])/uc($1)/e;
+    croak "wrong note ($note)" if $note !~ /^[A-G](?:[#b])?$/;
+
+    return $scalic_value->{$note};
 }
 
@@ -121 +138 @@
     print "@tone"; # C E G B
 
+    my $note = $cn->scale('D#');
+
+    print "$note"; # 3
+
 
 =head1 METHOD
@@ -133 +154 @@
 
 get tone list from chord name
+
+=item scale($note)
+
+get scalic value from C (C=0, B=11)
 
 =back

lang/perl/Music-Chord-Note/trunk/t/01.rehearsal.t

@@ -1 +1 @@
 use strict;
 
-use Test::More tests => 22;
+use Test::More tests => 31;
 
 use Music::Chord::Note;
@@ -52 +52 @@
 
 
+my $no_note = $cn->scale('');
+is($no_note, undef, "No Note");
 
+eval { my $wrong_note = $cn->scale('H'); };
+like($@, qr/wrong note/, "Wrong Note H");
+
+eval { my $wrong_note = $cn->scale('C+'); };
+like($@, qr/wrong note/, "Wrong Note C+");
+
+eval { my $wrong_note = $cn->scale('D-'); };
+like($@, qr/wrong note/, "Wrong Note D-");
+
+my $sv = $cn->scale('C');
+is($sv, 0, 'Scalic Value C');
+
+my $sv1 = $cn->scale('A');
+is($sv1, 9, 'Scalic Value A');
+
+my $sv2 = $cn->scale('A#');
+is($sv2, 10, 'Scalic Value A#');
+
+my $sv3 = $cn->scale('Eb');
+is($sv3, 3, 'Scalic Value Eb');
+
+my $sv4 = $cn->scale('gb');
+is($sv4, 6, 'Scalic Value gb');