coltrane 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c5035abfa591229d5cb00c1a55f95cbb7904fe4cb6fb02c3da0147ddb28713b
-  data.tar.gz: c9d0b5de4c65af3f8bcb59b202720eb84c8ad16ce8f422b03536c6382db4e606
+  metadata.gz: 9ad979024e346ac1c1ddd35f23cbd96fa3d8405ff1c545a8960798c0cc50fa77
+  data.tar.gz: 156bf60760dad3cf9838fd2adabe9488b28c0bfc785ae5718dc0bee9c31901f9
 SHA512:
-  metadata.gz: 62c750bd90a06738d6e1cbae6cfd15a2c1b45e0b0771f888aaad11a34a48234d28338315a62cf664afb5ba364589e609c77390f3fe1905c721845ad5e1f686d1
-  data.tar.gz: 2dc63fb47d4f39df88daf56b24f0d0e229f274fe2807f57295461c4a26f05659932d5b8599f3285073a2a88cbf2fd4e1c3c6ae49d268900b2f643c7aa6645c13
+  metadata.gz: 047e0899d7abc412a1004581d9e8dc2fc265e883771b073890abf9838e51f65ab7aa7c4fb1a72adb84007eb1309100d4e1b7af01456e8a8f3ed7d9adb511f6a1
+  data.tar.gz: eb4bf34e8f591523dbef9acec2c4596fa4c46ca057944921b6aec732e37f21b563a251c4b57cbcab56ad24fa6dcabe9bf954c2061722253d488c90a900ae8915

data/CHANGELOG.md

@@ -10,6 +10,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Refactor notes and add pitch frequencies, pitch classes
 
 
+## [1.1.1]
+
+### Fixes
+- Progression specs
+
+### Adds
+- `Progression.find(*%w[AM DM F#m EM])`
+
 ## [1.1.0]
 
 ### Changes

data/lib/coltrane/classic_progressions.rb

@@ -1,23 +1,23 @@
-# frozen_string_literal: true
+# # frozen_string_literal: true
 
-module Coltrane
-  # It's totally a wip yet.
-  module ClassicProgressions
-    PROGRESSIONS = {
-      'Pop'          => %w[I V vi IV],
-      'Blues'        => %w[I I I I IV IV I I V IV I I],
-      'Jazz Blues'   => %w[
-        I7   I7   IV7  IV7  I7  I7   I7    I7
-        IV7  IV7  VI7  VI7  I7  I7   iii7  VI7
-        ii7  ii7  V7   V7   I7  VI7  II7   V7
-      ],
-      'Fifties'      => %w[I IV V]
-      # pop:        [:major, [1, 5, 6, 4]],
-      # fifties:    [:major, [1, 6, 4, 5]],
-      # blues:      [:major, [1, 4, 1, 5, 4, 1]],
-      # jazz:       [:major, [2, 5, 1]],
-      # jazz_minor: [:minor, [2, 5, 1]],
-      # andalusian: [:minor, [1, 7, 6, 5]]
-    }.freeze
-  end
-end
+# module Coltrane
+#   # It's totally a wip yet.
+#   module ClassicProgressions
+#     PROGRESSIONS = {
+#       'Pop'          => %w[I V vi IV],
+#       'Blues'        => %w[I I I I IV IV I I V IV I I],
+#       'Jazz Blues'   => %w[
+#         I7   I7   IV7  IV7  I7  I7   I7    I7
+#         IV7  IV7  VI7  VI7  I7  I7   iii7  VI7
+#         ii7  ii7  V7   V7   I7  VI7  II7   V7
+#       ],
+#       'Fifties'      => %w[I IV V]
+#       # pop:        [:major, [1, 5, 6, 4]],
+#       # fifties:    [:major, [1, 6, 4, 5]],
+#       # blues:      [:major, [1, 4, 1, 5, 4, 1]],
+#       # jazz:       [:major, [2, 5, 1]],
+#       # jazz_minor: [:minor, [2, 5, 1]],
+#       # andalusian: [:minor, [1, 7, 6, 5]]
+#     }.freeze
+#   end
+# end

data/lib/coltrane/progression.rb

@@ -9,11 +9,11 @@ module Coltrane
     attr_reader :scale, :chords, :notation
 
     def self.find(*chords)
-      # chords.map! { |c| Chord.new(name: c) } if chords[0].is_a?(String)
-      # scales = Scale.having_chords(*chords).scales.map(&:pretty_name)
-      # scales.reduce([]) do |memo, scale|
-      #   memo
-      # end
+      chords.map! { |c| Chord.new(name: c) } if chords[0].is_a?(String)
+      scales = Scale.having_chords(*chords).scales
+      scales.reduce([]) do |memo, scale|
+        memo + [Progression.new(chords: chords, scale: scale)]
+      end
     end
 
     def initialize(notation=nil, chords: nil, roman_chords: nil, key: nil, scale: nil)
@@ -45,15 +45,13 @@ module Coltrane
     end
 
     def roman_chords
-      @roman_chords ||= RomanChord.new()
+      @roman_chords ||= chords.map do |c|
+        RomanChord.new(chord: c, scale: scale)
+      end
     end
 
     def notation
-      @notation || @scale
-    end
-
-    def rotate
-
+      roman_chords.map(&:notation).join('-')
     end
   end
 end

data/lib/coltrane/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coltrane
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Pedro Maciel