head_music 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 180ffc27218ca1ef9eacf64c6d93aff2ab81fc49
-  data.tar.gz: 76e58d1d8ed78ca58ebe899bedfed0756d7104fc
+  metadata.gz: 161df8f1795f4e70adcdc8d7298cdbf1dd2af984
+  data.tar.gz: 621aac81ec102840a879186df55eb9aeed040b8b
 SHA512:
-  metadata.gz: 730ecdb5ebfadc4cc18c2776b3413a74c31629249e20376ad27928a762347b89ec32392fa4dc441bcd84724e41208915874cfbdacd3b75119c2910638339ba47
-  data.tar.gz: 1f5ed8080b5584f26702fe7f257459975923ddff48be3239050e721837f65abe3e3f8863dd865e39b2161900b1fd924eec03d2c6337860d7d27bbde69f10537e
+  metadata.gz: 947631876b0c2c74a807515783a22783836838d75d2a21eab2f66e8863a5b25d5849e92874885007a99dd0596acacb5c795ad0ffc153d47cac616322ec566fef
+  data.tar.gz: 9ff5a2e01209ccd7f515d9d152f49159a0f18518f7bfb17e289609cb519395b96e7ae4399dd321346b3b971f05ae970d2095fb4556ca1bb666b36d268f46fe2c

data/lib/head_music/accidental.rb

@@ -8,9 +8,13 @@ class HeadMusic::Accidental
 
   attr_reader :string
 
-  def self.get(string)
+  def self.get(identifier)
     @accidentals ||= {}
-    @accidentals[string] ||= new(string)
+    @accidentals[identifier] ||= for_symbol(identifier) || for_interval(identifier)
+  end
+
+  def self.for_symbol(identifier)
+    new(identifier) if ACCIDENTAL_SEMITONES.keys.include?(identifier)
   end
 
   def self.for_interval(semitones)

data/lib/head_music/circle.rb

@@ -19,6 +19,10 @@ class HeadMusic::Circle
     @pitch_classes = pitch_classes_by_interval(interval)
   end
 
+  def index(pitch_class)
+    @pitch_classes.index(HeadMusic::Spelling.get(pitch_class).pitch_class)
+  end
+
   private_class_method :new
 
   private

data/lib/head_music/key_signature.rb

@@ -21,11 +21,17 @@ class HeadMusic::KeySignature
   end
 
   def num_sharps
-    (HeadMusic::Circle.of_fifths.pitch_classes.index(tonic_pitch_class) - scale_type_adjustment) % 12
+    (HeadMusic::Circle.of_fifths.index(tonic_pitch_class) - scale_type_adjustment) % 12
   end
 
   def num_flats
-    (HeadMusic::Circle.of_fourths.pitch_classes.index(tonic_pitch_class) + scale_type_adjustment) % 12
+    (HeadMusic::Circle.of_fourths.index(tonic_pitch_class) + scale_type_adjustment) % 12
+  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
   end
 
   private
@@ -33,4 +39,17 @@ class HeadMusic::KeySignature
   def scale_type_adjustment
     scale_type == :minor ? 3 : 0
   end
+
+  def major?
+    @scale_type.to_sym == :major
+  end
+
+  def minor?
+    @scale_type.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?
+  end
 end

data/lib/head_music/letter.rb

@@ -17,23 +17,23 @@ class HeadMusic::Letter
     NAMES.map { |letter_name| get(letter_name)}
   end
 
-  def self.get(name)
+  def self.get(identifier)
     @letters ||= {}
+    @letters[identifier] ||= from_name(identifier) || from_pitch_class(identifier)
+  end
+
+  def self.from_name(name)
     name = name.to_s.first.upcase
-    if NAMES.include?(name)
-      @letters[name] ||= new(name)
-    end
+    new(name) if NAMES.include?(name)
   end
 
   def self.from_pitch_class(pitch_class)
     @letters ||= {}
+    return nil if pitch_class.to_s == pitch_class
     pitch_class = pitch_class.to_i % 12
-    name =
-      NAMES.detect { |name| pitch_class == NATURAL_PITCH_CLASS_NUMBERS[name] } ||
-      NAMES.detect { |name| pitch_class == NATURAL_PITCH_CLASS_NUMBERS[name]+1 }
-    if NAMES.include?(name)
-      @letters[name] ||= new(name)
-    end
+    name = NAMES.detect { |name| pitch_class == NATURAL_PITCH_CLASS_NUMBERS[name] }
+    name ||= HeadMusic::PitchClass::PREFERRED_SPELLINGS[pitch_class].first
+    return new(name) if NAMES.include?(name)
   end
 
   attr_reader :name

data/lib/head_music/pitch_class.rb

@@ -1,6 +1,8 @@
 class HeadMusic::PitchClass
   attr_reader :number
 
+  PREFERRED_SPELLINGS = %w[C C# D Eb E F F# G Ab A Bb B]
+
   def self.get(number)
     @pitch_classes ||= {}
     number = number.to_i % 12

data/lib/head_music/spelling.rb

@@ -5,7 +5,7 @@ class HeadMusic::Spelling
   attr_reader :accidental
   attr_reader :pitch_class
 
-  SPELLING_MATCHER = /([A-G])([b#]*)(\-?\d+)?/
+  SPELLING_MATCHER = /^\s*([A-G])([b#]*)(\-?\d+)?\s*$/
 
   def self.get(identifier)
     @spellings ||= {}
@@ -14,19 +14,17 @@ class HeadMusic::Spelling
 
   def self.from_name(name)
     return nil unless name == name.to_s
-    match = name.match(SPELLING_MATCHER)
+    match = name.to_s.match(SPELLING_MATCHER)
     if match
       letter_name, accidental_string, _octave = match.captures
       letter = HeadMusic::Letter.get(letter_name)
-      if letter
-        return new(letter, HeadMusic::Accidental.get(accidental_string))
-      end
+      new(letter, HeadMusic::Accidental.get(accidental_string)) if letter
     end
   end
 
   def self.from_number(number)
     return nil unless number == number.to_i
-    pitch_class_number = number % 12
+    pitch_class_number = number.to_i % 12
     letter = HeadMusic::Letter.from_pitch_class(pitch_class_number)
     if letter.pitch_class != pitch_class_number
       accidental = HeadMusic::Accidental.for_interval(pitch_class_number - letter.pitch_class.to_i)

data/lib/head_music/version.rb

@@ -1,3 +1,3 @@
 module HeadMusic
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

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