coltrane 0.0.2 → 1.0.0

data/lib/coltrane/note.rb

@@ -1,7 +1,11 @@
 module Coltrane
   # It describes a musical note, independent of octave
+
   class Note
-    attr_reader :name
+    include Multiton
+
+    attr_reader :name, :number
+    alias_method :id, :number
 
     NOTES = {
       'C'  => 0,
@@ -23,52 +27,68 @@ module Coltrane
       'B'  => 11
     }.freeze
 
+    def initialize(name)
+      @name, @number = name, NOTES[name]
+    end
+
+    private_class_method :new
+
+    def self.[](arg)
+      name =
+        case arg
+        when Note then return arg
+        when String then find_note(arg)
+        when Numeric then NOTES.key(arg % 12)
+        else raise InvalidNote.new("Wrong type: #{arg.class}")
+        end
+
+      new(name) || (raise InvalidNote.new("#{arg}"))
+    end
+
     def self.all
-      NOTES.keys.map {|n| Note.new(n)}
+      %w[C C# D D# E F F# G G# A A# B].map { |n| Note[n] }
     end
 
-    def accident?
-      [1,3,6,8,10].include?(number)
+    def self.find_note(str)
+      NOTES.each { |k, v| return k if str.casecmp?(k) }
+      nil
     end
 
-    def initialize(arg)
-      case arg
-      when String
-        raise "invalid note: #{arg}" unless valid_note?(arg)
-        @name = arg
-      when Numeric then @name = name_from_number(arg)
-      end
+    def pretty_name
+      @name.gsub('b',"\u266D").gsub('#',"\u266F")
+    end
+
+    alias_method :to_s, :name
+
+    def accident?
+      [1,3,6,8,10].include?(number)
     end
 
     def +(n)
       case n
-        when Numeric then Note.new(number + n)
-        when Note then Chord.new(number + n.number)
+        when Interval then Note[number + n.semitones]
+        when Numeric  then Note[number + n]
+        when Note     then Chord.new(number + n.number)
       end
     end
 
     def -(n)
       case n
-        when Numeric then Note.new(number + n)
-        when Note then Interval.new((number - n.number) % 12)
+        when Numeric then Note.new(n - number)
+        when Note    then Interval.new(n.number - number)
       end
     end
 
     def valid_note?(note_name)
-      NOTES.key?(note_name)
-    end
-
-    def number
-      NOTES[name]
+      find_note(note_name)
     end
 
     def interval_to(note_name)
-      Interval.new(Note.new(note_name).number - number)
+      Note[note_name] - self
     end
 
-    def transpose_by(interval_number)
-      @name = name_from_number(number + interval_number)
-      self
+    def transpose_by(semitones)
+      self + semitones
     end
 
     def guitar_notes
@@ -88,11 +108,5 @@ module Coltrane
     def in_guitar_string_region(guitar_string, region)
       guitar_string.guitar_notes_for_note_in_region(self, region)
     end
-
-    protected
-
-    def name_from_number(number)
-      NOTES.key(number % 12)
-    end
   end
 end

data/lib/coltrane/note_set.rb

@@ -1,17 +1,47 @@
 module Coltrane
   # It describes a set of notes
   class NoteSet
+    extend Forwardable
+
+    def_delegators :@notes, :first, :each, :size, :map, :reduce, :index,
+                   :[], :index, :empty?, :permutation, :include?
+
     attr_reader :notes
 
+    alias_method :root, :first
+    alias_method :all, :notes
+
+    def self.[](*notes)
+      new(notes)
+    end
+
     def initialize(arg)
-      @notes = case arg
-               when String then notes_from_note_string(arg)
-               when Array  then notes_from_note_array(arg)
-               end
+      @notes =
+        case arg
+        when NoteSet then arg.notes
+        when Array   then arg.map {|n| n.is_a?(Note) ? n : Note[n] }
+        else raise InvalidNotes.new(arg)
+        end
     end
 
-    def root_note
-      notes.sort_by(&:number).first
+    def &(another)
+      NoteSet[*(notes & another.notes)]
+    end
+
+    def degree(note)
+      index(note)+1
+    end
+
+    def +(other_noteset)
+      NoteSet[*(notes + other_noteset.notes)]
+    end
+
+    def pretty_names
+      map(&:pretty_name)
+    end
+
+    def names
+      map(&:name)
     end
 
     def transpose_to(note_name)
@@ -29,22 +59,7 @@ module Coltrane
     end
 
     def interval_sequence
-      IntervalSequence.new(self)
-    end
-
-    protected
-
-    def notes_from_note_string(note_string)
-      notes_from_note_array(note_string.split(' '))
-    end
-
-    def notes_from_note_array(note_array)
-      note_array.collect do |note|
-        case note
-        when String then Note.new(note)
-        when Note   then note
-        end
-      end
+      IntervalSequence.new(notes: self)
     end
   end
 end

data/lib/coltrane/piano_representation.rb

@@ -1,58 +0,0 @@
-module Coltrane
-  class PianoRepresentation
-    PIANO_TEMPLATE = <<~ASCII
-      ┌─┬─┬┬─┬─╥─┬─┬┬─┬┬─┬─╥─┬─┬┬─┬─╥─┬─┬┬─┬┬─┬─┐
-      │ │ ││ │ ║ │ ││ ││ │ ║ │ ││ │ ║ │ ││ ││ │ │
-      │ │X││X│ ║ │X││X││X│ ║ │X││X│ ║ │X││X││X│ │
-      │ │X││X│ ║ │X││X││X│ ║ │X││X│ ║ │X││X││X│ │
-      │ ┕╥┙┕╥┙ ║ ┕╥┙┕╥┙┕╥┙ ║ ┕╥┙┕╥┙ ║ ┕╥┙┕╥┙┕╥┙ │
-      │XX║XX║XX║XX║XX║XX║XX║XX║XX║XX║XX║XX║XX║XX│
-      └──╨──╨──╨──╨──╨──╨──╨──╨──╨──╨──╨──╨──╨──┘
-    ASCII
-
-    class << self
-      def render_intervals(notes, ref_note)
-        output = place_black_notes(Paint[PIANO_TEMPLATE, 'gray'], notes, ref_note)
-        place_white_notes(output, notes, ref_note)
-      end
-
-      def place_white_notes(input, notes, ref_note)
-        white_notes = Scale.major.notes
-        i = 0
-        output_array = input.split("\n")
-        output_array[5].gsub!('XX') do |match|
-          note = white_notes[i%7]
-          interval_name = (note - ref_note).name
-          i += 1
-          notes.map(&:name).include?(note.name) ? Paint[interval_name, 'red'] : '  '
-        end
-
-        output_array.join("\n")
-      end
-
-      def place_black_notes(input, notes, ref_note)
-        black_notes  = Scale.pentatonic_major('C#',4).notes
-        output_array = input.split("\n")
-
-        i = 0
-        output_array[2].gsub!('X') do |match|
-          note = black_notes[i%5]
-          interval_name = (note - ref_note).name
-          i += 1
-          notes.map(&:name).include?(note.name) ? Paint[interval_name[0], 'red'] : ' '
-        end
-
-        i = 0
-        output_array[3].gsub!('X') do |match|
-          note = black_notes[i%5]
-          interval_name = (black_notes[i%5] - ref_note).name
-          i += 1
-          notes.map(&:name).include?(note.name) ? Paint[interval_name[1], 'red'] : ' '
-        end
-
-        output_array.join("\n")
-      end
-    end
-
-  end
-end

data/lib/coltrane/pitch.rb

@@ -13,15 +13,24 @@ module Coltrane
 
     def number_from_name(pitch_string)
       _, note, octaves = pitch_string.match(/(.*)(\d)/).to_a
-      Note.new(note).number + 12 * octaves.to_i
+      Note[note].number + 12 * octaves.to_i
     end
 
     def name
-      "#{note.name}#{number / 12}"
+      "#{note.name}#{octave}"
+    end
+
+    def octave
+      number / 12
     end
 
     def note
-      Note.new(number)
+      Note[number]
+    end
+
+    def +(arg)
+      n = arg.is_a?(Pitch) ? arg.number : arg
+      Pitch.new(number + n)
     end
   end
 end

data/lib/coltrane/progression.rb

@@ -1,4 +1,35 @@
 module Coltrane
   class Progression
+    extend ClassicProgressions
+
+    attr_reader :scale
+
+    def initialize(roman_notation, key: nil, scale: nil)
+      if !key.nil?
+        @scale = get_scale_from_key(key)
+      end
+    end
+
+    def chords
+      all_chords.values_at(*chord_indexes)
+    end
+
+    def on_guitar
+      chords.map(&:on_guitar)
+    end
+
+    def on_piano
+      chords.map(&:on_piano)
+    end
+
+    private
+
+    def all_chords
+      scale.sevenths
+    end
+
+    def chord_indexes
+      degrees.map { |d| d-1 }
+    end
   end
 end

data/lib/coltrane/qualities.rb

@@ -1,115 +1,116 @@
-module Qualities
-  CHORD_QUALITIES = {
-   "5"          => [0, 7],
-   "Msus2"      => [0, 2, 7],
-   "dim"        => [0, 3, 6],
-   "m"          => [0, 3, 7],
-   "m#5"        => [0, 3, 8],
-   "Mb5"        => [0, 4, 6],
-   "M"          => [0, 4, 7],
-   ""           => [0, 4, 7],
-   "M#5"        => [0, 4, 8],
-   "Mb6"        => [0, 4, 8],
-   "7ndim5"     => [0, 4, 10],
-   "Msus4"      => [0, 5, 7],
-   "mb6b9"      => [0, 1, 3, 8],
-   "addb9"      => [0, 1, 4, 7],
-   "madd9"      => [0, 2, 3, 7],
-   "Madd9"      => [0, 2, 4, 7],
-   "sus24"      => [0, 2, 5, 7],
-   "M#5add9"    => [0, 2, 4, 8],
-   "9ndim5"     => [0, 2, 4, 10],
-   "+add#9"     => [0, 3, 4, 8],
-   "madd4"      => [0, 3, 5, 7],
-   "4"          => [0, 3, 5, 10],
-   "dim7"       => [0, 3, 6, 9],
-   "m7"         => [0, 3, 7, 10],
-   "mM7"        => [0, 3, 7, 11],
-   "m7#5"       => [0, 3, 8, 10],
-   "7b5"        => [0, 4, 6, 10],
-   "7"          => [0, 4, 7, 10],
-   "7#5"        => [0, 4, 8, 10],
-   "7b13"       => [0, 4, 8, 10],
-   "M7#5"       => [0, 4, 8, 11],
-   "M7b6"       => [0, 4, 8, 11],
-   "M7b5"       => [0, 4, 6, 11],
-   "M7#5sus4"   => [0, 5, 8, 11],
-   "7sus4"      => [0, 5, 7, 10],
-   "7#5sus4"    => [0, 5, 8, 10],
-   "M7sus4"     => [0, 5, 7, 11],
-   "M6"         => [0, 4, 7, 9],
-   "m7b5"       => [0, 3, 6, 10],
-   "M7"         => [0, 4, 7, 11],
-   "maj7"       => [0, 4, 7, 11],
-   "mb6M7"      => [0, 3, 8, 11],
-   "dimM7"      => [0, 3, 6, 11],
-   "m6"         => [0, 3, 5, 7, 9],
-   "m6/9"       => [0, 2, 3, 7, 9],
-   "M6/9"       => [0, 2, 4, 7, 9],
-   "M6#11"      => [0, 4, 6, 7, 9],
-   "m7add11"    => [0, 3, 5, 7, 10],
-   "dim7M7"     => [0, 3, 6, 9, 11],
-   "m9"         => [0, 2, 3, 7, 10],
-   "m9#5"       => [0, 2, 3, 8, 10],
-   "m9b5"       => [0, 2, 3, 6, 10],
-   "mM7b6"      => [0, 3, 7, 8, 11],
-   "mM9"        => [0, 2, 3, 7, 11],
-   "M7b9"       => [0, 1, 4, 7, 11],
-   "M9"         => [0, 2, 4, 7, 11],
-   "M9#5"       => [0, 2, 4, 8, 11],
-   "M9#5sus4"   => [0, 2, 5, 8, 11],
-   "M9b5"       => [0, 2, 4, 6, 11],
-   "M9sus4"     => [0, 2, 5, 7, 11],
-   "M7#11"      => [0, 4, 6, 7, 11],
-   "7#9"        => [0, 3, 4, 7, 10],
-   "7#11"       => [0, 4, 6, 7, 10],
-   "11"         => [0, 2, 5, 7, 10],
-   "11b9"       => [0, 1, 5, 7, 10],
-   "13ndim5"    => [0, 2, 4, 9, 10],
-   "7#5#9"      => [0, 3, 4, 8, 10],
-   "7#5b9"      => [0, 1, 4, 8, 10],
-   "7add6"      => [0, 4, 7, 9, 10],
-   "7b6"        => [0, 4, 7, 8, 10],
-   "7b9"        => [0, 1, 4, 7, 10],
-   "7sus4b9"    => [0, 1, 5, 7, 10],
-   "9"          => [0, 2, 4, 7, 10],
-   "9#5"        => [0, 2, 4, 8, 10],
-   "9b13"       => [0, 2, 4, 8, 10],
-   "9b5"        => [0, 2, 4, 6, 10],
-   "9sus4"      => [0, 2, 5, 7, 10],
-   "M6/9#11"    => [0, 2, 4, 6, 7, 9],
-   "6/9#11"     => [0, 2, 4, 6, 7, 9],
-   "9#5#11"     => [0, 2, 4, 6, 8, 10],
-   "Blues"      => [0, 3, 5, 6, 7, 10],
-   "m11"        => [0, 2, 3, 5, 7, 10],
-   "m11#5"      => [0, 2, 3, 5, 8, 10],
-   "m11b5"      => [0, 2, 3, 5, 6, 10],
-   "13b5"       => [0, 2, 4, 6, 9, 10],
-   "13b9"       => [0, 1, 4, 7, 9, 10],
-   "13sus4"     => [0, 2, 5, 7, 9, 10],
-   "7#11b13"    => [0, 4, 6, 7, 8, 10],
-   "7#5b9#11"   => [0, 1, 4, 6, 8, 10],
-   "7#9#11"     => [0, 3, 4, 6, 7, 10],
-   "7#9b13"     => [0, 3, 4, 7, 8, 10],
-   "13#9"       => [0, 3, 4, 7, 9, 10],
-   "13"         => [0, 2, 4, 7, 9, 10],
-   "7b9#11"     => [0, 1, 4, 6, 7, 10],
-   "7b9#9"      => [0, 1, 3, 4, 7, 10],
-   "7b9b13"     => [0, 1, 4, 7, 8, 10],
-   "7sus4b9b13" => [0, 1, 5, 7, 8, 10],
-   "9#11"       => [0, 2, 4, 6, 7, 10],
-   "M13"        => [0, 2, 4, 7, 9, 11],
-   "M7#9#11"    => [0, 3, 4, 6, 7, 11],
-   "M7add13"    => [0, 2, 4, 7, 9, 11],
-   "M9#11"      => [0, 2, 4, 6, 7, 11],
-   "mM9b6"      => [0, 2, 3, 7, 8, 11],
-   "7b9b13#11"  => [0, 1, 4, 6, 7, 8, 10],
-   "13b9#11"    => [0, 1, 4, 6, 7, 9, 10],
-   "9#11b13"    => [0, 2, 4, 6, 7, 8, 10],
-   "13#11"      => [0, 2, 4, 6, 7, 9, 10],
-   "M13#11"     => [0, 2, 4, 6, 7, 9, 11],
-   "m13"        => [0, 2, 3, 5, 7, 9, 10],
-   "13#9#11"    => [0, 3, 4, 6, 7, 9, 10],
-   "7#9#11b13"  => [0, 3, 4, 6, 7, 8, 10]
- }
+module Coltrane
+  module Qualities
+    CHORD_QUALITIES = {
+      "5"          => [0, 7],
+      "Msus2"      => [0, 2, 7],
+      "dim"        => [0, 3, 6],
+      "m"          => [0, 3, 7],
+      "m#5"        => [0, 3, 8],
+      "Mb5"        => [0, 4, 6],
+      "M"          => [0, 4, 7],
+      "M#5"        => [0, 4, 8],
+      "Mb6"        => [0, 4, 8],
+      "7ndim5"     => [0, 4, 10],
+      "Msus4"      => [0, 5, 7],
+      "mb6b9"      => [0, 1, 3, 8],
+      "addb9"      => [0, 1, 4, 7],
+      "madd9"      => [0, 2, 3, 7],
+      "Madd9"      => [0, 2, 4, 7],
+      "sus24"      => [0, 2, 5, 7],
+      "M#5add9"    => [0, 2, 4, 8],
+      "9ndim5"     => [0, 2, 4, 10],
+      "+add#9"     => [0, 3, 4, 8],
+      "madd4"      => [0, 3, 5, 7],
+      "4"          => [0, 3, 5, 10],
+      "dim7"       => [0, 3, 6, 9],
+      "m7"         => [0, 3, 7, 10],
+      "mM7"        => [0, 3, 7, 11],
+      "m7#5"       => [0, 3, 8, 10],
+      "7b5"        => [0, 4, 6, 10],
+      "7"          => [0, 4, 7, 10],
+      "7#5"        => [0, 4, 8, 10],
+      "7b13"       => [0, 4, 8, 10],
+      "M7#5"       => [0, 4, 8, 11],
+      "M7b6"       => [0, 4, 8, 11],
+      "M7b5"       => [0, 4, 6, 11],
+      "M7#5sus4"   => [0, 5, 8, 11],
+      "7sus4"      => [0, 5, 7, 10],
+      "7#5sus4"    => [0, 5, 8, 10],
+      "M7sus4"     => [0, 5, 7, 11],
+      "M6"         => [0, 4, 7, 9],
+      "m7b5"       => [0, 3, 6, 10],
+      "M7"         => [0, 4, 7, 11],
+      "maj7"       => [0, 4, 7, 11],
+      "mb6M7"      => [0, 3, 8, 11],
+      "dimM7"      => [0, 3, 6, 11],
+      "m6"         => [0, 3, 5, 7, 9],
+      "m6/9"       => [0, 2, 3, 7, 9],
+      "M6/9"       => [0, 2, 4, 7, 9],
+      "M6#11"      => [0, 4, 6, 7, 9],
+      "m7add11"    => [0, 3, 5, 7, 10],
+      "dim7M7"     => [0, 3, 6, 9, 11],
+      "m9"         => [0, 2, 3, 7, 10],
+      "m9#5"       => [0, 2, 3, 8, 10],
+      "m9b5"       => [0, 2, 3, 6, 10],
+      "mM7b6"      => [0, 3, 7, 8, 11],
+      "mM9"        => [0, 2, 3, 7, 11],
+      "M7b9"       => [0, 1, 4, 7, 11],
+      "M9"         => [0, 2, 4, 7, 11],
+      "M9#5"       => [0, 2, 4, 8, 11],
+      "M9#5sus4"   => [0, 2, 5, 8, 11],
+      "M9b5"       => [0, 2, 4, 6, 11],
+      "M9sus4"     => [0, 2, 5, 7, 11],
+      "M7#11"      => [0, 4, 6, 7, 11],
+      "7#9"        => [0, 3, 4, 7, 10],
+      "7#11"       => [0, 4, 6, 7, 10],
+      "11"         => [0, 2, 5, 7, 10],
+      "11b9"       => [0, 1, 5, 7, 10],
+      "13ndim5"    => [0, 2, 4, 9, 10],
+      "7#5#9"      => [0, 3, 4, 8, 10],
+      "7#5b9"      => [0, 1, 4, 8, 10],
+      "7add6"      => [0, 4, 7, 9, 10],
+      "7b6"        => [0, 4, 7, 8, 10],
+      "7b9"        => [0, 1, 4, 7, 10],
+      "7sus4b9"    => [0, 1, 5, 7, 10],
+      "9"          => [0, 2, 4, 7, 10],
+      "9#5"        => [0, 2, 4, 8, 10],
+      "9b13"       => [0, 2, 4, 8, 10],
+      "9b5"        => [0, 2, 4, 6, 10],
+      "9sus4"      => [0, 2, 5, 7, 10],
+      "M6/9#11"    => [0, 2, 4, 6, 7, 9],
+      "6/9#11"     => [0, 2, 4, 6, 7, 9],
+      "9#5#11"     => [0, 2, 4, 6, 8, 10],
+      "Blues"      => [0, 3, 5, 6, 7, 10],
+      "m11"        => [0, 2, 3, 5, 7, 10],
+      "m11#5"      => [0, 2, 3, 5, 8, 10],
+      "m11b5"      => [0, 2, 3, 5, 6, 10],
+      "13b5"       => [0, 2, 4, 6, 9, 10],
+      "13b9"       => [0, 1, 4, 7, 9, 10],
+      "13sus4"     => [0, 2, 5, 7, 9, 10],
+      "7#11b13"    => [0, 4, 6, 7, 8, 10],
+      "7#5b9#11"   => [0, 1, 4, 6, 8, 10],
+      "7#9#11"     => [0, 3, 4, 6, 7, 10],
+      "7#9b13"     => [0, 3, 4, 7, 8, 10],
+      "13#9"       => [0, 3, 4, 7, 9, 10],
+      "13"         => [0, 2, 4, 7, 9, 10],
+      "7b9#11"     => [0, 1, 4, 6, 7, 10],
+      "7b9#9"      => [0, 1, 3, 4, 7, 10],
+      "7b9b13"     => [0, 1, 4, 7, 8, 10],
+      "7sus4b9b13" => [0, 1, 5, 7, 8, 10],
+      "9#11"       => [0, 2, 4, 6, 7, 10],
+      "M13"        => [0, 2, 4, 7, 9, 11],
+      "M7#9#11"    => [0, 3, 4, 6, 7, 11],
+      "M7add13"    => [0, 2, 4, 7, 9, 11],
+      "M9#11"      => [0, 2, 4, 6, 7, 11],
+      "mM9b6"      => [0, 2, 3, 7, 8, 11],
+      "7b9b13#11"  => [0, 1, 4, 6, 7, 8, 10],
+      "13b9#11"    => [0, 1, 4, 6, 7, 9, 10],
+      "9#11b13"    => [0, 2, 4, 6, 7, 8, 10],
+      "13#11"      => [0, 2, 4, 6, 7, 9, 10],
+      "M13#11"     => [0, 2, 4, 6, 7, 9, 11],
+      "m13"        => [0, 2, 3, 5, 7, 9, 10],
+      "13#9#11"    => [0, 3, 4, 6, 7, 9, 10],
+      "7#9#11b13"  => [0, 3, 4, 6, 7, 8, 10]
+  }
+  end
 end