coltrane 1.0.1 → 1.0.2

data/lib/coltrane/roman_chord.rb

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

data/lib/coltrane/scale.rb

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

data/lib/coltrane/version.rb

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

data/lib/core_ext.rb

@@ -1,12 +1,15 @@
+# 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 = self.to_s.gsub("::", "/")
+    word = 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.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Pedro Maciel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-28 00:00:00.000000000 Z
+date: 2018-01-29 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: chroma
+  name: color
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: mercenary
   requirement: !ruby/object:Gem::Requirement
@@ -105,6 +105,7 @@ files:
 - ".bundle/config"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".ruby-version"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -146,7 +147,6 @@ 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,6 +159,7 @@ 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
@@ -169,12 +170,10 @@ 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
@@ -191,10 +190,8 @@ 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/db/schema.rb

@@ -1,30 +0,0 @@
-# This file is auto-generated from the current state of the database. Instead
-# of editing this file, please use the migrations feature of Active Record to
-# incrementally modify your database, and then regenerate this schema definition.
-#
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
-#
-# It's strongly recommended that you check this file into your version control system.
-
-ActiveRecord::Schema.define(version: 20170508162849) do
-
-  create_table "scale_caches", force: :cascade do |t|
-    t.string "interval_sequence"
-    t.string "tone"
-  end
-
-  create_table "chord_caches", force: :cascade do |t|
-    t.string "name"
-    t.integer "size"
-  end
-
-  create_table "scale_chords", force: :cascade do |t|
-    t.integer "scale_cache_id"
-    t.integer "chord_cache_id"
-  end
-
-end

data/lib/coltrane/chord_cache.rb

@@ -1,4 +0,0 @@
-class ChordCache < ActiveRecord::Base
-  has_many :scale_chords
-  has_many :scale_caches, through: :scale_chords
-end

data/lib/coltrane/scale_chord.rb

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