coltrane 1.0.2 → 1.0.11

data/lib/coltrane/roman_chord.rb

@@ -1,12 +1,9 @@
-# frozen_string_literal: true
-
 module Coltrane
-  # It deals with chords in roman notation
   class RomanChord
     DIGITS = {
       'I'   => 1,
-      'V'   => 5
-    }.freeze
+      'V'   => 5,
+    }
 
     def initialize(scale, roman_numeral)
       @scale = scale
@@ -29,11 +26,11 @@ module Coltrane
     end
 
     def quality
-      ChordQuality.new(name: major? ? 'M' : 'm')
+      ChordQuality.new(name: is_major? ? 'M' : 'm')
     end
 
-    def major?
+    def is_major?
       @roman_numeral[0] =~ /[[:upper]]/
     end
   end
-end
+end

data/lib/coltrane/scale.rb

@@ -1,22 +1,18 @@
-# frozen_string_literal: true
-
 module Coltrane
-  # Musical scale creation and manipulation
   class Scale
     extend ClassicScales
     attr_reader :interval_sequence, :tone
 
     def initialize(*distances, tone: 'C', mode: 1, name: nil, notes: nil)
-      @name = name
+      @name                = name
       if !distances.nil? && !tone.nil?
         @tone              = Note[tone]
-        distances          = distances.rotate(mode - 1)
+        distances          = distances.rotate(mode-1)
         @interval_sequence = IntervalSequence.new(distances: distances)
       elsif !notes.nil?
         ds = NoteSet[*notes].interval_sequence.distances
-        new(*ds, tone: notes.first)
-      else
-        raise WrongKeywordsError, '[*distances, tone: "C", mode: 1] || [notes:]'
+        self.new(*ds, tone: notes.first)
+      else raise WrongKeywords.new('[*distances, (tone: "C", mode: 1)] || [notes:]')
       end
     end
 
@@ -26,7 +22,7 @@ module Coltrane
 
     def name
       @name = begin
-        is = interval_sequence.distances
+        is = self.interval_sequence.distances
         (0...is.size).each do |i|
           if (scale_name = Coltrane::ClassicScales::SCALES.key(is.rotate(i)))
             return scale_name
@@ -40,22 +36,26 @@ module Coltrane
       "#{tone.name} #{name}"
     end
 
-    alias full_name pretty_name
+    alias_method :full_name, :pretty_name
 
     def degree(d)
-      raise WrongDegreeError, d if d < 1 || d > size
+      if d < 1 || d > size
+        raise WrongDegree.new(d)
+      end
+
       tone + interval_sequence[d - 1].semitones
     end
 
-    alias [] degree
+    alias_method :[], :degree
 
     def degrees
       (1..size)
     end
 
     def degree_of_chord(chord)
-      return if chords(chord.size).map(&:name).include?(chord.name)
-      degree_of_note(chord.root_note)
+      if chords(chord.size).map(&:name).include?(chord.name)
+        degree_of_note(chord.root_note)
+      end
     end
 
     def degree_of_note(note)
@@ -63,9 +63,9 @@ module Coltrane
       return note + 1 unless note.nil?
     end
 
-    def &(other)
-      raise HasNoNotesError unless other.respond_to?(:notes)
-      notes & other
+    def &(something)
+      raise HasNoNotes unless something.respond_to?(:notes)
+      notes & something
     end
 
     def include_notes?(arg)
@@ -73,25 +73,27 @@ module Coltrane
       (self & noteset).size == noteset.size
     end
 
-    alias include? include_notes?
+    alias_method :include?, :include_notes?
 
     def notes
-      Coltrane::Cache.find_or_record(cache_key('notes')) do
+      Coltrane::Cache.find_or_record(cache_key("notes")) do
         NoteSet[*degrees.map { |d| degree(d) }]
       end
     end
 
     def interval(i)
-      interval_sequence[(i - 1) % size]
+      interval_sequence[(i-1) % size]
     end
 
     def size
       interval_sequence.size
     end
 
-    def tertians(n = 3)
+    def tertians(n=3)
       degrees.size.times.reduce([]) do |memo, d|
-        ns = NoteSet[ *Array.new(n) { |i| notes[(d + (i * 2)) % size] } ]
+        ns = NoteSet[
+          *n.times.map { |i| notes[(d + (i*2)) % (size)]}
+        ]
         chord = Chord.new(notes: ns)
         chord.named? ? memo + [chord] : memo
       end
@@ -114,11 +116,17 @@ module Coltrane
     end
 
     def cache_key(extra)
-      [@tone.name, @interval_sequence.intervals_semitones.join, extra].join('-')
+      [
+        @tone.name,
+        @interval_sequence.intervals_semitones.join(),
+        extra
+      ].join('-')
     end
 
     def all_chords
-      (3..size).reduce([]) { |memo, s| memo + chords(s) }
+      (3..size).reduce([]) do |memo, s|
+        memo + chords(s)
+      end
     end
 
     def chords(size)
@@ -136,4 +144,4 @@ module Coltrane
       end
     end
   end
-end
+end

data/lib/coltrane/scale_chord.rb

@@ -0,0 +1,4 @@
+class ScaleChord < ActiveRecord::Base
+  belongs_to :chord_cache
+  belongs_to :scale_cache
+end

data/lib/coltrane/version.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Coltrane
-  VERSION = '1.0.2'
+  VERSION = "1.0.11"
 end

data/lib/core_ext.rb

@@ -1,15 +1,12 @@
-# frozen_string_literal: true
-
-# Stolen from Active Support and changed a bit
-# may in the future be substituted by facets version
 class String
+  # Stolen from Active Support and changed a bit
   def underscore
     return self unless /[A-Z-]|::/.match?(self)
-    word = to_s.gsub('::', '/')
+    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.tr!("-", "_")
     word.downcase!
     word
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coltrane
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.11
 platform: ruby
 authors:
 - Pedro Maciel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-29 00:00:00.000000000 Z
+date: 2018-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facets
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: color
+  name: chroma
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: mercenary
   requirement: !ruby/object:Gem::Requirement
@@ -105,7 +105,6 @@ files:
 - ".bundle/config"
 - ".gitignore"
 - ".rspec"
-- ".rubocop.yml"
 - ".ruby-version"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -147,6 +146,7 @@ files:
 - db/cache.sqlite3
 - db/cache_test.sqlite3
 - db/config.yml
+- db/schema.rb
 - exe/coltrane
 - img/coltrane-logo.png
 - img/screen-1.png
@@ -159,7 +159,6 @@ files:
 - img/screen-7.png
 - img/screen-8.png
 - img/screen-9.png
-- lib/cli.rb
 - lib/cli/bass_guitar.rb
 - lib/cli/chord.rb
 - lib/cli/errors.rb
@@ -170,10 +169,12 @@ files:
 - 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
@@ -190,8 +191,10 @@ files:
 - lib/coltrane/qualities.rb
 - lib/coltrane/roman_chord.rb
 - lib/coltrane/scale.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

data/.rubocop.yml

@@ -1,19 +0,0 @@
-AllCops:
-  Include:
-    - 'lib/**/*'
-  Exclude:
-    - 'bin/**/*'
-    - '*'
-
-Metrics/AbcSize:
-  Enabled: false
-Metrics/ClassLength:
-  Enabled: false
-Metrics/MethodLength:
-  Enabled: false
-Metrics/ModuleLength:
-  Enabled: false
-Lint/UnneededSplatExpansion:
-  Enabled: false
-Security/MarshalLoad:
-  Enabled: false