head_music 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 208eb249d8215ed60a1047fa2ce44d615da37cf3
-  data.tar.gz: 9e02bbfcd8df9e1ca07dc737b594063831caf7f3
+  metadata.gz: 326a9d839392519ee341ca47ec34eb63ea461bd1
+  data.tar.gz: 95dbb21634187c2ba6764829ce37e16759347d39
 SHA512:
-  metadata.gz: a76df5d52cfc41df45d538da2fb0b4443d64bd65f4713e412e611082853906495881c26631799bad5c1fd160eea7355baa6c3c8911ad4151f8c719f61866900a
-  data.tar.gz: 3153be5ac2b260d3ef0c9035d2e2772ba35d0871f831878eba88313365a843a08e24a4bb6ce59d1bc2fc661c388e317efdb7a2fc3ff92c76eed6db45b5165a3b
+  metadata.gz: d7b40960fcf36045cfd9d512e27d41024fc2a1a37c10cbcffa1c89c125ac2fd3fba06108b457f6ae99c612bc956c23763636999239c05250c0842314be75fb11
+  data.tar.gz: 6a7971653dad527be88f1321e9e3cab80b4855e8a460a82f885fd17d96a78fe1bb98e0b3fd21bfe2b6f49529bda891fadce86979dcf9669da5657ad82c51d5eb

data/lib/head_music/accidental.rb

@@ -11,6 +11,7 @@ class HeadMusic::Accidental
   def self.get(identifier)
     for_symbol(identifier) || for_interval(identifier)
   end
+  singleton_class.send(:alias_method, :[], :get)
 
   def self.for_symbol(identifier)
     @accidentals ||= {}

data/lib/head_music/circle.rb

@@ -1,16 +1,17 @@
 class HeadMusic::Circle
   def self.of_fifths
-    by_interval(HeadMusic::Interval.named(:perfect_fifth))
+    get(7)
   end
 
   def self.of_fourths
-    by_interval(HeadMusic::Interval.named(:perfect_fourth))
+    get(5)
   end
 
-  def self.by_interval(interval)
+  def self.get(interval = 7)
     @circles ||= {}
     @circles[interval.to_i] ||= new(interval)
   end
+  singleton_class.send(:alias_method, :[], :get)
 
   attr_reader :interval, :pitch_classes
 

data/lib/head_music/consonance.rb

@@ -5,6 +5,7 @@ class HeadMusic::Consonance
     @consonances ||= {}
     @consonances[name.to_sym] ||= new(name) if LEVELS.include?(name.to_s)
   end
+  singleton_class.send(:alias_method, :[], :get)
 
   attr_reader :name
 

data/lib/head_music/functional_interval.rb

@@ -38,6 +38,7 @@ class HeadMusic::FunctionalInterval
     higher_pitch = HeadMusic::Pitch.from_number_and_letter(lower_pitch + semitones, higher_letter)
     new(lower_pitch, higher_pitch)
   end
+  singleton_class.send(:alias_method, :[], :get)
 
   def self.degree_quality_semitones
     @degree_quality_semitones ||= begin

data/lib/head_music/interval.rb

@@ -11,6 +11,7 @@ class HeadMusic::Interval
     @intervals ||= {}
     @intervals[semitones.to_i] ||= new(semitones.to_i)
   end
+  singleton_class.send(:alias_method, :[], :get)
 
   def self.named(name)
     name = name.to_s

data/lib/head_music/{letter.rb → letter_name.rb}

@@ -1,4 +1,4 @@
-class HeadMusic::Letter
+class HeadMusic::LetterName
   # Defines the natural relationship between the natural letter-named notes
 
   NAMES = ('A'..'G').to_a
@@ -20,6 +20,7 @@ class HeadMusic::Letter
   def self.get(identifier)
     from_name(identifier) || from_pitch_class(identifier)
   end
+  singleton_class.send(:alias_method, :[], :get)
 
   def self.from_name(name)
     @letters ||= {}
@@ -63,7 +64,7 @@ class HeadMusic::Letter
   end
 
   def steps_to(other, direction = :ascending)
-    other = Letter.get(other)
+    other = LetterName.get(other)
     other_position = other.position
     if direction == :descending
       other_position -= NAMES.length if other_position > position

data/lib/head_music/meter.rb

@@ -0,0 +1,50 @@
+class HeadMusic::Meter
+  attr_reader :top_number, :bottom_number
+
+  NAMED = {
+    common_time: '4/4',
+    cut_time: '2/2'
+  }
+
+  def self.get(identifier)
+    identifer = identifer.to_s
+    identifier = NAMED[identifier.to_sym] || identifier
+    new(*identifier.split('/').map(&:to_i))
+  end
+
+  def initialize(top_number, bottom_number)
+    @top_number, @bottom_number = top_number, bottom_number
+  end
+
+  def simple?
+    !compound?
+  end
+
+  def compound?
+    top_number > 3 && top_number / 3 == top_number / 3.0
+  end
+
+  def duple?
+    top_number == 2
+  end
+
+  def triple?
+    top_number % 3 == 0
+  end
+
+  def quadruple?
+    top_number == 4
+  end
+
+  def beats_per_measure
+    compound? ? top_number / 3 : top_number
+  end
+
+  def to_s
+    [top_number, bottom_number].join('/')
+  end
+
+  def ==(other)
+    to_s == other.to_s
+  end
+end

