lib/head_music/circle.rb in head_music-0.27.0 vs lib/head_music/circle.rb in head_music-0.28.0

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'head_music/interval_cycle'
+require "head_music/interval_cycle"
 
 # A Circle of Fifths or Fourths shows relationships between pitch classes
 class HeadMusic::Circle < HeadMusic::IntervalCycle
   def self.of_fifths
     get(:perfect_fifth)
@@ -13,40 +13,44 @@
   end
 
   def self.get(interval = :perfect_fifth)
     @circles ||= {}
     diatonic_interval = HeadMusic::DiatonicInterval.get(interval)
-    @circles[interval] ||= new(interval: diatonic_interval, starting_pitch: 'C4')
+    @circles[interval] ||= new(interval: diatonic_interval, starting_pitch: "C4")
   end
 
   def index(pitch_class)
     pitch_classes.index(HeadMusic::Spelling.get(pitch_class).pitch_class)
   end
 
-  alias spellings_up spellings
-
   def key_signatures_up
     spellings_up.map { |spelling| HeadMusic::KeySignature.new(spelling) }
   end
 
   def key_signatures_down
     spellings_down.map { |spelling| HeadMusic::KeySignature.new(spelling) }
   end
 
+  def spellings_up
+    pitches_up.map(&:pitch_class).map do |pitch_class|
+      pitch_class.smart_spelling(max_sharps_in_major_key_signature: 7)
+    end
+  end
+
   def spellings_down
-    pitches_down.map(&:spelling)
+    pitches_down.map(&:pitch_class).map do |pitch_class|
+      pitch_class.smart_spelling(max_sharps_in_major_key_signature: 4)
+    end
   end
 
   def pitches_down
-    @pitches_down ||= begin
-      [starting_pitch].tap do |list|
-        loop do
-          next_pitch = list.last - interval
-          next_pitch += octave while starting_pitch - next_pitch > 12
-          break if next_pitch.pitch_class == list.first.pitch_class
+    @pitches_down ||= [starting_pitch].tap do |list|
+      loop do
+        next_pitch = list.last - interval
+        next_pitch += octave while starting_pitch - next_pitch > 12
+        break if next_pitch.pitch_class == list.first.pitch_class
 
-          list << next_pitch
-        end
+        list << next_pitch
       end
     end
   end
 
   private_class_method :new