head_music 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c74af27a5ca661511c85f7cb4bc516a8b9dac3ad
-  data.tar.gz: aa5a6603255d9a06c2233acc03584e6765641d24
+  metadata.gz: 56a211e11bb35239af47cdf2e79e2032b6b97f7b
+  data.tar.gz: 293be36552913da8cd64f946b4b1ece210114991
 SHA512:
-  metadata.gz: fef4a15562ef45e51da6ed0b132cfe7d3da2db38717b164dd638a0a89c61ad5d67bfdf42b8ca5d91cd37b4e7b097200399ab5e6feb0fcfe611053b4b1fbf9b98
-  data.tar.gz: 5373d9a300e8fbcd3ba92002655a1fc5d6d70839947b2b76830421f319a39019d7858fa35d11ee7ef1e77563af375e17903242f54cb0cf608bf33d8d20083a7f
+  metadata.gz: d809adbad72a56eca2910a2c234d6497028d3c0a9723bfd02a214cf62f22e44777c38ff08a20707beff1d65e59cd9b5e8ddacacce82d2d64b9b826c48a5c3329
+  data.tar.gz: a2aa89d2b462c9a8dd938ddef98376a78a4a1a2ba7dd721e2f4e39913f5074c53d201465ae1ba0e59e11d6706e4905cb74434bb596b892b903dc298604e2ba06

data/lib/head_music/composition.rb

@@ -1,9 +1,10 @@
 class HeadMusic::Composition
-  attr_reader :name, :key_signature, :meter, :measures
+  attr_reader :name, :key_signature, :meter, :measures, :voices
 
   def initialize(name:, key_signature: nil, meter: nil)
     ensure_attributes(name, key_signature, meter)
     add_measure
+    add_voice
   end
 
   def add_measure
@@ -17,6 +18,11 @@ class HeadMusic::Composition
     end
   end
 
+  def add_voice
+    @voices ||= []
+    @voices << HeadMusic::Voice.new(self)
+  end
+
   private
 
   def ensure_attributes(name, key_signature, meter)

data/lib/head_music/key_signature.rb

@@ -1,6 +1,7 @@
 class HeadMusic::KeySignature
   attr_reader :tonic_spelling
