coltrane 2.0.0 → 2.1.0

data/lib/coltrane/pitch_class.rb

@@ -12,6 +12,7 @@ module Coltrane
   #
   class PitchClass
     attr_reader :integer
+    include Comparable
 
     NOTATION = %w[C C# D D# E F F# G G# A A# B].freeze
 
@@ -19,14 +20,14 @@ module Coltrane
       NOTATION.map { |n| new(n) }
     end
 
-    def initialize(arg, frequency: nil)
+    def initialize(arg=nil, frequency: nil)
       @integer = case arg
                  when String then NOTATION.index(arg)
-                 when Frequency, Float then frequency_to_integer(Frequency.new(arg))
-                 when Integer then (arg % 12)
-                 when NilClass then frequency_to_integer(Frequency.new(frequency))
+                 when Frequency then frequency_to_integer(Frequency.new(arg))
+                 when Numeric then (arg % 12)
+                 when nil then frequency_to_integer(Frequency.new(frequency))
                  when PitchClass then arg.integer
-                 else raise(InvalidArgumentError)
+                 else raise(WrongArgumentsError)
                  end
     end
 
@@ -55,27 +56,39 @@ module Coltrane
       notation.match? /#|b/
     end
 
+    def sharp?
+      notation.match? /#/
+    end
+
+    def flat?
+      notation.match? /b/
+    end
+
     alias notation true_notation
     alias to_s true_notation
 
     def +(other)
       case other
-      when Interval   then PitchClass[integer + other.semitones]
-      when Integer    then PitchClass[integer + other]
-      when PitchClass then Note.new(integer + other.integer)
-      when Frequency  then PitchClass.new(frequency: frequency + other)
+      when Interval   then self.class[integer + other.semitones]
+      when Integer    then self.class[integer + other]
+      when PitchClass then self.class[integer + other.integer]
+      when Frequency  then self.class.new(frequency: frequency + other)
       end
     end
 
     def -(other)
       case other
-      when Interval   then PitchClass[integer - other.semitones]
-      when Integer    then PitchClass[integer - other]
+      when Interval   then self.class[integer - other.semitones]
+      when Integer    then self.class[integer - other]
       when PitchClass then IntervalClass[frequency / other.frequency]
-      when Frequency  then PitchClass.new(frequency: frequency - other)
+      when Frequency  then self.class.new(frequency: frequency - other)
       end
     end
 
+    def <=>(other)
+      integer <=> other.integer
+    end
+
     def fundamental_frequency
       @fundamental_frequency ||=
         Frequency[

data/lib/coltrane/progression.rb

@@ -13,7 +13,7 @@ module Coltrane
 
       root_notes = NoteSet[*chords.map(&:root_note)]
 
-      scales = Scale.having_notes(*root_notes).scales
+      scales = Scale.having_notes(*root_notes)[:scales]
       progressions = scales.reduce([]) do |memo, scale|
         memo + [Progression.new(chords: chords, scale: scale)]
       end
@@ -29,7 +29,7 @@ module Coltrane
               '[notation:, [scale: || key:]] '\
       end
 
-      @scale  = scale || Scale.from_key(key)
+      @scale  = scale || Key[key]
       @chords =
         if !chords.nil?
           chords

data/lib/coltrane/qualities.rb

@@ -0,0 +1,257 @@
+module Qualities
+  QUALITIES = {
+    "Perfect Unison" => {
+      "Minor Third" => {
+        "Diminished Fifth" => {
+          "name" => "dim",
+          "Diminished Seventh" => {
+            "name" => "dim7",
+            "Minor Ninth" => {
+              "name" => "dim9"
+            },
+            "Major Ninth" => {
+              "name" => "dim(b9)"
+            }
+          },
+          "Minor Seventh" => {
+            "name" => "m7b5",
+            "Minor Ninth" => {
+              "name" => "m7b5b9",
+              "Perfect Eleventh" => {
+                "name" => "m7b5b11",
+                "Major Thirteenth" => {
+                  "name" => "m7b5b13"
+                }
+              }
+            },
+            "Major Ninth" => {
+              "name" => "m7b5(9)"
+            }
+          }
+        },
+        "Perfect Fifth" => {
+          "name" => "m",
+          "Major Sixth" => {
+            "name" => "m6"
+          },
+          "Minor Seventh" => {
+            "name" => "m7",
+            "Minor Ninth" => {
+              "name" => "m9",
+              "Perfect Eleventh" => {
+                "name" => "m11"
+              }
+            }
+          },
+          "Major Seventh" => {
+            "name" => "m(M7)",
+            "Major Ninth" => {
+              "name" => "m(M9)",
+              "Perfect Eleventh" => {
+                "name" => "m(M11)",
+                "Major Thirteenth" => {
+                  "name" => "m(M13)"
+                }
+              }
+            }
+          }
+        }
+      },
+      "Major Third" => {
+        "Perfect Fifth" => {
+          "name" => "M",
+          "Major Sixth" => {
+            "name" => "M6",
+            "Major Ninth" => {
+              "name" => "6/9",
+              "Perfect Eleventh" => {
+                "name" => "6/9(add11)"
+              }
+            }
+          },
+          "Minor Seventh" => {
+            "name" => "7",
+            "Major Ninth" => {
+              "name" => "9",
+              "Perfect Eleventh" => {
+                "name" => "11",
+                "Major Thirteenth" => {
+                  "name" => "13"
+                }
+              }
+            }
+          },
+          "Major Seventh" => {
+            "name" => "M7",
+            "Major Ninth" => {
+              "name" => "M9",
+              "Perfect Eleventh" => {
+                "name" => "M11",
+                "Major Thirteenth" => {
+                  "name" => "M13"
+                }
+              }
+            }
+          }
+        },
+        "Augmented Fifth" => {
+          "name" => "+",
+          "Minor Seventh" => {
+            "name" => "+7",
+            "Major Ninth" => {
+              "name" => "+9",
+              "Perfect Eleventh" => {
+                "name" => "+11",
+                "Major Thirteenth" => {
+                  "name" => "+13"
+                }
+              }
+            }
+          },
+          "Major Seventh" => {
+            "name" => "+M7",
+            "Major Ninth" => {
+              "name" => "+M9",
+              "Perfect Eleventh" => {
+                "name" => "+M11",
+                "Major Thirteenth" => {
+                  "name" => "+M13"
+                }
+              }
+            }
+          }
+        }
+      },
+      "Major Second" => {
+        "Perfect Fifth" => {
+          "name" => "Msus2",
+          "Major Sixth" => {
+            "name" => "M6sus2",
+            "Major Ninth" => {
+              "name" => "6/9sus2",
+              "Perfect Eleventh" => {
+                "name" => "6/9(add11)sus2"
+              }
+            }
+          },
+          "Minor Seventh" => {
+            "name" => "7sus2",
+            "Major Ninth" => {
+              "name" => "9sus2",
+              "Perfect Eleventh" => {
+                "name" => "11sus2",
+                "Major Thirteenth" => {
+                  "name" => "13sus2"
+                }
+              }
+            }
+          },
+          "Major Seventh" => {
+            "name" => "M7sus2",
+            "Major Ninth" => {
+              "name" => "M9sus2",
+              "Perfect Eleventh" => {
+                "name" => "M11sus2",
+                "Major Thirteenth" => {
+                  "name" => "M13sus2"
+                }
+              }
+            }
+          }
+        },
+        "Augmented Fifth" => {
+          "name" => "+sus2",
+          "Minor Seventh" => {
+            "name" => "+7sus2",
+            "Major Ninth" => {
+              "name" => "+9sus2",
+              "Perfect Eleventh" => {
+                "name" => "+11sus2",
+                "Major Thirteenth" => {
+                  "name" => "+13sus2"
+                }
+              }
+            }
+          },
+          "Major Seventh" => {
+            "name" => "+M7sus2",
+            "Major Ninth" => {
+              "name" => "+M9sus2",
+              "Perfect Eleventh" => {
+                "name" => "+M11sus2",
+                "Major Thirteenth" => {
+                  "name" => "+M13sus2"
+                }
+              }
+            }
+          }
+        }
+      },
+      "Perfect Fourth" => {
+        "Perfect Fifth" => {
+          "name" => "Msus4",
+          "Major Sixth" => {
+            "name" => "M6sus4",
+            "Major Ninth" => {
+              "name" => "6/9sus4",
+              "Perfect Eleventh" => {
+                "name" => "6/9(add11)sus4"
+              }
+            }
+          },
+          "Minor Seventh" => {
+            "name" => "7sus4",
+            "Major Ninth" => {
+              "name" => "9sus4",
+              "Perfect Eleventh" => {
+                "name" => "11sus4",
+                "Major Thirteenth" => {
+                  "name" => "13sus4"
+                }
+              }
+            }
+          },
+          "Major Seventh" => {
+            "name" => "M7sus4",
+            "Major Ninth" => {
+              "name" => "M9sus4",
+              "Perfect Eleventh" => {
+                "name" => "M11sus4",
+                "Major Thirteenth" => {
+                  "name" => "M13sus4"
+                }
+              }
+            }
+          }
+        },
+        "Augmented Fifth" => {
+          "name" => "+sus4",
+          "Minor Seventh" => {
+            "name" => "+7sus4",
+            "Major Ninth" => {
+              "name" => "+9sus4",
+              "Perfect Eleventh" => {
+                "name" => "+11sus4",
+                "Major Thirteenth" => {
+                  "name" => "+13sus4"
+                }
+              }
+            }
+          },
+          "Major Seventh" => {
+            "name" => "+M7sus4",
+            "Major Ninth" => {
+              "name" => "+M9sus4",
+              "Perfect Eleventh" => {
+                "name" => "+M11sus4",
+                "Major Thirteenth" => {
+                  "name" => "+M13sus4"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+end

data/lib/coltrane/roman_chord.rb

@@ -4,10 +4,7 @@ module Coltrane
   # This class deals with chords in roman notation. Ex: IVº.
   class RomanChord
     DIGITS = %w[I II III IV V VI VII].freeze
-    NOTATION_REGEX = /
-      (?<degree>b?[ivIV]*)
-      (?<quality>.*)
-    /x
+    NOTATION_REGEX = /(b?[ivIV]*)(.*)/
 
     NOTATION_SUBSTITUTIONS = [
       %w[º dim],
@@ -21,7 +18,7 @@ module Coltrane
               '[notation, [scale: || key:]] '\
               '[chord:, [scale: || key:]] '\
       end
-      @scale = scale || Scale.from_key(key)
+      @scale = scale || Key[key]
       if notation
         @notation = notation
       elsif chord
@@ -31,7 +28,7 @@ module Coltrane
 
     def degree
       return @scale.degree_of_note(root_note) unless @chord.nil?
-      d      = regexed_notation['degree']
+      d      = regexed_notation[:degree]
       @flats = d.count('b')
       d      = d.delete('b')
       @degree ||= DIGITS.index(d.upcase) + 1
@@ -43,7 +40,7 @@ module Coltrane
     end
 
     def upcase?
-      !!(regexed_notation['degree'][0].match /[[:upper:]]/)
+      !!(regexed_notation[:degree][0].match /[[:upper:]]/)
     end
 
     def chord
@@ -61,8 +58,8 @@ module Coltrane
 
     def quality_name
       return @chord.quality.name unless @chord.nil?
-      q     = normalize_quality_name(regexed_notation['quality'])
-      minor = 'm' if !q.match?(/dim|m7b5/) && !upcase?
+      q     = normalize_quality_name(regexed_notation[:quality])
+      minor = 'm' if (!q.match? /dim|m7b5/) && !upcase?
       q     = [minor, q].join
       q.empty? ? 'M' : q
     end
@@ -99,7 +96,10 @@ module Coltrane
     private
 
     def regexed_notation
-      @regexed_notation ||= @notation.match(NOTATION_REGEX).named_captures
+      @regexed_notation ||= begin
+        matchdata = @notation.match(NOTATION_REGEX)
+        { degree: matchdata[1], quality: matchdata[2] }
+      end
     end
 
     def normalize_quality_name(quality_name)

data/lib/coltrane/scale.rb

@@ -4,6 +4,10 @@ module Coltrane
   # Musical scale creation and manipulation
   class Scale
     extend ClassicScales
+    extend Forwardable
+
+    def_delegators :notes, :accidentals, :sharps, :flats
+
     attr_reader :interval_sequence, :tone
 
     def initialize(*distances, tone: 'C', mode: 1, name: nil, notes: nil)
@@ -13,8 +17,10 @@ module Coltrane
         distances          = distances.rotate(mode - 1)
         @interval_sequence = IntervalSequence.new(distances: distances)
       elsif notes
-        ds = NoteSet[*notes].interval_sequence.distances
-        new(*ds, tone: notes.first)
+        @notes             = NoteSet[*notes]
+        @tone              = @notes.first
+        ds                 = @notes.interval_sequence.distances
+        @interval_sequence = IntervalSequence.new(distances: ds)
       else
         raise WrongKeywordsError, '[*distances, tone: "C", mode: 1] || [notes:]'
       end
@@ -79,7 +85,7 @@ module Coltrane
     alias include? include_notes?
 
     def notes
-      NoteSet[*degrees.map { |d| degree(d) }]
+      @notes ||= NoteSet[*degrees.map { |d| degree(d) }]
     end
 
     def interval(i)

data/lib/coltrane/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Coltrane
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end