head_music 8.0.0 → 8.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1693c61699c2fdcf64441f532c205b8be2e3b6b2be47e772c2471d671b7712b3
-  data.tar.gz: 1c819eee801f19b38cfbb6bdc51177c2e885aced316ea55034bb6c99a75183c5
+  metadata.gz: 4e3d6ab19fbe0d2fb36ef83bd77eb6e029af7e1ce7e0c78b40bdf0945c114a64
+  data.tar.gz: 7392a202e8e2beeb1582116592d99ec2b61ca108227812c335b145ee1664d4d3
 SHA512:
-  metadata.gz: ced29a767bab571ee4c77a14d6c108510465c8424ee66249cd3343efbceb3bec2dec8e94664a2b260a4a0716ae51948c3b796ff088d0b3aab07d40ac762ec111
-  data.tar.gz: 6e7bf970c65500799fa0788f468885207f531c7a8de5c6f1f6be27952435994616f7dc1f10bf1ad51a233244a47d43eca553d9d73add30e8ca89afafac300d9b
+  metadata.gz: c53c0f8a7bb12f7891aa331ce14a8746d89732b6f04dc92aa3793ec22f1d0ac4bcba0662d423f5bc82a553f5c97548b4d951e0a369e8bf809f8b162919211359
+  data.tar.gz: 3a92eb3616549a5efbbea45f239241262cb82f704dc78bfe64e9a4943e488389f6f9c95d5b169d813615ad8678e5bf11c44c1bf62b95d67d996a80801ef4a4fe

data/lib/head_music/{rudiment → analysis}/circle.rb

@@ -1,10 +1,10 @@
-require "head_music/rudiment/interval_cycle"
+require "head_music/analysis/interval_cycle"
 
-# A module for music rudiments
-module HeadMusic::Rudiment; end
+# A module for musical analysis
+module HeadMusic::Analysis; end
 
 # A Circle of Fifths or Fourths shows relationships between pitch classes
-class HeadMusic::Rudiment::Circle < HeadMusic::Rudiment::IntervalCycle
+class HeadMusic::Analysis::Circle < HeadMusic::Analysis::IntervalCycle
   def self.of_fifths
     get(:perfect_fifth)
   end

data/lib/head_music/{rudiment → analysis}/interval_cycle.rb

@@ -1,8 +1,8 @@
-# A module for music rudiments
-module HeadMusic::Rudiment; end
+# A module for musical analysis
+module HeadMusic::Analysis; end
 
 # An Interval Cycle is a collection of pitch classes created from a sequence of the same interval class.
-class HeadMusic::Rudiment::IntervalCycle
+class HeadMusic::Analysis::IntervalCycle
   attr_reader :interval, :starting_pitch
 
   def self.get(interval = 7)
@@ -29,7 +29,7 @@ class HeadMusic::Rudiment::IntervalCycle
   end
 
   def pitch_class_set
-    @pitch_class_set ||= HeadMusic::Rudiment::PitchClassSet.new(pitches)
+    @pitch_class_set ||= HeadMusic::Analysis::PitchClassSet.new(pitches)
   end
 
   def spellings

data/lib/head_music/analysis/melodic_interval.rb

@@ -59,7 +59,7 @@ class HeadMusic::Analysis::MelodicInterval
   end
 
   def spans?(pitch)
-    pitch >= low_pitch && pitch <= high_pitch
+    pitch.between?(low_pitch, high_pitch)
   end
 
   def high_pitch
@@ -87,7 +87,7 @@ class HeadMusic::Analysis::MelodicInterval
     combined_pitches = (pitches + other_interval.pitches).uniq
     return false if combined_pitches.length < 3
 
-    HeadMusic::Rudiment::PitchSet.new(combined_pitches).consonant_triad?
+    HeadMusic::Analysis::PitchSet.new(combined_pitches).consonant_triad?
   end
 
   def method_missing(method_name, *args, &block)

data/lib/head_music/{rudiment → analysis}/pitch_class_set.rb

@@ -1,9 +1,9 @@
-# A module for music rudiments
-module HeadMusic::Rudiment; end
+# A module for musical analysis
+module HeadMusic::Analysis; end
 
 # A PitchClassSet represents a pitch-class set or pitch collection.
 # See also: PitchSet, PitchClass