-  attr_reader :quality_name
+  attr_reader :scale_type
+  attr_reader :scale
 
   SHARPS = %w{F# C# G# D# A# E# B#}
   FLATS = %w{Bb Eb Ab Db Gb Cb Fb}
@@ -12,65 +13,56 @@ class HeadMusic::KeySignature
   def self.get(identifier)
     return identifier if identifier.is_a?(HeadMusic::KeySignature)
     @key_signatures ||= {}
-    tonic_spelling, quality_name = identifier.split(/\s/)
+    tonic_spelling, scale_type_name = identifier.strip.split(/\s/)
     hash_key = HeadMusic::Utilities::HashKey.for(identifier)
-    @key_signatures[hash_key] ||= new(tonic_spelling, quality_name)
+    @key_signatures[hash_key] ||= new(tonic_spelling, scale_type_name)
   end
 
   delegate :pitch_class, to: :tonic_spelling, prefix: :tonic
   delegate :to_s, to: :name
-
-  def initialize(tonic_spelling, quality_name = nil)
-    @tonic_spelling = tonic_spelling
-    @quality_name = quality_name || :major
+  delegate :pitches, to: :scale
+
+  def initialize(tonic_spelling, scale_type = nil)
+    @tonic_spelling = HeadMusic::Spelling.get(tonic_spelling)
+    @scale_type = HeadMusic::ScaleType.get(scale_type) if scale_type
+    @scale_type ||= HeadMusic::ScaleType.default
+    @scale_type = @scale_type.parent || @scale_type
+    @scale = HeadMusic::Scale.get(@tonic_spelling, @scale_type)
   end
 
   def sharps
-    SHARPS.first(num_sharps)
+    pitches.map(&:spelling).uniq.select { |spelling|
+      spelling.sharp?
+    }.map(&:to_s).sort_by { |sharp|
+      SHARPS.index(sharp)
+    }
   end
 
   def flats
-    FLATS.first(num_flats)
+    pitches.map(&:spelling).uniq.select { |spelling|
+      spelling.flat?
+    }.map(&:to_s).sort_by { |flat|
+      FLATS.index(flat)
+    }
   end
 
   def num_sharps
-    (HeadMusic::Circle.of_fifths.index(tonic_pitch_class) - quality_name_adjustment) % 12
+    sharps.length
   end
 
   def num_flats
-    (HeadMusic::Circle.of_fourths.index(tonic_pitch_class) + quality_name_adjustment) % 12
+    flats.length
   end
 
   def sharps_or_flats
-    return sharps if @tonic_spelling.to_s =~ /#/
-    return flats if @tonic_spelling.to_s =~ /b/
-    num_sharps <= num_flats ? sharps : flats
+    flats.length > 0 ? flats : sharps
   end
 
   def name
-    [tonic_spelling.to_s, quality_name.to_s].join(' ')
+    [tonic_spelling.to_s, scale_type.to_s].join(' ')
   end
 
   def ==(other)
-    self.to_s == other.to_s
-  end
-
-  private
-
-  def quality_name_adjustment
-    quality_name == :minor ? 3 : 0
-  end
-
-  def major?
-    @quality_name.to_sym == :major
-  end
-
-  def minor?
-    @quality_name.to_sym == :minor
-  end
-
-  def relative_major_pitch_class
-    return tonic_pitch_class if major?
-    return (tonic_pitch_class.to_i + 3) % 12 if minor?
+    self.sharps_or_flats == self.class.get(other).sharps_or_flats
   end
 end

data/lib/head_music/placement.rb

@@ -0,0 +1,39 @@
+class HeadMusic::Placement
+  include Comparable
+
+  attr_reader :voice, :position, :rhythmic_value, :pitch
+  delegate :composition, to: :voice
+
+  def initialize(voice, position, rhythmic_value, pitch)
+    ensure_attributes(voice, position, rhythmic_value, pitch)
+  end
+
+  def note?
+    pitch
+  end
+
+  def rest?
+    !note?
+  end
+
+  def <=>(other)
+    self.position <=> other.position
+  end
+
+  private
+
+  def ensure_attributes(voice, position, rhythmic_value, pitch)
+    @voice = voice
+    ensure_position(position)
+    @rhythmic_value = rhythmic_value
+    @pitch = HeadMusic::Pitch.get(pitch)
+  end
+
+  def ensure_position(position)
+    if position.is_a?(HeadMusic::Position)
+      @position = position
+    else
+      @position = HeadMusic::Position.new(composition, position)
+    end
+  end
+end

data/lib/head_music/position.rb

@@ -1,4 +1,6 @@
 class HeadMusic::Position
+  include Comparable
+
   attr_reader :composition, :measure_number, :count, :tick
   delegate :to_s, to: :code
   delegate :meter, to: :composition
@@ -12,15 +14,31 @@ class HeadMusic::Position
   end
 
   def code
-    [measure_number, count, tick].join(':')
+    values.join(':')
   end
 
   def state
     [composition.name, code].join(' ')
   end
 
-  def ==(other)
-    self.state == other.state
+  def values
+    [measure_number, count, tick]
+  end
+
+  def <=>(other)
+    self.values <=> other.values
+  end
+
+  def strength
+    meter.beat_strength(count, tick: tick)
+  end
+
+  def strong?
+    strength >= 80
+  end
+
+  def weak?
+    !strong?
   end
 
   private

data/lib/head_music/rhythm.rb

@@ -0,0 +1,3 @@
+module HeadMusic::Rhythm
+  PPQN = PULSES_PER_QUARTER_NOTE = 960
+end

data/lib/head_music/rhythmic_unit.rb

@@ -5,8 +5,6 @@ class HeadMusic::RhythmicUnit
   BRITISH_MULTIPLE_NAMES = %w[semibreve breve longa maxima]
   BRITISH_DIVISION_NAMES = %w[semibreve minim crotchet quaver semiquaver demisemiquaver hemidemisemiquaver semihemidemisemiquaver demisemihemidemisemiquaver]
 
-  PPQN = PULSES_PER_QUARTER_NOTE = 960
-
   def self.get(name)
     @rhythmic_units ||= {}
     hash_key = HeadMusic::Utilities::HashKey.for(name)
@@ -32,7 +30,7 @@ class HeadMusic::RhythmicUnit
   end
 
   def ticks
-    PPQN * 4 * relative_value
+    HeadMusic::Rhythm::PPQN * 4 * relative_value
   end
 
   def notehead

data/lib/head_music/rhythmic_value.rb

@@ -27,7 +27,7 @@ class HeadMusic::RhythmicValue
   end
 
   def ticks
-    HeadMusic::RhythmicUnit::PPQN * 4 * total_value
+    HeadMusic::Rhythm::PPQN * 4 * total_value
   end
 
   def per_whole

data/lib/head_music/scale.rb

@@ -1,10 +1,16 @@
 class HeadMusic::Scale
-  def self.get(root_pitch, scale_type_name = nil)
+  SCALE_REGEX = /^[A-G][#b]?\s+\w+$/
+
+  def self.get(root_pitch, scale_type = nil)
+    if root_pitch.is_a?(String) && scale_type =~ SCALE_REGEX
+      root_pitch, scale_type = root_pitch.split(/\s+/)
+    end
     root_pitch = HeadMusic::Pitch.get(root_pitch)
-    scale_type ||= HeadMusic::ScaleType.get(scale_type_name || :major)
+    scale_type = HeadMusic::ScaleType.get(scale_type || :major)
     @scales ||= {}
-    @scales[root_pitch.to_s] ||= {}
-    @scales[root_pitch.to_s][scale_type.name] ||= new(root_pitch, scale_type)
+    name = [root_pitch.to_s, scale_type].join(' ')
+    hash_key = HeadMusic::Utilities::HashKey.for(name)
+    @scales[hash_key] ||= new(root_pitch, scale_type)
   end
 
   attr_reader :root_pitch, :scale_type

data/lib/head_music/scale_type.rb

@@ -66,6 +66,10 @@ class HeadMusic::ScaleType
   end
   singleton_class.send(:alias_method, :[], :get)
 
+  def self.default
+    get(:major)
+  end
+
   attr_reader :name, :ascending_intervals, :descending_intervals, :parent_name
   alias_method :intervals, :ascending_intervals
 

data/lib/head_music/version.rb

@@ -1,3 +1,3 @@
 module HeadMusic
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/lib/head_music/voice.rb

@@ -0,0 +1,23 @@
+class HeadMusic::Voice
+  include Comparable
+
+  attr_reader :composition, :placements
+
+  def initialize(composition = nil)
+    @composition = composition || Composition.new(name: "Unnamed")
+    @placements = []
+  end
+
+  def place(position, rhythmic_value, pitch = nil)
+    HeadMusic::Placement.new(self, position, rhythmic_value, pitch).tap { |placement|
+      insert_into_placements(placement)
+    }
+  end
+
+  private
+
+  def insert_into_placements(placement)
+    @placements << placement
+    @placements = @placements.sort
+  end
+end

data/lib/head_music.rb

@@ -21,14 +21,17 @@ require 'head_music/note'
 require 'head_music/octave'
 require 'head_music/pitch_class'
 require 'head_music/pitch'
+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_type'
 require 'head_music/spelling'
 require 'head_music/staff'
+require 'head_music/voice'
 require 'head_music/utilities/hash_key'
 
 module HeadMusic

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: head_music
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Rob Head
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-03 00:00:00.000000000 Z
+date: 2017-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -133,8 +133,10 @@ files:
 - 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
@@ -143,6 +145,7 @@ files:
 - lib/head_music/staff.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