head_music 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 349efa7dc5c27c7c22b46c5d21b4e6fe9a407fc7
-  data.tar.gz: d435a40658a1b0c5479479e1ac4877845cfd56e0
+  metadata.gz: 17a6cfc4f189a661c7f095056b429e32ce17468a
+  data.tar.gz: d3a3cc4b18e87fa0f7af9ba584b5f28946329784
 SHA512:
-  metadata.gz: 7e689e373db60d8991b72cb6699e16ac174ee830d641b327cad7cc5ae128700f4822fc95e2926103074b281b0bf73f743e58541a1550234f1f3faf1aa6a7e9b2
-  data.tar.gz: a6aa35cdf0166b4a9a7dcb12364c4daab304a7724d6b9d64e5133276e2c4a3975ca301dff7e5a1a90c789852420dc1728c8c71386c3ac702f0a56289f36e3914
+  metadata.gz: 2e9b674c4bde48f3ce71ef0768b60461f3af1ebfcfc501ab9500af24b9b61cbc071f176a43d064fba5e5d9e83f0bc53ee80ffd8d34551ea2bd2777926437f1dc
+  data.tar.gz: 04fb64922f6c47d6df0f0cb637ad68b188fffe448dbefe02992aa85169c6ae8993b83383bdf59118391e94c3651ea76ddb7c52c9dd7b93d266d9a0aa8a9d28f0

data/lib/head_music/chord.rb

@@ -34,8 +34,8 @@ class HeadMusic::Chord
   end
 
   def intervals
-    pitches.drop(1).map.with_index do |pitch, i|
-      HeadMusic::FunctionalInterval.new(pitches[i], pitch)
+    pitches.each_cons(2).map do |pitch_pair|
+      HeadMusic::FunctionalInterval.new(*pitch_pair)
     end
   end
 

