coltrane 0.0.2 → 1.0.0

data/lib/coltrane/roman_chord.rb

@@ -0,0 +1,36 @@
+module Coltrane
+  class RomanChord
+    DIGITS = {
+      'I'   => 1,
+      'V'   => 5,
+    }
+
+    def initialize(scale, roman_numeral)
+      @scale = scale
+      @roman_numeral = roman_numeral
+    end
+
+    def to_chord
+      Chord.new root_note: root_note,
+                quality: quality
+    end
+
+    def root_note
+      @scale[degree]
+    end
+
+    def degree
+      @roman_numeral.split('').reduce(0) do |memo, r|
+        memo + (DIGITS[r] || 0) + (DIGITS[r.swapcase] || 0)
+      end
+    end
+
+    def quality
+      ChordQuality.new(name: is_major? ? 'M' : 'm')
+    end
+
+    def is_major?
+      @roman_numeral[0] =~ /[[:upper]]/
+    end
+  end
+end

data/lib/coltrane/scale.rb

@@ -3,23 +3,51 @@ module Coltrane
     extend ClassicScales
     attr_reader :interval_sequence, :tone
 
-    def initialize(*interval_steps, tone: 'C', mode: 1)
-      @tone = Note.new(tone)
-      intervals = interval_steps.rotate(mode-1).reduce([0]) do |intervals, step|
-        intervals << (intervals.last + step)
+    def initialize(*distances, tone: 'C', mode: 1, name: nil, notes: nil)
+      @name                = name
+      if !distances.nil? && !tone.nil?
+        @tone              = Note[tone]
+        distances          = distances.rotate(mode-1)
+        @interval_sequence = IntervalSequence.new(distances: distances)
+      elsif !notes.nil?
+        ds = NoteSet[*notes].interval_sequence.distances
+        self.new(*ds, tone: notes.first)
+      else raise WrongKeywords.new('[*distances, (tone: "C", mode: 1)] || [notes:]')
       end
+    end
+
+    def id
+      [(name || @interval_sequence), tone.number]
+    end
+
+    def name
+      @name = begin
+        is = self.interval_sequence.distances
+        (0...is.size).each do |i|
+          if (scale_name = Coltrane::ClassicScales::SCALES.key(is.rotate(i)))
+            return scale_name
+          end
+        end
+        nil
+      end
+    end
 
-      @interval_sequence = IntervalSequence.new(intervals)
+    def pretty_name
+      "#{tone.name} #{name}"
     end
 
-    def [](degree)
-      if degree < 1
-        raise 'Wrong degree! Use music convention for requesting degrees'
+    alias_method :full_name, :pretty_name
+
+    def degree(d)
+      if d < 1 || d > size
+        raise WrongDegree.new(d)
       end
 
-      tone + interval_sequence[(degree-1) % (size)].number
+      tone + interval_sequence[d - 1].semitones
     end
 
+    alias_method :[], :degree
+
     def degrees
       (1..size)
     end
@@ -35,14 +63,22 @@ module Coltrane
       return note + 1 unless note.nil?
     end
 
-    def include_notes?(*arg_notes)
-      arg_notes.each_with_object([]) do |n, memo|
-        memo << n if notes.map(&:name).include?(n.name)
-      end
+    def &(something)
+      raise HasNoNotes unless something.respond_to?(:notes)
+      notes & something
     end
 
+    def include_notes?(arg)
+      noteset = arg.is_a?(Note) ? NoteSet[arg] : arg
+      (self & noteset).size == noteset.size
+    end
+
+    alias_method :include?, :include_notes?
+
     def notes
-      @notes ||= degrees.map { |d| self[d] }
+      Coltrane::Cache.find_or_record(cache_key("notes")) do
+        NoteSet[*degrees.map { |d| degree(d) }]
+      end
     end
 
     def interval(i)
@@ -50,89 +86,61 @@ module Coltrane
     end
 
     def size
-      interval_sequence.all.count - 1
+      interval_sequence.size
     end
 
-    def tertians
-      degrees.reduce([]) do |chords, degree|
-        intervals = IntervalSequence.new(3.times.map { |i| interval(degree+(i*2)) })
-        intervals = intervals.shift(-intervals.numbers[0])
-        chord_name = "#{self[degree].name}#{ChordQuality.new(intervals).name}"
-        chords << Chord.new(chord_name)
+    def tertians(n=3)
+      degrees.size.times.reduce([]) do |memo, d|
+        ns = NoteSet[
+          *n.times.map { |i| notes[(d + (i*2)) % (size)]}
+        ]
+        chord = Chord.new(notes: ns)
+        chord.named? ? memo + [chord] : memo
       end
     end
 
