head_music 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67e0581fd0dc08759395cc97286a1e96b538147d
-  data.tar.gz: dc985557ff8d0e1aa4720a4732a8b29a643251d8
+  metadata.gz: 607c84eac4fe859f29c47a023d57f923b7d3d9dc
+  data.tar.gz: 6f2c73ba4b7ecfd7c5897668a270070f1082d3a5
 SHA512:
-  metadata.gz: 09fcb0a4675636f67580e095b73e5640d122d7ad72df17b0677456f0234778df1a43137eb1d3c7c5e2852a0f8acada492a179bb0e8da3e6b64252164cc554fe2
-  data.tar.gz: b1b1809ed935b1a03688220039cdce9ecd8c98a55d31d71a818077ce2b2a4e416d8a00ae6dbbba7fe742cf0dc4f507ce173b4a395d4638b4d0adef497f64fb18
+  metadata.gz: acb22d69a21f890b57e08e8a4a113ef491388222a33f3e0bf3ec1750673f2caaddd6928c5047023ef1d5bbe3a71f2f665adc23b2e934f4c0e252f7fad269d7c1
+  data.tar.gz: aeb7849fe4c6eb607804ebf6d3155c67f04dd477dcc412612dea0fd5929631859ea4f38992423599137659b338c3b3c6e6feb8a9bf40c5388b0d0b60bb0c7102

data/lib/head_music/letter.rb

@@ -54,5 +54,13 @@ class HeadMusic::Letter
     to_s == value.to_s
   end
 
+  def cycle
+    cycle = NAMES
+    while cycle.first != self.to_s
+      cycle = cycle.rotate
+    end
+    cycle
+  end
+
   private_class_method :new
 end

data/lib/head_music/pitch.rb

@@ -4,7 +4,7 @@ class HeadMusic::Pitch
   attr_reader :spelling
   attr_reader :octave
 
-  delegate :letter, to: :spelling
+  delegate :letter, :letter_cycle, to: :spelling
   delegate :accidental, :sharp?, :flat?, to: :spelling
   delegate :pitch_class, to: :spelling
 
@@ -88,5 +88,9 @@ class HeadMusic::Pitch
     self.midi_note_number <=> other.midi_note_number
   end
 
+  def scale(scale_type_name = nil)
+    HeadMusic::Scale.get(self, scale_type_name)
+  end
+
   private_class_method :new
 end

data/lib/head_music/scale.rb

@@ -17,31 +17,14 @@ class HeadMusic::Scale
 
   def pitches
     @pitches ||= begin
-      pitches = [root_pitch]
-      letters_cycle = HeadMusic::Letter::NAMES
-      letters_cycle = letters_cycle.rotate while letters_cycle.first != root_pitch.letter.to_s
+      letter_cycle = root_pitch.letter_cycle
       semitones_from_root = 0
-      if scale_type.parent
-        parent_scale_pitches = HeadMusic::Scale.get(root_pitch, scale_type.parent_name).pitches
-      end
-      scale_type.intervals.each_with_index do |semitones, i|
-        semitones_from_root += semitones
-        pitch_number = root_pitch.pitch_class.to_i + semitones_from_root
-        if scale_type.intervals.length == 7
-          current_letter = letters_cycle[(i + 1) % 7]
-        elsif scale_type.intervals.length < 7 && scale_type.parent
-          current_letter = parent_scale_pitches.detect { |parent_scale_pitches|
-            parent_scale_pitches.pitch_class == (root_pitch + semitones_from_root).to_i % 12
-          }.letter
-        elsif root_pitch.flat?
-          current_letter = HeadMusic::PitchClass::FLAT_SPELLINGS[pitch_number % 12]
-        else
-          current_letter = HeadMusic::PitchClass::SHARP_SPELLINGS[pitch_number % 12]
+      [root_pitch].tap do |pitches|
+        scale_type.intervals.each_with_index do |semitones, i|
+          semitones_from_root += semitones
+          pitches << pitch_for_step(i+1, semitones_from_root)
         end
-        pitch = HeadMusic::Pitch.from_number_and_letter(pitch_number, current_letter)
-        pitches << pitch
       end
-      pitches
     end
   end
 
@@ -65,4 +48,43 @@ class HeadMusic::Scale
     end
     spellings
   end
+
+  def letter_cycle
+    @letter_cycle ||= root_pitch.letter_cycle
+  end
+
+  def root_pitch_class
+    @root_pitch_class ||= root_pitch.pitch_class
+  end
+
+  private
+
+  def parent_scale_pitches
+    HeadMusic::Scale.get(root_pitch, scale_type.parent_name).pitches if scale_type.parent
+  end
+
+  def parent_scale_pitch_for(semitones_from_root)
+    parent_scale_pitches.detect { |parent_scale_pitch|
+      parent_scale_pitch.pitch_class == (root_pitch + semitones_from_root).to_i % 12
+    }
+  end
+
+  def letter_for_step(step, semitones_from_root)
+    pitch_class_number = (root_pitch.pitch_class.to_i + semitones_from_root) % 12
+    if scale_type.intervals.length == 7
+      letter_cycle[step % 7]
+    elsif scale_type.intervals.length < 7 && parent_scale_pitches
+      parent_scale_pitch_for(semitones_from_root).letter
+    elsif root_pitch.flat?
+      HeadMusic::PitchClass::FLAT_SPELLINGS[pitch_class_number]
+    else
+      HeadMusic::PitchClass::SHARP_SPELLINGS[pitch_class_number]
+    end
+  end
+
+  def pitch_for_step(step, semitones_from_root)
+    pitch_number = root_pitch_class.to_i + semitones_from_root
+    letter = letter_for_step(step, semitones_from_root)
+    HeadMusic::Pitch.from_number_and_letter(pitch_number, letter)
+  end
 end

data/lib/head_music/spelling.rb

@@ -8,6 +8,8 @@ class HeadMusic::Spelling
   attr_reader :accidental
 
   delegate :number, to: :pitch_class, prefix: true
+  delegate :to_i, to: :pitch_class_number
+  delegate :cycle, to: :letter, prefix: true
 
   def self.get(identifier)
     from_name(identifier) || from_number(identifier)
@@ -75,5 +77,9 @@ class HeadMusic::Spelling
     to_s == value.to_s
   end
 
+  def scale(scale_type_name = nil)
+    HeadMusic::Scale.get(self, scale_type_name)
+  end
+
   private_class_method :new
 end

data/lib/head_music/version.rb

@@ -1,3 +1,3 @@
 module HeadMusic
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: head_music
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Rob Head
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-19 00:00:00.000000000 Z
+date: 2017-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport