head_music 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 607c84eac4fe859f29c47a023d57f923b7d3d9dc
-  data.tar.gz: 6f2c73ba4b7ecfd7c5897668a270070f1082d3a5
+  metadata.gz: 072224f0fd9e0fff2051143e6a786daf70a975e4
+  data.tar.gz: a5c8934d86c94c68c26607a88e324f6670ceb97b
 SHA512:
-  metadata.gz: acb22d69a21f890b57e08e8a4a113ef491388222a33f3e0bf3ec1750673f2caaddd6928c5047023ef1d5bbe3a71f2f665adc23b2e934f4c0e252f7fad269d7c1
-  data.tar.gz: aeb7849fe4c6eb607804ebf6d3155c67f04dd477dcc412612dea0fd5929631859ea4f38992423599137659b338c3b3c6e6feb8a9bf40c5388b0d0b60bb0c7102
+  metadata.gz: d68c00dbf07773b7001c6d245dfc11957a111f979d4f919f98b7f9c336108017024ba86ad4a6b9353b054dbef7432230e72d10c9b9beaa49d0040c9572be4ef3
+  data.tar.gz: d722a4f6569009c22db17dac114f2a61a9e9efdbbca1e8a71a727ac2dfdd238d06e551e78716537a8520c2dbe691b3f14942833be2e68bbc2a7ef0b8c0373f01

data/lib/head_music/functional_interval.rb

@@ -0,0 +1,9 @@
+class HeadMusic::FunctionalInterval
+  def self.between(pitch1, pitch2)
+    new
+  end
+
+  def name
+    'perfect fifth'
+  end
+end

data/lib/head_music/pitch.rb

@@ -29,7 +29,7 @@ class HeadMusic::Pitch
   def self.from_number_and_letter(number, letter)
     letter = HeadMusic::Letter.get(letter)
     natural_letter_pitch = get(HeadMusic::Letter.get(letter).pitch_class)
-    natural_letter_pitch += 12 while (number - natural_letter_pitch.to_i) >= 12
+    natural_letter_pitch += 12 while (number - natural_letter_pitch.to_i) >= 11
     natural_letter_pitch = get(natural_letter_pitch)
     accidental_interval = natural_letter_pitch.smallest_interval_to(HeadMusic::PitchClass.get(number))
     accidental = HeadMusic::Accidental.for_interval(accidental_interval)
@@ -59,6 +59,7 @@ class HeadMusic::Pitch
   end
 
   alias_method :midi, :midi_note_number
+  alias_method :number, :midi_note_number
 
   def to_s
     name

data/lib/head_music/scale.rb

@@ -15,46 +15,51 @@ class HeadMusic::Scale
     @scale_type = HeadMusic::ScaleType.get(scale_type)
   end
 
-  def pitches
-    @pitches ||= begin
+  def pitches(direction: :ascending, octaves: 1)
+    @pitches ||= {}
+    @pitches[direction] ||= {}
+    @pitches[direction][octaves] ||= begin
       letter_cycle = root_pitch.letter_cycle
       semitones_from_root = 0
       [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)
+        if [:ascending, :both].include?(direction)
+          (1..octaves).each do |i|
+            scale_type.ascending_intervals.each_with_index do |semitones, i|
+              semitones_from_root += semitones
+              pitches << pitch_for_step(i+1, semitones_from_root, :ascending)
+            end
+          end
+        end
+        if [:descending, :both].include?(direction)
+          (1..octaves).each do |i|
+            scale_type.descending_intervals.each_with_index do |semitones, i|
+              semitones_from_root -= semitones
+              pitches << pitch_for_step(i+1, semitones_from_root, :descending)
+            end
+          end
         end
       end
     end
   end
 
-  def pitch_names
+  def spellings
     pitches.map(&:spelling).map(&:to_s)
   end
 
-  def in(spelling)
-    spelling = HeadMusic::Spelling.get(spelling.to_s)
-    spellings = []
-    letter_index = HeadMusic::Letter::all.index(spelling.letter)
-    starting_pitch_class = spelling.pitch_class
-    pattern.each do |interval_from_tonic|
-      letter = HeadMusic::Letter.all[letter_index]
-      if interval_from_tonic
-        accidental_interval = letter.pitch_class.smallest_interval_to(HeadMusic::PitchClass.get(starting_pitch_class + interval_from_tonic))
-        accidental = HeadMusic::Accidental.for_interval(accidental_interval)
-        spellings << HeadMusic::Spelling.get([letter, accidental].join)
-      end
-      letter_index = (letter_index + 1) % 7
-    end
-    spellings
+  def pitch_names(direction: :ascending, octaves: 1)
+    pitches(direction: direction, octaves: octaves).map(&:name)
   end
 
   def letter_cycle
     @letter_cycle ||= root_pitch.letter_cycle
   end
 
-  def root_pitch_class
-    @root_pitch_class ||= root_pitch.pitch_class
+  def root_pitch_number
+    @root_pitch_number ||= root_pitch.number
+  end
+
+  def degree(degree_number)
+    pitches[degree_number - 1]
   end
 
   private
@@ -69,10 +74,10 @@ class HeadMusic::Scale
     }
   end
 
-  def letter_for_step(step, semitones_from_root)
+  def letter_for_step(step, semitones_from_root, direction)
     pitch_class_number = (root_pitch.pitch_class.to_i + semitones_from_root) % 12
     if scale_type.intervals.length == 7
-      letter_cycle[step % 7]
+      direction == :ascending ? letter_cycle[step % 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?
@@ -82,9 +87,9 @@ class HeadMusic::Scale
     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)
+  def pitch_for_step(step, semitones_from_root, direction)
+    pitch_number = root_pitch_number + semitones_from_root
+    letter = letter_for_step(step, semitones_from_root, direction)
     HeadMusic::Pitch.from_number_and_letter(pitch_number, letter)
   end
 end

data/lib/head_music/version.rb

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

data/lib/head_music.rb

@@ -5,6 +5,7 @@ require "active_support/core_ext/string/access"
 
 require "head_music/accidental"
 require "head_music/circle"
+require "head_music/functional_interval"
 require "head_music/interval"
 require "head_music/key_signature"
 require "head_music/letter"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: head_music
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Rob Head
@@ -102,6 +102,7 @@ files:
 - lib/head_music.rb
 - lib/head_music/accidental.rb
 - lib/head_music/circle.rb
+- lib/head_music/functional_interval.rb
 - lib/head_music/interval.rb
 - lib/head_music/key_signature.rb
 - lib/head_music/letter.rb