-    def sevenths
-      degrees.reduce([]) do |chords, degree|
-        intervals = IntervalSequence.new(4.times.map { |i| interval(degree+(i*2)) })
-        intervals = intervals.shift(-intervals.numbers[0])
-        chord_name = "#{self[degree].name}#{ChordQuality.new(intervals).name}"
-        chords << Chord.new(chord_name)
-      end
-    end
-
-    def on_guitar
-      NoteSet.new(notes).guitar_notes.render
+    def triads
+      tertians(3)
     end
 
-    def intervals_on_guitar
-      NoteSet.new(notes).guitar_notes.render(tone)
-    end
-
-    def degrees_on_guitar
-      GuitarRepresentation.render_degrees(NoteSet.new(notes).guitar_notes, self)
-    end
-
-    def notes_on_guitar
-      GuitarRepresentation.render_notes(NoteSet.new(notes).guitar_notes, self)
-    end
-
-    def intervals_on_piano
-      PianoRepresentation.render_intervals(notes, tone)
+    def sevenths
+      tertians(4)
     end
 
-    def on_piano
-      intervals_on_piano
+    def pentads
+      tertians(5)
     end
 
-
-    def cache
-      ScaleCache.find_or_create_by(
-        interval_sequence: interval_sequence.numbers.to_s,
-        tone: tone.name
-      )
+    def progression(*degrees)
+      Progression.new(self, degrees)
     end
 
-    def cached_chords(size)
-      cchords = cache.chord_caches.where(size: size)
-      cchords.map do |chord_cache|
-        Chord.new(chord_cache.name)
-      end
+    def cache_key(extra)
+      [
+        @tone.name,
+        @interval_sequence.intervals_semitones.join(),
+        extra
+      ].join('-')
     end
 
-    def cache_chords(chords)
-      []
-      chords.each do |chord|
-        cache.chord_caches.create name: chord.name, size: chord.size
+    def all_chords
+      (3..size).reduce([]) do |memo, s|
+        memo + chords(s)
       end
     end
 
     def chords(size)
-      cchords = cached_chords(size)
-      if cchords.empty?
-        cache_chords(begin
-          permutations = interval_sequence.numbers.permutation(size).map do |intervals|
-            IntervalSequence.new(intervals)
+      Coltrane::Cache.find_or_record(cache_key("chords-#{size}")) do
+        included_names = []
+        notes.permutation(size).reduce([]) do |memo, ns|
+          chord = Chord.new(notes: ns)
+          if chord.named? && !included_names.include?(chord.name)
+            included_names << chord.name
+            memo + [chord]
+          else
+            memo
           end
-          permutations.uniq.map do |c|
-            quality = ChordQuality.new(c.zero_it)
-            unless quality.name.nil?
-              Chord.new "#{(tone + c[0].number).name}#{quality.name}"
-            end
-          end.compact
-        end)
-      else
-        cchords
+        end
       end
     end
   end

data/lib/coltrane/version.rb

@@ -1,3 +1,3 @@
 module Coltrane
-  VERSION = "0.0.2"
+  VERSION = "1.0.0"
 end

data/lib/core_ext.rb

@@ -0,0 +1,12 @@
+class String
+  # Stolen from Active Support and changed a bit
+  def underscore
+    return self unless /[A-Z-]|::/.match?(self)
+    word = self.to_s.gsub("::", "/")
+    word.gsub!(/([A-Z\d]+)([A-Z][a-z])/, '\1_\2')
+    word.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
+    word.tr!("-", "_")
+    word.downcase!
+    word
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coltrane
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Pedro Maciel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-25 00:00:00.000000000 Z
+date: 2018-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -41,12 +41,15 @@ dependencies:
 description: 
 email:
 - pedro@pedromaciel.com
-executables: []
+executables:
+- coltrane
 extensions: []
 extra_rdoc_files: []
 files:
 - ".bundle/config"
+- ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -55,7 +58,9 @@ files:
 - README.md
 - Rakefile
 - bin/_guard-core
+- bin/bundle
 - bin/bundler
+- bin/byebug
 - bin/coderay
 - bin/coltrane
 - bin/console
@@ -86,21 +91,27 @@ files:
 - db/cache_test.sqlite3
 - db/config.yml
 - db/schema.rb
+- exe/coltrane
+- lib/cli/bass_guitar.rb
+- lib/cli/chord.rb
+- lib/cli/errors.rb
+- lib/cli/guitar.rb
+- lib/cli/notes.rb
+- lib/cli/piano.rb
+- lib/cli/representation.rb
+- lib/cli/scale.rb
+- lib/cli/text.rb
+- lib/cli/ukulele.rb
+- lib/coltrane-cli.rb
 - lib/coltrane.rb
