head_music 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63d427018297be00f798c809a49236ad36556096
-  data.tar.gz: 8fcbff20bc04bee42a900b5d9bef1dabb9b9bf1f
+  metadata.gz: 27bbe45d50118d4f5f4bcf02e3192da3ddd2ec70
+  data.tar.gz: 1900eb67572a4bfb79e0b91c05673bfadd1f7c2c
 SHA512:
-  metadata.gz: 5eec89666c474d7cbe5114ca4504f57bdddfc3eb9899b1fe666946cb9b4c8fd8dc4ac144a95512bb9dd0f86a7060fd6e1a201fd78daa94f701095bf8456ecdca
-  data.tar.gz: 692a3fc51fdbe388e498d873a45d4f50776dcf9b5669b65bf4694986aa94b8be8a7b4208a6243487c21ba00dbab86f4be82aeeb45470c358f1fed40d730e1f62
+  metadata.gz: 30f5b988d501ca3286bc41da70c3ca3672d9d30438d81a5740c1c8db4bd1d4e3e9af594302aa928afea446c2d6197f1b3aa0d69280c1e94fc986e03359712872
+  data.tar.gz: d5534e5c7dadf6b7339d29b4db89256cf2d853b5415add44032c15eb24f1e10a83bb0d185d4437ef319a29f7c003f0b90228e3cce19bcfe22d5d73646255f561

data/lib/head_music/functional_interval.rb

@@ -2,18 +2,63 @@ class HeadMusic::FunctionalInterval
   NUMBER_NAMES = %w[unison second third fourth fifth sixth seventh octave ninth tenth eleventh twelfth thirteenth fourteenth fifteenth sixteenth seventeenth]
   NAME_SUFFIXES = Hash.new('th').merge({ 1 => 'st', 2 => 'nd', 3 => 'rd' })
 
-  QUALITY = {
-    unison: {perfect: 0},
-    second: {major: 2},
-    third: {major: 4},
-    fourth: {perfect: 5},
-    fifth: {perfect: 7},
-    sixth: {major: 9},
-    seventh: {major: 11},
+  QUALITY_SEMITONES = {
+    unison: { perfect: 0 },
+    second: { major: 2 },
+    third: { major: 4 },
+    fourth: { perfect: 5 },
+    fifth: { perfect: 7 },
+    sixth: { major: 9 },
+    seventh: { major: 11 },
+    octave: { perfect: 12 },
+    ninth: { major: 14 },
+    tenth: { major: 16 },
+    eleventh: { perfect: 17 },
+    twelfth: { perfect: 19 },
+    thirteenth: { major: 21 },
+    fourteenth: { major: 23 },
+    fifteenth: { perfect: 24 },
+    sixteenth: { major: 26 },
+    seventeenth: { major: 28 }
   }
 
   attr_reader :lower_pitch, :higher_pitch
 
+  delegate :to_s, to: :name
+  delegate :==, to: :to_s
+
+  def self.get(name)
+    words = name.to_s.split(/[_ ]+/)
+    quality_name, degree_name = words[0..-2].join(' '), words.last
+    lower_pitch = HeadMusic::Pitch.get('C4')
+    steps = NUMBER_NAMES.index(degree_name)
+    higher_letter = lower_pitch.letter.steps(steps)
+    semitones = degree_quality_semitones.dig(degree_name.to_sym, quality_name.to_sym)
+    higher_pitch = HeadMusic::Pitch.from_number_and_letter(lower_pitch + semitones, higher_letter)
+    new(lower_pitch, higher_pitch)
+  end
+
+  def self.degree_quality_semitones
+    @degree_quality_semitones ||= begin
+      degree_quality_semitones = QUALITY_SEMITONES
+      QUALITY_SEMITONES.each do |degree_name, qualities|
+        default_quality = qualities.keys.first
+        if default_quality == :perfect
+          modification_hash = HeadMusic::Quality::PERFECT_INTERVAL_MODIFICATION.invert
+        else
+          modification_hash = HeadMusic::Quality::MAJOR_INTERVAL_MODIFICATION.invert
+        end
+        default_semitones = qualities[default_quality]
+        modification_hash.each do |quality_name, delta|
+          if quality_name != default_quality
+            degree_quality_semitones[degree_name][quality_name] = default_semitones + delta
+          end
+        end
+      end
+      degree_quality_semitones
+    end
+  end
+
   def initialize(pitch1, pitch2)
     @lower_pitch, @higher_pitch = [HeadMusic::Pitch.get(pitch1), HeadMusic::Pitch.get(pitch2)].sort
   end
@@ -69,13 +114,9 @@ class HeadMusic::FunctionalInterval
   end
 
   def quality_name
-    starting_quality = QUALITY[simple_number_name.to_sym].keys.first
-    delta = simple_semitones - QUALITY[simple_number_name.to_sym][starting_quality]
-    if starting_quality == :perfect
-      HeadMusic::Quality::PERFECT_INTERVAL_MODIFICATION[delta]
-    elsif starting_quality == :major
-      HeadMusic::Quality::MAJOR_INTERVAL_MODIFICATION[delta]
-    end
+    starting_quality = QUALITY_SEMITONES[simple_number_name.to_sym].keys.first
+    delta = simple_semitones - QUALITY_SEMITONES[simple_number_name.to_sym][starting_quality]
+    HeadMusic::Quality::from(starting_quality, delta)
   end
 
   def simple_number_name
@@ -87,4 +128,12 @@ class HeadMusic::FunctionalInterval
       number.to_s + NAME_SUFFIXES[number % 10]
     end
   end
+
+  def inversion
+    inverted_low_pitch = lower_pitch
+    while inverted_low_pitch < higher_pitch
+      inverted_low_pitch += 12
+    end
+    HeadMusic::FunctionalInterval.new(higher_pitch, inverted_low_pitch)
+  end
 end

data/lib/head_music/letter.rb

@@ -58,6 +58,10 @@ class HeadMusic::Letter
     NAMES.index(self.to_s) + 1
   end
 
+  def steps(num)
+    cycle[num]
+  end
+
   def steps_to(other, direction = :ascending)
     other = Letter.get(other)
     other_position = other.position

data/lib/head_music/pitch.rb

@@ -7,6 +7,7 @@ class HeadMusic::Pitch
   delegate :letter, :letter_cycle, to: :spelling
   delegate :accidental, :sharp?, :flat?, to: :spelling
   delegate :pitch_class, to: :spelling
+  delegate :semitones, to: :accidental, prefix: true, allow_nil: true
 
   delegate :smallest_interval_to, to: :pitch_class
 
@@ -29,7 +30,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) >= 11
+    natural_letter_pitch += 12 while (number - natural_letter_pitch.to_i).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)
@@ -55,7 +56,7 @@ class HeadMusic::Pitch
   end
 
   def midi_note_number
-    (octave + 1) * 12 + pitch_class.to_i
+    (octave + 1) * 12 + letter.pitch_class.to_i + accidental_semitones.to_i
   end
 
   alias_method :midi, :midi_note_number

data/lib/head_music/quality.rb

@@ -32,6 +32,14 @@ class HeadMusic::Quality
     @qualities[identifier] ||= new(identifier) if NAMES.include?(identifier)
   end
 
+  def self.from(starting_quality, delta)
+    if starting_quality == :perfect
+      PERFECT_INTERVAL_MODIFICATION[delta].to_s.gsub(/_+/, ' ')
+    elsif starting_quality == :major
+      MAJOR_INTERVAL_MODIFICATION[delta].to_s.gsub(/_+/, ' ')
+    end
+  end
+
   attr_reader :name
   delegate :to_s, to: :name
 

data/lib/head_music/version.rb

@@ -1,3 +1,3 @@
 module HeadMusic
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

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