data/lib/head_music/{composition.rb → content/composition.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# A composition is a portion of music.
+# A composition is musical content.
 class HeadMusic::Composition
   attr_reader :name, :key_signature, :meter, :voices
 
@@ -56,6 +56,10 @@ class HeadMusic::Composition
     voices.reject(&:cantus_firmus?).first
   end
 
+  def to_s
+    "#{name} — #{voices.count} voice(s)"
+  end
+
   private
 
   def ensure_attributes(name, key_signature, meter)

data/lib/head_music/{placement.rb → content/placement.rb}

@@ -29,25 +29,25 @@ class HeadMusic::Placement
   end
 
   def during?(other_placement)
-    starts_during?(other_placement) || ends_during?(other_placement) || within?(other_placement)
+    starts_during?(other_placement) || ends_during?(other_placement) || wraps?(other_placement)
   end
 
   def to_s
-    "#{pitch ? pitch : 'rest'} at #{position}"
+    "#{rhythmic_value} #{pitch ? pitch : 'rest'} at #{position}"
   end
 
   private
 
   def starts_during?(other_placement)
-    (other_placement.next_position > position && other_placement.next_position <= next_position)
+    position >= other_placement.position && position < other_placement.next_position
   end
 
   def ends_during?(other_placement)
-    (other_placement.position >= position && other_placement.position < next_position)
+    next_position > other_placement.position && next_position <= other_placement.next_position
   end
 
-  def within?(other_placement)
-    (other_placement.position <= position && other_placement.next_position >= next_position)
+  def wraps?(other_placement)
+    position <= other_placement.position && next_position >= other_placement.next_position
   end
 
   def ensure_attributes(voice, position, rhythmic_value, pitch)

data/lib/head_music/{position.rb → content/position.rb}

@@ -95,7 +95,7 @@ end
 
 # In Logic Pro X, the 'beat' is determined by the denominator, even if compound.
 # Logic then divides the beat into 'divisions' that are a sixteenth in length.
-# Each division is then divided into 240 ticks (960 PPQN / 4 sixteenths-per-quarter)
+# Each division is then divided into 240 ticks (960 PPQN / 4 sixteenths-per-quarter = 240 ticks per sixteenth note)
 
 # Tempo specifies the beat unit, usually the traditional beat unit in the case of compound meters,
 # so 6/8 would specify [dotted-quarter] = 132 (or whatever).

data/lib/head_music/{rhythmic_value.rb → content/rhythmic_value.rb}

@@ -96,4 +96,8 @@ class HeadMusic::RhythmicValue
   def ==(other)
     to_s == other.to_s
   end
+
+  def to_s
+    name.tr('_', '-')
+  end
 end

data/lib/head_music/{voice.rb → content/voice.rb}

@@ -59,9 +59,7 @@ class HeadMusic::Voice
 
   def melodic_intervals
     @melodic_intervals ||=
-      notes.map.with_index do |note, i|
-        HeadMusic::MelodicInterval.new(notes[i - 1], note) if i.positive?
-      end.compact
+      notes.each_cons(2).map { |note_pair| HeadMusic::MelodicInterval.new(*note_pair) }
   end
 
   def leaps
@@ -102,6 +100,10 @@ class HeadMusic::Voice
     placements.last.position.bar_number
   end
 
+  def to_s
+    "#{role}: #{pitches.first(10).map(&:to_s)}"
+  end
+
   private
 
   def insert_into_placements(placement)

data/lib/head_music/key_signature.rb

@@ -54,7 +54,7 @@ class HeadMusic::KeySignature
   end
 
   def signs
-    !flats.empty? ? flats : sharps
+    flats.any? ? flats : sharps
   end
 
   def name

data/lib/head_music/scale.rb

@@ -61,9 +61,9 @@ class HeadMusic::Scale
   end
 
   def octave_scale_pitches(direction, semitones_from_root)
-    direction_intervals(direction).map.with_index do |semitones, i|
+    direction_intervals(direction).map.with_index(1) do |semitones, i|
       semitones_from_root += semitones * direction_sign(direction)
-      pitch_for_step(i + 1, semitones_from_root, direction)
+      pitch_for_step(i, semitones_from_root, direction)
     end
   end
 

data/lib/head_music/style/annotation.rb

@@ -101,10 +101,9 @@ class HeadMusic::Style::Annotation
   end
 
   def motions
-    downbeat_harmonic_intervals.map.with_index do |harmonic_interval, i|
-      next_harmonic_interval = downbeat_harmonic_intervals[i + 1]
-      HeadMusic::Motion.new(harmonic_interval, next_harmonic_interval) if next_harmonic_interval
-    end.compact
+    downbeat_harmonic_intervals.each_cons(2).map do |harmonic_interval_pair|
+      HeadMusic::Motion.new(*harmonic_interval_pair)
+    end
   end
 
   def downbeat_harmonic_intervals

data/lib/head_music/style/annotations/always_move.rb

@@ -8,8 +8,8 @@ class HeadMusic::Style::Annotations::AlwaysMove < HeadMusic::Style::Annotation
   MESSAGE = 'Always move to a different note.'
 
   def marks
-    melodic_intervals.map.with_index do |interval, i|
-      HeadMusic::Style::Mark.for_all(notes[i..i + 1]) if interval.shorthand == 'PU'
-    end.compact
+    melodic_intervals.
+      select { |interval| interval.perfect? && interval.unison? }.
+      map { |interval| HeadMusic::Style::Mark.for_all(interval.notes) }
   end
 end

data/lib/head_music/style/annotations/direction_changes.rb

@@ -23,9 +23,8 @@ class HeadMusic::Style::Annotations::DirectionChanges < HeadMusic::Style::Annota
   end
 
   def melodic_intervals_changing_direction
-    melodic_intervals.drop(1).select.with_index do |interval, i|
-      previous_direction = melodic_intervals[i].direction
-      interval.direction != previous_direction
+    melodic_intervals.each_cons(2).reject do |interval_pair|
+      interval_pair[0].direction == interval_pair[1].direction
     end
   end
 end

data/lib/head_music/style/annotations/end_on_tonic.rb

@@ -8,7 +8,7 @@ class HeadMusic::Style::Annotations::EndOnTonic < HeadMusic::Style::Annotation
   MESSAGE = 'End on the first scale degree.'
 
   def marks
-    HeadMusic::Style::Mark.for(notes.last) if !notes.empty? && !ends_on_tonic?
+    HeadMusic::Style::Mark.for(notes.last) if notes.any? && !ends_on_tonic?
   end
 
   private

data/lib/head_music/style/annotations/mostly_conjunct.rb

@@ -18,9 +18,9 @@ class HeadMusic::Style::Annotations::MostlyConjunct < HeadMusic::Style::Annotati
   private
 
   def marks_for_skips_and_leaps
-    melodic_intervals.map.with_index do |interval, i|
-      HeadMusic::Style::Mark.for_all(notes[i..i + 1], fitness: HeadMusic::SMALL_PENALTY_FACTOR) unless interval.step?
-    end.compact
+    melodic_intervals.
+      reject(&:step?).
+      map { |interval| HeadMusic::Style::Mark.for_all(interval.notes, fitness: HeadMusic::SMALL_PENALTY_FACTOR) }
   end
 
   def conjunct_ratio

data/lib/head_music/style/annotations/singable_range.rb

@@ -16,7 +16,7 @@ class HeadMusic::Style::Annotations::SingableRange < HeadMusic::Style::Annotatio
   private
 
   def overage
-    !notes.empty? ? [range.number - MAXIMUM_RANGE, 0].max : 0
+    notes.any? ? [range.number - MAXIMUM_RANGE, 0].max : 0
   end
 
   def extremes

data/lib/head_music/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HeadMusic
-  VERSION = '0.18.0'
+  VERSION = '0.19.0'
 end

data/lib/head_music.rb

@@ -20,11 +20,9 @@ require 'head_music/utilities/hash_key'
 require 'head_music/named_rudiment'
 
 # rudiments
-require 'head_music/bar'
 require 'head_music/chord'
 require 'head_music/circle'
 require 'head_music/clef'
-require 'head_music/composition'
 require 'head_music/consonance'
 require 'head_music/functional_interval'
 require 'head_music/grand_staff'
@@ -32,28 +30,31 @@ require 'head_music/harmonic_interval'
 require 'head_music/instrument'
 require 'head_music/interval'
 require 'head_music/key_signature'
-require 'head_music/language'
 require 'head_music/letter_name'
 require 'head_music/melodic_interval'
 require 'head_music/meter'
 require 'head_music/motion'
-require 'head_music/note'
 require 'head_music/octave'
 require 'head_music/pitch'
 require 'head_music/pitch_class'
-require 'head_music/placement'
-require 'head_music/position'
 require 'head_music/quality'
 require 'head_music/rhythm'
 require 'head_music/rhythmic_unit'
-require 'head_music/rhythmic_value'
 require 'head_music/scale'
 require 'head_music/scale_degree'
 require 'head_music/scale_type'
 require 'head_music/sign'
 require 'head_music/spelling'
 require 'head_music/staff'
-require 'head_music/voice'
+
+# content
+require 'head_music/content/bar'
+require 'head_music/content/composition'
+require 'head_music/content/note'
+require 'head_music/content/placement'
+require 'head_music/content/position'
+require 'head_music/content/rhythmic_value'
+require 'head_music/content/voice'
 
 # analysis
 require 'head_music/style/analysis'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: head_music
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Rob Head
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-24 00:00:00.000000000 Z
+date: 2018-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -116,34 +116,34 @@ files:
 - circle.yml
 - head_music.gemspec
 - lib/head_music.rb
-- lib/head_music/bar.rb
 - lib/head_music/chord.rb
 - lib/head_music/circle.rb
 - lib/head_music/clef.rb
-- lib/head_music/composition.rb
 - lib/head_music/consonance.rb
+- lib/head_music/content/bar.rb
+- lib/head_music/content/composition.rb
+- lib/head_music/content/note.rb
+- lib/head_music/content/placement.rb
+- lib/head_music/content/position.rb
+- lib/head_music/content/rhythmic_value.rb
+- lib/head_music/content/voice.rb
 - lib/head_music/functional_interval.rb
 - lib/head_music/grand_staff.rb
 - lib/head_music/harmonic_interval.rb
 - lib/head_music/instrument.rb
 - lib/head_music/interval.rb
 - lib/head_music/key_signature.rb
-- lib/head_music/language.rb
 - lib/head_music/letter_name.rb
 - lib/head_music/melodic_interval.rb
 - lib/head_music/meter.rb
 - lib/head_music/motion.rb
 - lib/head_music/named_rudiment.rb
-- lib/head_music/note.rb
 - lib/head_music/octave.rb
 - lib/head_music/pitch.rb
 - lib/head_music/pitch_class.rb
-- lib/head_music/placement.rb
-- lib/head_music/position.rb
 - lib/head_music/quality.rb
 - lib/head_music/rhythm.rb
 - lib/head_music/rhythmic_unit.rb
-- lib/head_music/rhythmic_value.rb
 - lib/head_music/scale.rb
 - lib/head_music/scale_degree.rb
 - lib/head_music/scale_type.rb
@@ -192,7 +192,6 @@ files:
 - lib/head_music/style/rulesets/modern_cantus_firmus.rb
 - lib/head_music/utilities/hash_key.rb
 - lib/head_music/version.rb
-- lib/head_music/voice.rb
 homepage: https://github.com/roberthead/head_music
 licenses:
 - MIT

data/lib/head_music/language.rb

@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-
-# A language.
-class HeadMusic::Language
-  include Comparable
-  include HeadMusic::NamedRudiment
-
-  LANGUAGES = [
-    { name: 'American English', short_name: 'English', abbreviation: 'en-US' },
-    { name: 'British English', abbreviation: 'en-GB' },
-    { name: 'French', native_name: 'Français', abbreviation: 'fr' },
-    { name: 'German', native_name: 'Deutsche', abbreviation: 'de' },
-    { name: 'Italian', native_name: 'Italiano', abbreviation: 'it' },
-    { name: 'Spanish', native_name: 'Español', abbreviation: 'es' },
-    { name: 'Russian', native_name: 'русский', abbreviation: 'ru' },
-  ].freeze
-
-  LANGUAGES.
-    map { |language| ::HeadMusic::Utilities::HashKey.for(language[:name]) }.
-    each { |language_key| define_singleton_method(language_key) { HeadMusic::Language.get(language_key) } }
-
-  LANGUAGES.
-    map { |language| ::HeadMusic::Utilities::HashKey.for(language[:native_name]) }.
-    reject(&:nil?).
-    each { |language_key| define_singleton_method(language_key) { HeadMusic::Language.get(language_key) } }
-
-  LANGUAGES.
-    map { |language| ::HeadMusic::Utilities::HashKey.for(language[:short_name]) }.
-    reject(&:nil?).
-    each { |language_key| define_singleton_method(language_key) { HeadMusic::Language.get(language_key) } }
-
-  def self.default
-    english
-  end
-
-  def self.get(name)
-    get_by_name(name) || default
-  end
-
-  attr_accessor :name, :native_name, :short_name
-
-  def initialize(identifier)
-    identifier_key = HeadMusic::Utilities::HashKey.for(identifier)
-    language_data = LANGUAGES.detect do |data|
-      %i[name native_name short_name].
-        map { |key| HeadMusic::Utilities::HashKey.for(data[key]) }.
-        include?(identifier_key)
-    end
-    @name = language_data[:name]
-    @native_name = language_data[:native_name]
-    @short_name = language_data[:short_name]
-  end
-
-  def <=>(other)
-    name.to_s <=> other.to_s
-  end
-
-  def inspect
-    [name, native_name, short_name].reject(&:nil?).join(' / ')
-  end
-end