+- lib/coltrane/cache.rb
 - lib/coltrane/cadence.rb
 - lib/coltrane/chord.rb
 - lib/coltrane/chord_cache.rb
 - lib/coltrane/chord_quality.rb
+- lib/coltrane/classic_progressions.rb
 - lib/coltrane/classic_scales.rb
-- lib/coltrane/essential_guitar_chords.rb
-- lib/coltrane/fret_set.rb
-- lib/coltrane/guitar.rb
-- lib/coltrane/guitar_chord.rb
-- lib/coltrane/guitar_chord_finder.rb
-- lib/coltrane/guitar_note.rb
-- lib/coltrane/guitar_note_set.rb
-- lib/coltrane/guitar_representation.rb
-- lib/coltrane/guitar_string.rb
+- lib/coltrane/errors.rb
 - lib/coltrane/interval.rb
 - lib/coltrane/interval_sequence.rb
 - lib/coltrane/interval_set.rb
@@ -111,10 +122,12 @@ files:
 - lib/coltrane/pitch.rb
 - lib/coltrane/progression.rb
 - lib/coltrane/qualities.rb
+- lib/coltrane/roman_chord.rb
 - lib/coltrane/scale.rb
-- lib/coltrane/scale_cache.rb
 - lib/coltrane/scale_chord.rb
 - lib/coltrane/version.rb
+- lib/core_ext.rb
+- pkg/coltrane-0.0.2.gem
 homepage: http://github.com/pedrozath/coltrane
 licenses:
 - MIT
@@ -136,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: It deals with all sorts of calculations around music theory and allows for

data/lib/coltrane/essential_guitar_chords.rb

@@ -1,82 +0,0 @@
-module Coltrane
-  module EssentialGuitarChords
-    CHORDS = {
-      'C'      => [nil, 3, 2, 0, 1, 0],
-      'Cm'     => [nil, 10, 10, 8, 6, 4],
-      'Cmaj7'  => [nil, 3, 5, 4, 5, nil],
-      'C7'     => [nil, 10, 10, 9, 11, nil],
-      'Cm7'    => [6,6,5,5,nil,nil],
-      'Cm7b5'  => [nil, 3,4,3,4, nil],
-      'C#'     => [nil,8,6,6,6,nil],
-      'C#m'    => [nil,5,6,6,5,nil],
-      'C#maj7' => [4,4,3,5,nil,nil],
-      'C#7'    => [nil, nil, 6,6,6,7],
-      'C#m7'   => [nil, 2,2,1,2],
-      'C#m7b5' => [nil, 4,5,4,5, nil],
-      'D'      => [5,5,4,nil,nil,nil],
-      'Dm'     => [10,nil,nil,10,10,nil],
-      'Dmaj7'  => [5,5,4,6,nil,nil],
-      'D7'     => [5,5,4,5,nil,nil],
-      'Dm7'    => [nil,3,3,2,3,nil],
-      'Dm7b5'  => [],
-      'D#'     => [],
-      'D#m'    => [],
-      'D#maj7' => [],
-      'D#7'    => [],
-      'D#m7'   => [],
-      'D#m7b5' => [],
-      'E'      => [],
-      'Em'     => [],
-      'Emaj7'  => [],
-      'E7'     => [],
-      'Em7'    => [],
-      'Em7b5'  => [],
-      'F'      => [],
-      'Fm'     => [],
-      'Fmaj7'  => [],
-      'F7'     => [],
-      'Fm7'    => [],
-      'Fm7b5'  => [],
-      'F#'     => [],
-      'F#m'    => [],
-      'F#maj7' => [],
-      'F#7'    => [],
-      'F#m7'   => [],
-      'F#m7b5' => [],
-      'G'      => [],
-      'Gm'     => [],
-      'Gmaj7'  => [],
-      'G7'     => [],
-      'Gm7'    => [],
-      'Gm7b5'  => [],
-      'G#'     => [],
-      'G#m'    => [],
-      'G#maj7' => [],
-      'G#7'    => [],
-      'G#m7'   => [],
-      'G#m7b5' => [],
-      'A'      => [],
-      'Am'     => [],
-      'Amaj7'  => [],
-      'A7'     => [],
-      'Am7'    => [],
-      'Am7b5'  => [],
-      'A#'     => [],
-      'A#m'    => [],
-      'A#maj7' => [],
-      'A#7'    => [],
-      'A#m7'   => [],
-      'A#m7b5' => [],
-      'B'      => [],
-      'Bm'     => [],
-      'Bmaj7'  => [],
-      'B7'     => [],
-      'Bm7'    => [],
-      'Bm7b5'  => []
-    }
-
-    def [](name)
-      GuitarChord.new_from_frets(*CHORDS[name])
-    end
-  end
-end