coltrane 1.0.1 → 1.0.2

data/lib/coltrane/interval.rb

@@ -1,41 +1,42 @@
+# frozen_string_literal: true
+
 module Coltrane
   # It describes a interval between 2 pitches
   class Interval
     attr_reader :semitones
 
-    NAMES = [
-      '1P',
-      '2m',
-      '2M',
-      '3m',
-      '3M',
-      '4P',
-      '4A',
-      '5P',
-      '6m',
-      '6M',
-      '7m',
-      '7M'
+    NAMES = %w[
+      1P
+      2m
+      2M
+      3m
+      3M
+      4P
+      4A
+      5P
+      6m
+      6M
+      7m
+      7M
     ].freeze
 
     def initialize(arg)
       @semitones = (case arg
-                     when Interval then arg.semitones
-                     when String   then NAMES.index(arg)
-                     when Numeric  then arg
-                   end) % 12
+                    when Interval then arg.semitones
+                    when String   then NAMES.index(arg)
+                    when Numeric  then arg
+                    end) % 12
     end
 
     def name
       NAMES[semitones]
     end
 
-    def +(x)
-      case x
-      when Numeric then Interval.new(semitones + x)
-      when Interval then Interval.new(semitones + x.semitones)
+    def +(other)
+      case other
+      when Numeric then Interval.new(semitones + other)
+      when Interval then Interval.new(semitones + other.semitones)
       end
     end
-
   end
-end
+end

data/lib/coltrane/interval_sequence.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Coltrane
   # It describes a sequence of intervals
   class IntervalSequence
@@ -22,7 +24,7 @@ module Coltrane
 
     def distances
       intervals_semitones[1..-1].each_with_index.map do |n, i|
-        if i == 0
+        if i.zero?
           n
         elsif i < intervals_semitones.size
           n - intervals_semitones[i]
@@ -45,7 +47,7 @@ module Coltrane
     end
 
     def zero_it
-      self.shift(-intervals.first.semitones)
+      shift(-intervals.first.semitones)
     end
 
     def inversion(index)
@@ -53,11 +55,11 @@ module Coltrane
     end
 
     def next_inversion
-      inversion(index+1)
+      inversion(index + 1)
     end
 
     def previous_inversion
-      inversion(index-1)
+      inversion(index - 1)
     end
 
     def inversions
@@ -66,8 +68,7 @@ module Coltrane
       end
     end
 
-    def quality
-    end
+    def quality; end
 
     def intervals_semitones
       map(&:semitones)
@@ -97,4 +98,4 @@ module Coltrane
       notes.map { |n| notes.root - n }.sort_by(&:semitones)
     end
   end
-end
+end

data/lib/coltrane/interval_set.rb

@@ -1,4 +1,5 @@
 
+# frozen_string_literal: true
 # class IntervalSet
 #   def initialize(*intervals)
 #     @intervals = intervals

data/lib/coltrane/note.rb

@@ -1,11 +1,12 @@
-module Coltrane
-  # It describes a musical note, independent of octave
+# frozen_string_literal: true
 
+module Coltrane
+  # Describes a musical note, independent of octave (that'd be pitch)
   class Note
     include Multiton
 
     attr_reader :name, :number
-    alias_method :id, :number
+    alias id number
 
     NOTES = {
       'C'  => 0,
@@ -28,7 +29,8 @@ module Coltrane
     }.freeze
 
     def initialize(name)
-      @name, @number = name, NOTES[name]
+      @name = name
+      @number = NOTES[name]
     end
 
     private_class_method :new
@@ -39,10 +41,11 @@ module Coltrane
         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}")
+        else
+          raise InvalidNoteError, "Wrong type: #{arg.class}"
         end
 
-      new(name) || (raise InvalidNote.new("#{arg}"))
+      new(name) || (raise InvalidNoteError, arg.to_s)
     end
 
     def self.all
@@ -50,63 +53,37 @@ module Coltrane
     end
 
     def self.find_note(str)
-      NOTES.each { |k, v| return k if str.casecmp?(k) }
+      NOTES.each_key { |k, _v| return k if str.casecmp?(k) }
       nil
     end
 
     def pretty_name
-      @name.gsub('b',"\u266D").gsub('#',"\u266F")
+      @name.tr('b', "\u266D").tr('#', "\u266F")
     end
 
-    alias_method :to_s, :name
+    alias to_s name
 
     def accident?
