coltrane 2.1.5 → 2.2.1

data/lib/coltrane/scale.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# frozen_string_literal: true
 
 module Coltrane
   # Musical scale creation and manipulation
@@ -10,19 +11,25 @@ module Coltrane
 
     attr_reader :interval_sequence, :tone
 
-    def initialize(*distances, tone: 'C', mode: 1, name: nil, notes: nil)
+    def initialize(*relative_intervals, tone: 'C',
+                   mode: 1,
+                   name: nil,
+                   notes: nil)
       @name = name
-      if distances.any? && tone
+      if relative_intervals.any? && tone
         @tone              = Note[tone]
-        distances          = distances.rotate(mode - 1)
-        @interval_sequence = IntervalSequence.new(distances: distances)
+        relative_intervals = relative_intervals.rotate(mode - 1)
+        @interval_sequence = IntervalSequence.new(
+          relative_intervals: relative_intervals
+        )
       elsif notes
         @notes             = NoteSet[*notes]
         @tone              = @notes.first
-        ds                 = @notes.interval_sequence.distances
-        @interval_sequence = IntervalSequence.new(distances: ds)
+        ds                 = @notes.interval_sequence.relative_intervals
+        @interval_sequence = IntervalSequence.new(relative_intervals: ds)
       else
-        raise WrongKeywordsError, '[*distances, tone: "C", mode: 1] || [notes:]'
+        raise WrongKeywordsError,
+              '[*relative_intervals, tone: "C", mode: 1] || [notes:]'
       end
     end
 
@@ -32,7 +39,7 @@ module Coltrane
 
     def name
       @name = begin
-        is = interval_sequence.distances
+        is = interval_sequence.relative_intervals
         (0...is.size).each do |i|
           if (scale_name = Coltrane::ClassicScales::SCALES.key(is.rotate(i)))
             return scale_name
@@ -132,13 +139,13 @@ module Coltrane
         next memo1 unless size.include?(qintervals.size)
         memo1 + scale_rotations.each_with_index
                                .reduce([]) do |memo2, (rot, index)|
-          if (rot & qintervals).size == qintervals.size
-            memo2 + [Chord.new(root_note: degree(index + 1),
-                               quality: ChordQuality.new(name: qname))]
-          else
-            memo2
-          end
-        end
+                  if (rot & qintervals).size == qintervals.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 = '2.1.5'
+  VERSION = '2.2.1'
 end

data/lib/coltrane/voicing.rb

@@ -1,5 +1,6 @@
-module Coltrane
+# frozen_string_literal: true
 
+module Coltrane
   # This class describes an actual implementation of a Chord, being aware
   # of exact octaves of each pitch and even repeating pitches across octaves.
   class Voicing
@@ -35,4 +36,4 @@ module Coltrane
       pitches.map(&:frequency)
     end
   end
-end
+end

data/lib/coltrane_game/question.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module ColtraneGame
   class Question
-    def generate
-    end
+    def generate; end
   end
-end
+end

data/lib/coltrane_instruments/guitar.rb

@@ -7,4 +7,4 @@ module ColtraneInstruments
     autoload :Note,   'coltrane_instruments/guitar/note'
     autoload :String, 'coltrane_instruments/guitar/string'
   end
-end
+end

data/lib/coltrane_instruments/guitar/base.rb

@@ -2,7 +2,7 @@
 
 module ColtraneInstruments
   module Guitar
-    DEFAULT_TUNING = %w[E2 A2 D3 G3 B3 E4]
+    DEFAULT_TUNING = %w[E2 A2 D3 G3 B3 E4].freeze
     DEFAULT_FRETS = 23
     # A base class for operations involving Guitars
     class Base

data/lib/coltrane_instruments/guitar/chord.rb

@@ -27,23 +27,23 @@ module ColtraneInstruments
       end
 
       def <=>(other)
-         rank <=> other.rank
+        rank <=> other.rank
       end
 
       def rank
-         +completeness * 10000 +
-         +fullness * 1000 +
-         -spreadness * 100 +
-         +easyness * 1
+        +completeness * 10_000 +
+          +fullness * 1000 +
+          -spreadness * 100 +
+          +easyness * 1
       end
 
       def analysis
         {
-         completeness: completeness,
-         fullness: fullness,
-         easyness: easyness,
-         spreadness: spreadness
-       }
+          completeness: completeness,
+          fullness: fullness,
+          easyness: easyness,
+          spreadness: spreadness
+        }
       end
 
       def spreadness
@@ -70,13 +70,13 @@ module ColtraneInstruments
         return [self] if guitar_notes.size >= guitar.strings.size
         possible_new_notes(notes_available.positive?).reduce([]) do |memo, n|
           barre = n.fret if guitar_notes.last == n.fret
-          fingers_change = (n.fret == barre || n.fret.zero?) ? 0 : 1
+          fingers_change = n.fret == barre || n.fret.zero? ? 0 : 1
           next memo if (free_fingers - fingers_change).negative?
           Chord.new(target_chord, guitar_notes: guitar_notes + [n],
                                   free_fingers: free_fingers - fingers_change,
                                   guitar: guitar,
                                   barre: barre)
-            .fetch_descendant_chords + memo
+               .fetch_descendant_chords + memo
         end
       end
 
@@ -89,12 +89,14 @@ module ColtraneInstruments
       end
 
       def notes_left
