coltrane 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 875bc7bd199ea9861cfaad5aceb0f9ccc8005d7617fe84cb6767ed4aa8d47972
-  data.tar.gz: 6e0b3af6769f03290b2c5efccede1e92a7a479324af3907005bd0e1a5c8476cb
+  metadata.gz: 3fe037a225ee4b1d95347b454262b9f97a89b457a4d9512f2bb494c61492587a
+  data.tar.gz: 983e49a02cbaeb9d1451f060350f9af1e3bbb9bfeab4149456d8b216e5bb8729
 SHA512:
-  metadata.gz: f84e7beafef420b8f0178e0e2e07779018f55725a40123deeaa8a1a4bc8b8a883a13b2e3432a47ea2fe8162df4325a1a6b712df12d4abac40a114d66e0da2ad0
-  data.tar.gz: 0f1a2d26f22f7692d867dcdf5d014043bc5e347bcd78a6e777415c7b5c9bb43860a1211808ef3f3424a1bd4f3732b15d30c64b7e04c72173c2249e869c0e7497
+  metadata.gz: 04c66aa471f914b9c061b55d083915888efe873ac6eec8b4efb3c4f62e335e16090126661b1f68e54a4c32dce0143fb3fd15936c2256cf1f83cd5a2fc6b516b7
+  data.tar.gz: 63c1c79f57ace4dabcf4f8a010d7f30ac32fee0f0a7469a8f79b6f549ed88d29eadf2c3065a6febc85d867ea5eb82c4a8fd15f54f22bf6fde502134bf460cb74

data/CHANGELOG.md

@@ -5,6 +5,10 @@
 - Fix chords so that they generate a barre and a non-barre version and prevent
   barre chords from picking notes before the barre.
 
+## [3.3.2]
+- Fixes greek modes so now they output correct sharps/flats
+- Adds a coherence criteria for picking best guitar chords (based on distance between freqs.)
+
 ## [3.2.0]
 - Adds custom_guitar and custom_guitar_frets
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    coltrane (3.3.1)
+    coltrane (3.3.2)
       color (~> 1.8)
       dry-monads (~> 0.4)
       paint (~> 2.0)
@@ -18,7 +18,7 @@ GEM
     concurrent-ruby (1.0.5)
     diff-lcs (1.3)
     docile (1.3.0)
-    dry-core (0.4.5)
+    dry-core (0.4.6)
       concurrent-ruby (~> 1.0)
     dry-equalizer (0.2.1)
     dry-monads (0.4.0)

data/lib/coltrane/theory.rb

@@ -42,6 +42,7 @@ module Coltrane
     autoload :ScaleSet,               'coltrane/theory/scale_set'
     autoload :CircleOfFifths,         'coltrane/theory/circle_of_fifths'
     autoload :DiatonicScale,          'coltrane/theory/diatonic_scale'
+    autoload :GreekMode,              'coltrane/theory/greek_mode'
     autoload :Key,                    'coltrane/theory/key'
 
     autoload :NotableProgressions,    'coltrane/theory/notable_progressions'

data/lib/coltrane/theory/classic_scales.rb

@@ -16,16 +16,6 @@ module Coltrane
         'Chromatic'        => [1] * 12
       }.freeze
 
-      GREEK_MODES = %w[
-        Ionian
-        Dorian
-        Phrygian
-        Lydian
-        Mixolydian
-        Aeolian
-        Locrian
-      ].freeze
-
       # Creates factories for scales
       SCALES.each do |name, distances|
         define_method name.underscore do |tone = 'C', mode = 1|
@@ -34,13 +24,11 @@ module Coltrane
       end
 
       # Creates factories for Greek Modes
-      GREEK_MODES.each_with_index do |mode, index|
-        mode_name = mode
-        mode_n = index + 1
-        define_method mode.underscore do |tone = 'C'|
-          new(notes: DiatonicScale.new(tone).notes.rotate(index))
+      class_eval(GreekMode::MODES.each_with_index.reduce('') { |code, (mode, index)| code + <<-RUBY }, __FILE__, __LINE__ + 1)
+        def #{mode.underscore}(tone = 'C')
+          GreekMode.new(:#{mode.underscore.to_sym}, tone)
         end
-      end
+      RUBY
 
       # Factories for the diatonic scale
       def major(note = 'C')
@@ -51,10 +39,10 @@ module Coltrane
         DiatonicScale.new(note, major: false)
       end
 
-      alias diatonic major
+      alias diatonic      major
       alias natural_minor minor
-      alias pentatonic pentatonic_major
-      alias blues blues_major
+      alias pentatonic    pentatonic_major
+      alias blues         blues_major
 
       def known_scales
         SCALES.keys + ['Major', 'Natural Minor']

data/lib/coltrane/theory/greek_mode.rb

@@ -0,0 +1,47 @@
+module Coltrane
+  module Theory
+    class GreekMode < Scale
+      attr_reader :mode
+
+      MODES = %w[
+        Ionian
+        Dorian
+        Phrygian
+        Lydian
+        Mixolydian
+        Aeolian
+        Locrian
+      ].freeze
+
+      LETTER_SEQUENCE = %w[C D E F G A B].freeze
+
+      def initialize(mode, tone)
+        super name: mode.capitalize, notes: begin
+          @mode = mode.to_s
+          @tone = tone
+          # binding.pry
+          base_major_notes
+          .rotate(mode_index)
+          .zip(letter_sequence)
+          .map { |(note, letter)| note.as(letter) }
+        end
+      end
+
+      private
+
+      def letter_sequence
+        LETTER_SEQUENCE.yield_self { |seq| seq.rotate(seq.index(tone))}
+      end
+
+      def mode_index
+        @mode_index ||= MODES.map(&:downcase).index(mode.to_s)
+      end
+
+      def base_major_notes
+        base_scale    = DiatonicScale.new(Note['C']).notes
+        base_interval = base_scale[0] - base_scale[mode_index]
+        DiatonicScale.new(Note[tone] - base_interval).notes
+      end
+    end
+  end
+end

data/lib/coltrane/theory/scale.rb

@@ -45,7 +45,7 @@ module Coltrane
         @name ||= begin
           is = interval_sequence.relative_intervals
           (0...is.size).each do |i|
-            if (scale_name = ::ClassicScales::SCALES.key(is.rotate(i)))
+            if (scale_name = ClassicScales::SCALES.key(is.rotate(i)))
               return scale_name
             end
           end

data/lib/coltrane/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coltrane
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Pedro Maciel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-13 00:00:00.000000000 Z
+date: 2018-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-reader
@@ -223,6 +223,7 @@ files:
 - lib/coltrane/theory/errors.rb
 - lib/coltrane/theory/frequency.rb
 - lib/coltrane/theory/frequency_interval.rb
+- lib/coltrane/theory/greek_mode.rb
 - lib/coltrane/theory/interval.rb
 - lib/coltrane/theory/interval_class.rb
 - lib/coltrane/theory/interval_sequence.rb