-      [1,3,6,8,10].include?(number)
+      [1, 3, 6, 8, 10].include?(number)
     end
 
-    def +(n)
-      case n
-        when Interval then Note[number + n.semitones]
-        when Numeric  then Note[number + n]
-        when Note     then Chord.new(number + n.number)
+    def +(other)
+      case other
+      when Interval then Note[number + other.semitones]
+      when Numeric  then Note[number + other]
+      when Note     then Chord.new(number + other.number)
       end
     end
 
-    def -(n)
-      case n
-        when Numeric then Note.new(n - number)
-        when Note    then Interval.new(n.number - number)
+    def -(other)
+      case other
+      when Numeric then Note.new(other - number)
+      when Note    then Interval.new(other.number - number)
       end
     end
 
-    def valid_note?(note_name)
-      find_note(note_name)
-    end
-
     def interval_to(note_name)
       Note[note_name] - self
     end
-
-    def transpose_by(semitones)
-      self + semitones
-    end
-
-    def guitar_notes
-      Guitar.strings.reduce([]) do |memo, guitar_string|
-        memo + in_guitar_string(guitar_string)
-      end
-    end
-
-    def on_guitar
-      GuitarNoteSet.new(guitar_notes).render
-    end
-
-    def in_guitar_string(guitar_string)
-      guitar_string.guitar_notes_for_note(self)
-    end
-
-    def in_guitar_string_region(guitar_string, region)
-      guitar_string.guitar_notes_for_note_in_region(self, region)
-    end
   end
-end
+end

data/lib/coltrane/note_set.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Coltrane
   # It describes a set of notes
   class NoteSet
@@ -8,8 +10,8 @@ module Coltrane
 
     attr_reader :notes
 
-    alias_method :root, :first
-    alias_method :all, :notes
+    alias root first
+    alias all notes
 
     def self.[](*notes)
       new(notes)
@@ -19,21 +21,21 @@ module Coltrane
       @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)
+        when Array   then arg.map { |n| n.is_a?(Note) ? n : Note[n] }
+        else raise InvalidNotesError, arg
         end
     end
 
-    def &(another)
-      NoteSet[*(notes & another.notes)]
+    def &(other)
+      NoteSet[*(notes & other.notes)]
     end
 
     def degree(note)
-      index(note)+1
+      index(note) + 1
     end
 
-    def +(other_noteset)
-      NoteSet[*(notes + other_noteset.notes)]
+    def +(other)
+      NoteSet[*(notes + other.notes)]
     end
 
     def pretty_names
@@ -54,12 +56,8 @@ module Coltrane
       end
     end
 
-    def guitar_notes
-      GuitarNoteSet.new(notes.map(&:guitar_notes).flatten)
-    end
-
     def interval_sequence
       IntervalSequence.new(notes: self)
     end
   end
-end
+end

data/lib/coltrane/pitch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Coltrane
   # It describes a pitch, like E4 or Bb5. It's like a note, but it has an octave
   class Pitch
@@ -28,9 +30,8 @@ module Coltrane
       Note[number]
     end
 
-    def +(arg)
-      n = arg.is_a?(Pitch) ? arg.number : arg
-      Pitch.new(number + n)
+    def +(other)
+      Pitch.new(number + (other.is_a?(Pitch) ? other.number : other))
     end
   end
-end
+end

data/lib/coltrane/progression.rb

@@ -1,35 +1,24 @@
+# frozen_string_literal: true
+
 module Coltrane
+  # Allows creation of chord progressions
   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
+    def initialize(_roman_notation, key: nil, scale: nil)
+      @scale = Scale.from_key(key) unless key.nil?
     end
 
-    def chords
-      all_chords.values_at(*chord_indexes)
-    end
+    # def chords
 
-    def on_guitar
-      chords.map(&:on_guitar)
-    end
-
-    def on_piano
-      chords.map(&:on_piano)
-    end
+    # end
 
     private
 
-    def all_chords
-      scale.sevenths
-    end
-
     def chord_indexes
-      degrees.map { |d| d-1 }
+      scale.degrees.map { |d| d - 1 }
     end
   end
-end
+end

data/lib/coltrane/qualities.rb

@@ -1,116 +1,118 @@
+# frozen_string_literal: true
+
 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]
-  }
+      '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]
+    }.freeze
   end
-end
+end