data/lib/head_music/octave.rb

@@ -8,6 +8,7 @@ class HeadMusic::Octave
   def self.get(identifier)
     from_number(identifier) || from_name(identifier) || default
   end
+  singleton_class.send(:alias_method, :[], :get)
 
   def self.from_number(identifier)
     return nil unless identifier.to_s == identifier.to_i.to_s

data/lib/head_music/pitch.rb

@@ -14,6 +14,7 @@ class HeadMusic::Pitch
   def self.get(value)
     from_name(value) || from_number(value)
   end
+  singleton_class.send(:alias_method, :[], :get)
 
   def self.from_name(name)
     return nil unless name == name.to_s
@@ -28,8 +29,8 @@ class HeadMusic::Pitch
   end
 
   def self.from_number_and_letter(number, letter)
-    letter = HeadMusic::Letter.get(letter)
-    natural_letter_pitch = get(HeadMusic::Letter.get(letter).pitch_class)
+    letter = HeadMusic::LetterName.get(letter)
+    natural_letter_pitch = get(HeadMusic::LetterName.get(letter).pitch_class)
     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))

data/lib/head_music/pitch_class.rb

@@ -11,6 +11,7 @@ class HeadMusic::PitchClass
     number ||= identifier.to_i % 12
     @pitch_classes[number] ||= new(number)
   end
+  singleton_class.send(:alias_method, :[], :get)
 
   class << self
     alias_method :[], :get
@@ -35,6 +36,7 @@ class HeadMusic::PitchClass
   def ==(value)
     to_i == value.to_i
   end
+  alias_method :enharmonic?, :==
 
   def intervals_to(other)
     delta = other.to_i - to_i

data/lib/head_music/quality.rb

@@ -31,6 +31,7 @@ class HeadMusic::Quality
     identifier = identifier.to_s.to_sym
     @qualities[identifier] ||= new(identifier) if NAMES.include?(identifier)
   end
+  singleton_class.send(:alias_method, :[], :get)
 
   def self.from(starting_quality, delta)
     if starting_quality == :perfect

data/lib/head_music/rhythmic_value.rb

@@ -0,0 +1,63 @@
+class HeadMusic::RhythmicValue
+  MULTIPLES = ['whole', 'double whole', 'longa', 'maxima']
+  DIVISIONS = ['whole', 'half', 'quarter', 'eighth', 'sixteenth', 'thirty-second', 'sixty-fourth', 'hundred twenty-eighth note', 'two hundred fifty-sixth note']
+
+  BRITISH_MULTIPLE_NAMES = %w[semibreve breve longa maxima]
+  BRITISH_DIVISION_NAMES = %w[semibreve minim crotchet quaver semiquaver demisemiquaver hemidemisemiquaver semihemidemisemiquaver demisemihemidemisemiquaver]
+
+  def self.get(name)
+    @rhythmic_values ||= {}
+    @rhythmic_values[name.to_s] ||= new(name.to_s)
+  end
+  singleton_class.send(:alias_method, :[], :get)
+
+  attr_reader :name
+  delegate :to_s, to: :name
+  delegate :to_i, to: :relative_value
+
+  def initialize(canonical_name)
+    @name ||= canonical_name
+  end
+
+  def relative_value
+    @relative_value ||=
+      if MULTIPLES.include?(name)
+        1.0 * 2**MULTIPLES.index(name)
+      elsif DIVISIONS.include?(name)
+        1.0 / 2**DIVISIONS.index(name)
+      end
+  end
+
+  def per_whole
+    @per_whole ||=
+      if MULTIPLES.include?(name)
+        1.0 / 2**MULTIPLES.index(name)
+      elsif DIVISIONS.include?(name)
+        1.0 * 2**DIVISIONS.index(name)
+      end
+  end
+
+  def note_head
+    return :breve if relative_value == 2
+    return :open if relative_value >= 0.5
+    :closed
+  end
+
+  def flags
+    DIVISIONS.include?(name) ? [DIVISIONS.index(name) - 2, 0].max : 0
+  end
+
+  def has_stem?
+    relative_value < 1
+  end
+
+  def british_name
+    if MULTIPLES.include?(name)
+      BRITISH_MULTIPLE_NAMES[MULTIPLES.index(name)]
+    elsif DIVISIONS.include?(name)
+      BRITISH_DIVISION_NAMES[DIVISIONS.index(name)]
+    end
+  end
+
+  private_class_method :new
+end

data/lib/head_music/scale_type.rb

@@ -64,6 +64,7 @@ class HeadMusic::ScaleType
     attributes = SCALE_TYPES[name]
     @scale_types[name] ||= new(name, attributes)
   end