-class HeadMusic::Rudiment::PitchClassSet
+class HeadMusic::Analysis::PitchClassSet
   attr_reader :pitch_classes
 
   delegate :empty?, to: :pitch_classes

data/lib/head_music/{rudiment → analysis}/pitch_set.rb

@@ -1,9 +1,9 @@
-# A module for music rudiments
-module HeadMusic::Rudiment; end
+# A module for musical analysis
+module HeadMusic::Analysis; end
 
 # A PitchSet is a collection of one or more pitches.
 # See also: PitchClassSet
-class HeadMusic::Rudiment::PitchSet
+class HeadMusic::Analysis::PitchSet
   TERTIAN_SONORITIES = {
     implied_triad: [3],
     triad: [3, 5],
@@ -31,11 +31,11 @@ class HeadMusic::Rudiment::PitchSet
   end
 
   def pitch_class_set
-    @pitch_class_set ||= HeadMusic::Rudiment::PitchClassSet.new(pitch_classes)
+    @pitch_class_set ||= HeadMusic::Analysis::PitchClassSet.new(pitch_classes)
   end
 
   def reduction
-    @reduction ||= HeadMusic::Rudiment::PitchSet.new(reduction_pitches)
+    @reduction ||= HeadMusic::Analysis::PitchSet.new(reduction_pitches)
   end
 
   def diatonic_intervals
@@ -67,13 +67,13 @@ class HeadMusic::Rudiment::PitchSet
   def invert
     inverted_pitch = pitches[0] + HeadMusic::Analysis::DiatonicInterval.get("perfect octave")
     new_pitches = pitches.drop(1) + [inverted_pitch]
-    HeadMusic::Rudiment::PitchSet.new(new_pitches)
+    HeadMusic::Analysis::PitchSet.new(new_pitches)
   end
 
   def uninvert
     inverted_pitch = pitches[-1] - HeadMusic::Analysis::DiatonicInterval.get("perfect octave")
     new_pitches = [inverted_pitch] + pitches[0..-2]
-    HeadMusic::Rudiment::PitchSet.new(new_pitches)
+    HeadMusic::Analysis::PitchSet.new(new_pitches)
   end
 
   def bass_pitch

data/lib/head_music/{rudiment → analysis}/sonority.rb

@@ -1,10 +1,10 @@
-# A module for music rudiments
-module HeadMusic::Rudiment; end
+# A module for musical analysis
+module HeadMusic::Analysis; end
 
 # A Sonority describes a set of pitch class intervalic relationships.
 # For example, a minor triad, or a major-minor seventh chord.
 # The Sonority class is a factory for returning one of its subclasses.
-class HeadMusic::Rudiment::Sonority
+class HeadMusic::Analysis::Sonority
   SONORITIES = {
     major_triad: %w[M3 P5],
     minor_triad: %w[m3 P5],
@@ -117,8 +117,8 @@ class HeadMusic::Rudiment::Sonority
   end
 
   def ==(other)
-    other = HeadMusic::Rudiment::PitchSet.new(other) if other.is_a?(Array)
-    other = self.class.new(other) if other.is_a?(HeadMusic::Rudiment::PitchSet)
+    other = HeadMusic::Analysis::PitchSet.new(other) if other.is_a?(Array)
+    other = self.class.new(other) if other.is_a?(HeadMusic::Analysis::PitchSet)
     identifier == other.identifier
   end
 end

data/lib/head_music/version.rb

@@ -1,3 +1,3 @@
 module HeadMusic
-  VERSION = "8.0.0"
+  VERSION = "8.0.1"
 end

data/lib/head_music.rb

@@ -34,10 +34,8 @@ require "head_music/named"
 # rudiments
 require "head_music/rudiment/alteration"
 require "head_music/rudiment/chromatic_interval"
-require "head_music/rudiment/circle"
 require "head_music/rudiment/clef"
 require "head_music/rudiment/consonance"
-require "head_music/rudiment/interval_cycle"
 require "head_music/rudiment/key_signature"
 require "head_music/rudiment/key_signature/enharmonic_equivalence"
 require "head_music/rudiment/letter_name"
@@ -47,8 +45,6 @@ require "head_music/rudiment/pitch"
 require "head_music/rudiment/pitch/enharmonic_equivalence"
 require "head_music/rudiment/pitch/octave_equivalence"
 require "head_music/rudiment/pitch_class"
-require "head_music/rudiment/pitch_class_set"
-require "head_music/rudiment/pitch_set"
 require "head_music/rudiment/quality"
 require "head_music/rudiment/reference_pitch"
 require "head_music/rudiment/register"
@@ -58,7 +54,6 @@ require "head_music/rudiment/scale"
 require "head_music/rudiment/scale_degree"
 require "head_music/rudiment/scale_type"
 require "head_music/rudiment/solmization"
-require "head_music/rudiment/sonority"
 require "head_music/rudiment/spelling"
 require "head_music/rudiment/tuning"
 
@@ -80,6 +75,7 @@ require "head_music/content/staff"
 require "head_music/content/voice"
 
 # analysis
+require "head_music/analysis/circle"
 require "head_music/analysis/diatonic_interval"
 require "head_music/analysis/diatonic_interval/category"
 require "head_music/analysis/diatonic_interval/naming"
@@ -87,8 +83,12 @@ require "head_music/analysis/diatonic_interval/parser"
 require "head_music/analysis/diatonic_interval/semitones"
 require "head_music/analysis/diatonic_interval/size"
 require "head_music/analysis/harmonic_interval"
+require "head_music/analysis/interval_cycle"
 require "head_music/analysis/melodic_interval"
 require "head_music/analysis/motion"
+require "head_music/analysis/pitch_class_set"
+require "head_music/analysis/pitch_set"
+require "head_music/analysis/sonority"
 
 # style analysis
 require "head_music/style/analysis"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: head_music
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 8.0.1
 platform: ruby
 authors:
 - Rob Head
@@ -120,6 +120,7 @@ files:
 - bin/setup
 - head_music.gemspec
 - lib/head_music.rb
+- lib/head_music/analysis/circle.rb
 - lib/head_music/analysis/diatonic_interval.rb
 - lib/head_music/analysis/diatonic_interval/category.rb
 - lib/head_music/analysis/diatonic_interval/naming.rb
@@ -127,8 +128,12 @@ files:
 - lib/head_music/analysis/diatonic_interval/semitones.rb
 - lib/head_music/analysis/diatonic_interval/size.rb
 - lib/head_music/analysis/harmonic_interval.rb
+- lib/head_music/analysis/interval_cycle.rb
 - lib/head_music/analysis/melodic_interval.rb
 - lib/head_music/analysis/motion.rb
+- lib/head_music/analysis/pitch_class_set.rb
+- lib/head_music/analysis/pitch_set.rb
+- lib/head_music/analysis/sonority.rb
 - lib/head_music/content/bar.rb
 - lib/head_music/content/composition.rb
 - lib/head_music/content/note.rb
@@ -154,11 +159,9 @@ files:
 - lib/head_music/named.rb
 - lib/head_music/rudiment/alteration.rb
 - lib/head_music/rudiment/chromatic_interval.rb
-- lib/head_music/rudiment/circle.rb
 - lib/head_music/rudiment/clef.rb
 - lib/head_music/rudiment/clefs.yml
 - lib/head_music/rudiment/consonance.rb
-- lib/head_music/rudiment/interval_cycle.rb
 - lib/head_music/rudiment/key_signature.rb
 - lib/head_music/rudiment/key_signature/enharmonic_equivalence.rb
 - lib/head_music/rudiment/letter_name.rb
@@ -168,8 +171,6 @@ files:
 - lib/head_music/rudiment/pitch/enharmonic_equivalence.rb
 - lib/head_music/rudiment/pitch/octave_equivalence.rb
 - lib/head_music/rudiment/pitch_class.rb
-- lib/head_music/rudiment/pitch_class_set.rb
-- lib/head_music/rudiment/pitch_set.rb
 - lib/head_music/rudiment/quality.rb
 - lib/head_music/rudiment/reference_pitch.rb
 - lib/head_music/rudiment/register.rb
@@ -180,7 +181,6 @@ files:
 - lib/head_music/rudiment/scale_type.rb
 - lib/head_music/rudiment/solmization.rb
 - lib/head_music/rudiment/solmizations.yml
-- lib/head_music/rudiment/sonority.rb
 - lib/head_music/rudiment/spelling.rb
 - lib/head_music/rudiment/tuning.rb
 - lib/head_music/style/analysis.rb