coltrane 1.0.21 → 1.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a52943a09738192960b06180a04c6de4b9e81559c33b06bebac360b53deab75e
-  data.tar.gz: 11a88b19c9030fc6a150dc3d997544e23de7a6c0f37426e7b22c87a7163ac09b
+  metadata.gz: 57dabf818555a71744bf6fb434099d6c33e1b9b33aa3fdaa475c38433b42554f
+  data.tar.gz: 0c405a62ff1eaf8fc94f0f819d4c3eac4158565ca83ba8374c21964d4c68c0e5
 SHA512:
-  metadata.gz: f4896e2ffc004067857d91ebd397690fbe92ac7cec68943f579521eb5bdcd7d2110372e357290dcc615391cd807f277c134d415fc6202f02dd1cd6a50d198c0e
-  data.tar.gz: '08baa1c7dd2350e1f646e465dfc968803ccd8ae18aea619efe68285c642ad1ab9447c0dbad36f805285004cb9bcda568b577b13de48c243cfb160887ad085502'
+  metadata.gz: 9e86b4fbad7d9961eddf2f1a6d3eb15b86f280e963322a67d4e1ae1d469f7234f632be0d1a0abaaa0d1ee1a3a9409a804e6e44ceefdad45852a402ee9b00ced4
+  data.tar.gz: 7dba69b15767ff2d1aac5262075e40eca9548d0aabc244fc018801876c22a4917a54815293e295e048c1c7a7b1d6a706b91010f4783551810410b24c6f2c333e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    coltrane (1.0.11)
+    coltrane (1.0.22)
       color (~> 1.8)
       facets (~> 3.1)
       mercenary (~> 0.3)

data/lib/coltrane.rb

@@ -9,22 +9,27 @@ require 'coltrane/version'
 require 'coltrane/errors'
 
 require 'coltrane/cache'
+# Coltrane::Cache.disable
+
 require 'coltrane/cadence'
 
-require 'coltrane/interval_sequence'
-require 'coltrane/interval_set'
+require 'coltrane/note'
+require 'coltrane/pitch'
+require 'coltrane/note_set'
+
 require 'coltrane/interval'
+require 'coltrane/interval_sequence'
+
 require 'coltrane/qualities'
 require 'coltrane/chord_quality'
-require 'coltrane/note_set'
+
 require 'coltrane/chord'
 require 'coltrane/roman_chord'
 
 require 'coltrane/classic_scales'
-require 'coltrane/classic_progressions'
+require 'coltrane/scale'
 
-require 'coltrane/note'
-require 'coltrane/pitch'
+require 'coltrane/classic_progressions'
 require 'coltrane/progression'
-require 'coltrane/scale'
+
 require 'coltrane/mode'

data/lib/coltrane/cache.rb

@@ -6,13 +6,21 @@ module Coltrane
   class Cache
     class << self
       def find_or_record(key, &block)
-        unless (cached = fetch(key))
+        if @disabled || !(cached = fetch(key))
           cached = yield block
           record(key, cached)
         end
         cached
       end
 
+      def disable
+        @disabled = true
+      end
+
+      def enable
+        @disabled = false
+      end
+
       private
 
       def dir

data/lib/coltrane/chord.rb

@@ -2,7 +2,7 @@
 
 module Coltrane
   # It describe a chord
-  class Chord < NoteSet
+  class Chord
     attr_reader :root_note, :quality, :notes
 
     def initialize(notes: nil, root_note: nil, quality: nil, name: nil)

data/lib/coltrane/progression.rb

@@ -7,14 +7,10 @@ module Coltrane
 
     attr_reader :scale
 
-    def initialize(_roman_notation, key: nil, scale: nil)
+    def initialize(roman_notation, key: nil, scale: nil)
       @scale = Scale.from_key(key) unless key.nil?
     end
 
-    # def chords
-
-    # end
-
     private
 
     def chord_indexes

data/lib/coltrane/roman_chord.rb