-        @notes_left ||= (target_chord.notes - Coltrane::NoteSet[
+        @notes_left ||= begin
+                          target_chord.notes - Coltrane::NoteSet[
                           *guitar_notes.map do |n|
                             next if n.pitch.nil?
                             n.pitch.pitch_class
                           end
-                        ])
+                        ]
+                        end
       end
 
       def target_notes
@@ -110,7 +112,7 @@ module ColtraneInstruments
       end
 
       def non_zero_frets
-        frets.reject {|f| f.nil? || f.zero? }
+        frets.reject { |f| f.nil? || f.zero? }
       end
 
       def lowest_fret
@@ -139,7 +141,7 @@ module ColtraneInstruments
 
       def fret_expansion_range
         (lowest_possible_fret..highest_possible_fret).to_a +
-        [(0 unless barre?)].compact
+          [(0 unless barre?)].compact
       end
 
       def to_s

data/lib/coltrane_synth.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require 'coltrane'
 require 'coreaudio'
 
 module ColtraneSynth
   autoload :Base,  'coltrane_synth/base'
   autoload :Synth, 'coltrane_synth/synth'
-end
+end

data/lib/coltrane_synth/base.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module ColtraneSynth
   class Base
     attr_reader :device, :buffer
 
-    SAMPLE_RATE = 44000
+    SAMPLE_RATE = 44_000
 
-    def self.play(something, duration=1.0)
+    def self.play(something, duration = 1.0)
       new.play(*extract_frequencies(something), duration: duration)
     end
 
@@ -17,8 +19,8 @@ module ColtraneSynth
       buffer = @device.output_loop(SAMPLE_RATE)
 
       SAMPLE_RATE.times do |i|
-        sound = freqs.reduce(0) { |sum, freq| Math.sin(phase(freq)*i) + sum }
-        buffer[i] = (sound * (0x6AFF/freqs.size)).round
+        sound = freqs.reduce(0) { |sum, freq| Math.sin(phase(freq) * i) + sum }
+        buffer[i] = (sound * (0x6AFF / freqs.size)).round
       end
 
       buffer.start
@@ -30,18 +32,18 @@ module ColtraneSynth
 
     def self.extract_frequencies(arg)
       case arg
-      when Coltrane::Chord then arg.notes.map {|n| n.frequency.octave(4).to_f }
+      when Coltrane::Chord then arg.notes.map { |n| n.frequency.octave(4).to_f }
       when Coltrane::PitchClass then arg.frequency.octave(4).to_f
       when Coltrane::Voicing then arg.frequencies.map(&:to_f)
       end
     end
 
     def sine_wave(freq, i)
-      Math.sin(phase(freq)*i)
+      Math.sin(phase(freq) * i)
     end
 
     def phase(freq)
       (Math::PI * 2.0 * freq) / SAMPLE_RATE.to_f
     end
   end
-end
+end

data/lib/coltrane_synth/synth.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ColtraneSynth
   class Synth
     attr_reader :freq, :nominal_rate
@@ -21,4 +23,4 @@ module ColtraneSynth
       Math::PI * 2.0 * freq / nominal_rate
     end
   end
-end
+end

data/lib/core_ext.rb

@@ -22,42 +22,13 @@ class String
     !!match(*args)
   end
 
-  def interval_quality
-    {
-      'P' => 'Perfect',
-      'm' => 'Minor',
-      'M' => 'Major',
-      'A' => 'Augmented',
-      'd' => 'Diminished'
-    }[self]
-  end
-
   def symbolize
-    self.underscore.to_sym
+    underscore.to_sym
   end
 end
 
 # Here we add some syntax sugar to make the code more understandable later
 class Numeric
-  def interval_name
-    {
-      1   => 'Unison',
-      2   => 'Second',
-      3   => 'Third',
-      4   => 'Fourth',
-      5   => 'Fifth',
-      6   => 'Sixth',
-      7   => 'Seventh',
-      8   => 'Octave',
-      9   => 'Ninth',
-      10  => 'Tenth',
-      11  => 'Eleventh',
-      12  => 'Twelfth',
-      13  => 'Thirteenth',
-      14  => 'Fourteenth',
-      15  => 'Double Octave'
-    }[self % 16]
-  end
 end
 
 # Here we add some methods better work with Tries

data/lib/os.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OS
   class << self
     def windows?
@@ -5,7 +7,7 @@ module OS
     end
 
     def mac?
-     (/darwin/ =~ RUBY_PLATFORM) != nil
+      (/darwin/ =~ RUBY_PLATFORM) != nil
     end
 
     def unix?
@@ -16,4 +18,4 @@ module OS
       unix? && !mac?
     end
   end
-end
+end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: coltrane
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.2.1
 platform: ruby
 authors:
 - Pedro Maciel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-19 00:00:00.000000000 Z
+date: 2018-03-27 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: dry-monads
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: paint
   requirement: !ruby/object:Gem::Requirement
@@ -93,6 +107,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
+- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -173,6 +188,7 @@ files:
 - lib/coltrane/diatonic_scale.rb
 - lib/coltrane/errors.rb
 - lib/coltrane/frequency.rb
+- lib/coltrane/frequency_interval.rb
 - lib/coltrane/interval.rb
 - lib/coltrane/interval_class.rb
 - lib/coltrane/interval_sequence.rb
@@ -223,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: It deals with all sorts of calculations around music theory and allows for