+  singleton_class.send(:alias_method, :[], :get)
 
   attr_reader :name, :ascending_intervals, :descending_intervals, :parent_name
   alias_method :intervals, :ascending_intervals

data/lib/head_music/spelling.rb

@@ -1,5 +1,4 @@
-# A Spelling is a pitch class with a letter and possibly an accidental
-
+# A Spelling is a pitch class with a letter name and possibly an accidental
 class HeadMusic::Spelling
   MATCHER = /^\s*([A-G])([b#]*)(\-?\d+)?\s*$/
 
@@ -10,10 +9,12 @@ class HeadMusic::Spelling
   delegate :number, to: :pitch_class, prefix: true
   delegate :to_i, to: :pitch_class_number
   delegate :cycle, to: :letter, prefix: true
+  delegate :enharmonic?, to: :pitch_class
 
   def self.get(identifier)
     from_name(identifier) || from_number(identifier)
   end
+  singleton_class.send(:alias_method, :[], :get)
 
   def self.match(string)
     string.to_s.match(MATCHER)
@@ -22,7 +23,7 @@ class HeadMusic::Spelling
   def self.from_name(name)
     if match(name)
       letter_name, accidental_string, _octave = match(name).captures
-      letter = HeadMusic::Letter.get(letter_name)
+      letter = HeadMusic::LetterName.get(letter_name)
       return nil unless letter
       accidental = HeadMusic::Accidental.get(accidental_string)
       fetch_or_create(letter, accidental)
@@ -32,13 +33,13 @@ class HeadMusic::Spelling
   def self.from_number(number)
     return nil unless number == number.to_i
     pitch_class_number = number.to_i % 12
-    letter = HeadMusic::Letter.from_pitch_class(pitch_class_number)
+    letter = HeadMusic::LetterName.from_pitch_class(pitch_class_number)
     from_number_and_letter(number, letter)
   end
 
   def self.from_number_and_letter(number, letter)
-    letter = HeadMusic::Letter.get(letter)
-    natural_letter_pitch_class = HeadMusic::Letter.get(letter).pitch_class
+    letter = HeadMusic::LetterName.get(letter)
+    natural_letter_pitch_class = HeadMusic::LetterName.get(letter).pitch_class
     accidental_interval = letter.pitch_class.smallest_interval_to(HeadMusic::PitchClass.get(number))
     accidental = HeadMusic::Accidental.for_interval(accidental_interval)
     fetch_or_create(letter, accidental)
@@ -51,7 +52,7 @@ class HeadMusic::Spelling
   end
 
   def initialize(letter, accidental = nil)
-    @letter = HeadMusic::Letter.get(letter.to_s)
+    @letter = HeadMusic::LetterName.get(letter.to_s)
     @accidental = HeadMusic::Accidental.get(accidental.to_s)
     accidental_semitones = @accidental ? @accidental.semitones : 0
     @pitch_class = HeadMusic::PitchClass.get(letter.pitch_class + accidental_semitones)

data/lib/head_music/version.rb

@@ -1,3 +1,3 @@
 module HeadMusic
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/lib/head_music.rb

@@ -1,23 +1,25 @@
-require "head_music/version"
+require 'head_music/version'
 
-require "active_support/core_ext/module/delegation"
-require "active_support/core_ext/string/access"
-require "humanize"
+require 'active_support/core_ext/module/delegation'
+require 'active_support/core_ext/string/access'
+require 'humanize'
 
-require "head_music/accidental"
-require "head_music/circle"
-require "head_music/consonance"
-require "head_music/functional_interval"
-require "head_music/interval"
-require "head_music/key_signature"
-require "head_music/letter"
-require "head_music/octave"
-require "head_music/pitch_class"
-require "head_music/pitch"
-require "head_music/quality"
-require "head_music/scale"
-require "head_music/scale_type"
-require "head_music/spelling"
+require 'head_music/accidental'
+require 'head_music/circle'
+require 'head_music/consonance'
+require 'head_music/functional_interval'
+require 'head_music/interval'
+require 'head_music/key_signature'
+require 'head_music/letter_name'
+require 'head_music/meter'
+require 'head_music/octave'
+require 'head_music/pitch_class'
+require 'head_music/pitch'
+require 'head_music/quality'
+require 'head_music/rhythmic_value'
+require 'head_music/scale'
+require 'head_music/scale_type'
+require 'head_music/spelling'
 
 module HeadMusic
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: head_music
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Rob Head
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-22 00:00:00.000000000 Z
+date: 2017-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -120,11 +120,13 @@ files:
 - lib/head_music/functional_interval.rb
 - lib/head_music/interval.rb
 - lib/head_music/key_signature.rb
-- lib/head_music/letter.rb
+- lib/head_music/letter_name.rb
+- lib/head_music/meter.rb
 - lib/head_music/octave.rb
 - lib/head_music/pitch.rb
 - lib/head_music/pitch_class.rb
 - lib/head_music/quality.rb
+- lib/head_music/rhythmic_value.rb
 - lib/head_music/scale.rb
 - lib/head_music/scale_type.rb
 - lib/head_music/spelling.rb