@@ -1,39 +1,52 @@
 # frozen_string_literal: true
 
 module Coltrane
+  attr_reader :degree, :quality
+
   # It deals with chords in roman notation
   class RomanChord
-    DIGITS = {
-      'I'   => 1,
-      'V'   => 5
-    }.freeze
+    DIGITS = %w[I II III IV V VI VII].freeze
+    NOTATION_REGEX = %r{
+      (?<degree>[ivIV]*)
+      (?<quality>.*)
+    }x
 
-    def initialize(scale, roman_numeral)
-      @scale = scale
-      @roman_numeral = roman_numeral
+    def initialize(scale, notation)
+      @scale    = scale
+      @notation = notation.match(NOTATION_REGEX).named_captures
     end
 
-    def to_chord
-      Chord.new root_note: root_note,
-                quality: quality
+    def degree
+      DIGITS.index(@notation['degree'].upcase) + 1
     end
 
-    def root_note
-      @scale[degree]
+    def quality_name
+      [
+        minor_notation,
+        @notation['quality'].gsub('o', 'dim').gsub('ø', 'm7b5')
+      ].join
     end
 
-    def degree
-      @roman_numeral.split('').reduce(0) do |memo, r|
-        memo + (DIGITS[r] || 0) + (DIGITS[r.swapcase] || 0)
-      end
+    def minor_notation
+      return 'm' if !@notation['quality'].match?((/dim|m7b5/)) && !upcase?
+    end
+
+    def upcase?
+      !!(@notation['degree'][0].match /[[:upper:]]/)
+    end
+
+    def chord
+      Chord.new root_note: root_note,
+                quality: quality
     end
 
     def quality
-      ChordQuality.new(name: major? ? 'M' : 'm')
+      q = quality_name
+      ChordQuality.new(name: (q.size.zero? ? 'M' : q))
     end
 
-    def major?
-      @roman_numeral[0] =~ /[[:upper]]/
+    def root_note
+      @scale[@degree]
     end
   end
 end

data/lib/coltrane/scale.rb

@@ -124,13 +124,16 @@ module Coltrane
     def chords(size)
       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
+        scale_rotations = interval_sequence.inversions.map(&:intervals_semitones)
+        ChordQuality::CHORD_QUALITIES.reduce([]) do |memo1, (qname, qintervals)|
+          next memo1 if qintervals.size != size
+          memo1 + scale_rotations.each_with_index.reduce([]) do |memo2, (rot, index)|
+            if (rot & qintervals).size == size
+              memo2 + [ Chord.new(root_note: degree(index+1),
+                                  quality: ChordQuality.new(name: qname)) ]
+            else
+              memo2
+            end
           end
         end
       end

data/lib/coltrane/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coltrane
 version: !ruby/object:Gem::Version
-  version: 1.0.21
+  version: 1.0.22
 platform: ruby
 authors:
 - Pedro Maciel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-29 00:00:00.000000000 Z
+date: 2018-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facets
@@ -180,7 +180,6 @@ files:
 - lib/coltrane/errors.rb
 - lib/coltrane/interval.rb
 - lib/coltrane/interval_sequence.rb
-- lib/coltrane/interval_set.rb
 - lib/coltrane/mode.rb
 - lib/coltrane/note.rb
 - lib/coltrane/note_set.rb

data/lib/coltrane/interval_set.rb

@@ -1,24 +0,0 @@
-
-# frozen_string_literal: true
-# class IntervalSet
-#   def initialize(*intervals)
-#     @intervals = intervals
-#     @number_of_frets = 24
-#     sum = @intervals.reduce(:+)
-#     sum < 12 && @intervals << 12 - sum
-#   end
-
-#   def to_s
-#     @intervals.to_s
-#   end
-
-#   def to_frets(offset = 0)
-#     frets = [-offset]
-#     i = 0
-#     while frets.last < @number_of_frets
-#       frets << frets.last + @intervals[i % @intervals.length]
-#       i += 1
-#     end
-#     frets
-#   end
-# end