head_music 2.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2b4bf3672dec05430ee66153014df39ebd585bdfe683d1269d31f32fb2b6c13
-  data.tar.gz: 4516d7312a57ff182e33620dfb1169761f0d2fe2030979379ecf2412144ca101
+  metadata.gz: 907af3d8bc6ce8aa6190c98cb809824c3ff2fc6fe3e9de78f895c08f3212b10c
+  data.tar.gz: e127bfa17bf001311947ab70471e0be132aaa2ecd83d9f0c539154060bd97252
 SHA512:
-  metadata.gz: 6219c398ddbdf7245fee263e916d299ae518b158883761fb7e89894808fa91142008f66c883007d715625d150806b520cab3e3418d87b955e02d4862c03ad3c8
-  data.tar.gz: 6c67afe62906e12ea8b4c91e2ef27ed99d41b3c501d2999369ed6cd5df9430c9ac5fec4fa1c33d9d1e4b2399930ca0fadcdac4bcbd4842ec433aa1477aaf824d
+  metadata.gz: e63258caae492d8668163f1444eed7c4a0e92a5fa07ff7cf4c6b1fd2439430b82b6589f31aa26116ff10d92f4ee5b89fb4e37ae271460f5b89ae8f3ad2ab9b03
+  data.tar.gz: '005495aca86e5e8869b3a90d37412b966c0b62395470b527942faf9cde3531eca35d9c7e26a1f4b0301ba93adf899c81b7ff2b42512681ae9994d87b4e7b04ce'

data/Gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-ruby "3.1.4"
+ruby "3.2.2"
 
 # Specify your gem's dependencies in head_music.gemspec
 gemspec

data/head_music.gemspec

@@ -22,13 +22,14 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.5"
+  spec.required_ruby_version = ">= 3.0"
+
+  spec.add_runtime_dependency "activesupport", "~> 5.0", "> 5.0"
 
-  spec.add_runtime_dependency "activesupport", "> 5.0"
   spec.add_runtime_dependency "humanize", "~> 1.3"
   spec.add_runtime_dependency "i18n", "~> 1.8"
 
-  spec.add_development_dependency "rake", ">= 12.3.3"
+  spec.add_development_dependency "rake", "~> 12.3", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rspec-its", "~> 1.2"
 end

data/lib/head_music/data/instruments.yml

@@ -3,7 +3,7 @@ accordian:
   family_key: accordion
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
         - clef: bass
 alto_clarinet:
@@ -12,7 +12,7 @@ alto_clarinet:
   family_key: clarinet
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
           transposition: -9
 alto_flute:
@@ -21,7 +21,7 @@ alto_flute:
   family_key: flute
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
           transposition: -5
 alto_voice:
@@ -31,7 +31,7 @@ alto_voice:
   family_key: voice
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
   range_category:
     - alto
@@ -42,7 +42,7 @@ arpeggione:
     - string
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
           transposition: -12
   orchestra_section: string
@@ -53,7 +53,7 @@ great_highland_bagpipe:
   family_key: bagpipe
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
           transposition: 1
 banjo:
@@ -64,7 +64,7 @@ banjo:
   orchestra_section: string
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
           transposition: -12
 baritone_horn:
@@ -73,18 +73,18 @@ baritone_horn:
   family_key: saxhorn
   notation:
     alternates:
-      - staffs:
+      - staves:
           - clef: treble
             transposition: -14
     default:
-      staffs:
+      staves:
         - clef: bass
           transposition: 0
 baritone_voice:
   family_key: voice
   notation:
     default:
-      staffs:
+      staves:
         - clef: bass
   range_category:
     - baritone
@@ -94,11 +94,11 @@ bass_clarinet:
   family_key: clarinet
   notation:
     alternates:
-      - staffs:
+      - staves:
           - clef: bass
             transposition: -2
     default:
-      staffs:
+      staves:
         - clef: treble
           transposition: -14
 bass_drum:
@@ -107,14 +107,14 @@ bass_drum:
     - membranophone
   notation:
     default:
-      staffs:
+      staves:
         - clef: percussion
   orchestra_section: percussion
 bass_guitar:
   family_key: guitar
   notation:
     default:
-      staffs:
+      staves:
         - clef: bass
           transposition: -12
 bass_oboe:
@@ -123,7 +123,7 @@ bass_oboe:
   family_key: oboe
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
 bass_trombone:
   fundamental_pitch_spelling:
@@ -131,7 +131,7 @@ bass_trombone:
   family_key: trombone
   notation:
     default:
-      staffs:
+      staves:
         - clef: bass
 bass_trumpet_in_b_flat:
   alias_name_keys:
@@ -141,7 +141,7 @@ bass_trumpet_in_b_flat:
   family_key: trumpet
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
           transposition: -14
 bass_trumpet_in_c:
@@ -152,7 +152,7 @@ bass_trumpet_in_c:
   family_key: trumpet
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
           transposition: -12
 bass_trumpet_in_e_flat:
@@ -161,7 +161,7 @@ bass_trumpet_in_e_flat:
   family_key: trumpet
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
           transposition: -9
 bass_tuba_in_e_flat:
@@ -172,7 +172,7 @@ bass_tuba_in_e_flat:
   family_key: tuba
   notation:
     default:
-      staffs:
+      staves:
         - clef: bass
 bass_tuba_in_f:
   alias_name_keys:
@@ -182,13 +182,13 @@ bass_tuba_in_f:
   family_key: tuba
   notation:
     default:
-      staffs:
+      staves:
         - clef: bass
 bass_voice:
   family_key: voice
   notation:
     default:
-      staffs:
+      staves:
         - clef: bass
   range_category:
     - bass
@@ -198,7 +198,7 @@ basset_horn:
   family_key: clarinet
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
           transposition: -7
 bassoon:
@@ -207,7 +207,7 @@ bassoon:
   family_key: bassoon
   notation:
     default:
-      staffs:
+      staves:
         - clef: bass
 bugle:
   fundamental_pitch_spelling:
@@ -215,7 +215,7 @@ bugle:
   family_key: trumpet
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
           transposition: -5
 bugle_in_b_flat:
@@ -224,7 +224,7 @@ bugle_in_b_flat:
   family_key: trumpet
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
           transposition: -2
 castanets:
@@ -233,7 +233,7 @@ castanets:
     - idiophone
   notation:
     default:
-      staffs:
+      staves:
         - clef: percussion
   orchestra_section: percussion
 celesta:
@@ -243,7 +243,7 @@ celesta:
     - idiophone
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
           name_key: right_hand
         - clef: bass
@@ -255,7 +255,7 @@ cello:
   family_key: violin
   notation:
     default:
-      staffs:
+      staves:
         - clef: bass
 chimes:
   alias_name_keys:
@@ -266,7 +266,7 @@ chimes:
     - idiophone
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
   orchestra_section: percussion
 cimbalom:
@@ -277,7 +277,7 @@ cimbalom:
     - plucked
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
         - clef: bass
   orchestra_section: string
@@ -289,7 +289,7 @@ clarinet:
   family_key: clarinet
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
           transposition: -2
 clarinet_in_a:
@@ -300,7 +300,7 @@ clarinet_in_a:
   family_key: clarinet
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
           transposition: -3
 clarinet_in_c:
@@ -311,7 +311,7 @@ clarinet_in_c:
   family_key: clarinet
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
           transposition: 0
 clarinet_in_d:
@@ -322,7 +322,7 @@ clarinet_in_d:
   family_key: clarinet
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
           transposition: 2
 clarinet_in_e_flat:
@@ -333,19 +333,19 @@ clarinet_in_e_flat:
   family_key: clarinet
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
           transposition: 3
 clash_cymbals:
   family_key: cymbal
   notation:
     default:
-      staffs:
+      staves:
         - clef: percussion
 clavichord:
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
           name_key: right_hand
         - clef: bass
@@ -356,14 +356,14 @@ contrabass_clarinet:
   family_key: clarinet
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
           transposition: -26
 contrabassoon:
   family_key: bassoon
   notation:
     default:
-      staffs:
+      staves:
         - clef: bass
           transposition: -12
 cor_anglais:
@@ -372,7 +372,7 @@ cor_anglais:
   family_key: oboe
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
           transposition: -7
 cornet:
@@ -381,14 +381,14 @@ cornet:
   family_key: cornet
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
           transposition: -2
 countertenor_voice:
   family_key: voice
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
   range_category:
     - alto
@@ -398,7 +398,7 @@ cowbell:
     - idiophone
   notation:
     default:
-      staffs:
+      staves:
         - clef: percussion
   orchestra_section: percussion
 crotales:
@@ -407,14 +407,14 @@ crotales:
     - idiophone
   notation:
     default:
-      staffs:
+      staves:
         - clef: percussion
   orchestra_section: percussion
 cymbal:
   family_key: cymbal
   notation:
     default:
-      staffs:
+      staves:
         - clef: percussion
 double_bass:
   alias_name_keys:
@@ -422,7 +422,7 @@ double_bass:
     - string_bass
   notation:
     default:
-      staffs:
+      staves:
         - clef: bass
           transposition: -12
 euphonium:
@@ -434,11 +434,11 @@ euphonium:
     - wind
   notation:
     alternates:
-      - staffs:
+      - staves:
           - clef: treble
             transposition: -14
     default:
-      staffs:
+      staves:
         - clef: bass
           transposition: 0
   orchestra_section: brass
@@ -448,14 +448,14 @@ flugelhorn:
   family_key: saxhorn
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
           transposition: -2
 flute:
   family_key: flute
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
 french_horn:
   alias_name_keys:
@@ -465,11 +465,11 @@ french_horn:
   family_key: horn
   notation:
     alternates:
-      - staffs:
+      - staves:
           - clef: bass
             transposition: 5
     default:
-      staffs:
+      staves:
         - clef: treble
           transposition: -7
 glockenspiel:
@@ -482,7 +482,7 @@ guitar:
   family_key: guitar
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
           transposition: -12
 hammered_dulcimer:
@@ -492,20 +492,20 @@ hammered_dulcimer:
     - string
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
   orchestra_section: percussion
 harp:
   family_key: harp
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
         - clef: bass
 harpsichord:
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
           name_key: right_hand
         - clef: bass
@@ -514,17 +514,17 @@ lute:
   family_key: lute
   notation:
     alternates:
-      - staffs:
+      - staves:
           - clef: treble
     default:
-      staffs:
+      staves:
         - clef: treble
         - clef: bass
 mandolin:
   family_key: mandolin
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
 maracas:
   classification_keys:
@@ -533,14 +533,14 @@ maracas:
     - idiophone
   notation:
     default:
-      staffs:
+      staves:
         - clef: percussion
   orchestra_section: percussion
 marimba:
   family_key: marimba
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
         - clef: bass
 mezzo_soprano_voice:
@@ -549,7 +549,7 @@ mezzo_soprano_voice:
   family_key: voice
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
   range_category:
     - mezzo_soprano
@@ -557,13 +557,13 @@ natural_horn:
   family_key: horn
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
 oboe:
   family_key: oboe
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
 oboe_d_amore:
   alias_name_keys:
@@ -571,7 +571,7 @@ oboe_d_amore:
   family_key: oboe
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
           transposition: -3
 organ:
@@ -580,13 +580,13 @@ organ:
   family_key: organ
   notation:
     alternates:
-      - staffs:
+      - staves:
           - clef: treble
             name_key: right_hand
           - clef: treble
             name_key: left_hand
     default:
-      staffs:
+      staves:
         - clef: treble
           name_key: right_hand
         - clef: bass
@@ -600,7 +600,7 @@ piano:
   family_key: piano
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
           name_key: right_hand
         - clef: bass
@@ -611,7 +611,7 @@ piccolo_clarinet:
   family_key: clarinet
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
           transposition: 8
 piccolo_flute:
@@ -620,7 +620,7 @@ piccolo_flute:
   family_key: flute
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
           transposition: 12
 piccolo_trumpet:
@@ -630,20 +630,20 @@ piccolo_trumpet:
   family_key: trumpet
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
           transposition: 10
 recorder:
   family_key: recorder
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
 saxophone:
   family_key: saxophone
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
 snare_drum:
   alias_name_keys:
@@ -654,7 +654,7 @@ snare_drum:
   family_key: snare_drum
   notation:
     default:
-      staffs:
+      staves:
         - clef: percussion
 soprano_voice:
   alias_name_keys:
@@ -662,7 +662,7 @@ soprano_voice:
   family_key: voice
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
   range_category:
     - soprano
@@ -672,20 +672,20 @@ sousaphone:
   family_key: tuba
   notation:
     default:
-      staffs:
+      staves:
         - clef: bass
   transposition: 0
 suspended_cymbal:
   family_key: cymbal
   notation:
     default:
-      staffs:
+      staves:
         - clef: percussion
 synthesizer:
   family_key: synthesizer
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
           name_key: right_hand
         - clef: bass
@@ -697,7 +697,7 @@ tam_tam:
   family_key: gong
   notation:
     default:
-      staffs:
+      staves:
         - clef: percussion
 tambourine:
   classification_keys:
@@ -707,14 +707,14 @@ tambourine:
     - membranophone
   notation:
     default:
-      staffs:
+      staves:
         - clef: percussion
   orchestra_section: percussion
 temple_blocks:
   family_key: woodblock
   notation:
     default:
-      staffs:
+      staves:
         - clef: percussion
 tenor_drum:
   classification_keys:
@@ -723,22 +723,22 @@ tenor_drum:
     - membranophone
   notation:
     default:
-      staffs:
+      staves:
         - clef: percussion
   orchestra_section: percussion
 tenor_voice:
   family_key: voice
   notation:
     alternates:
-      - staffs:
+      - staves:
           - clef: bass
-      - staffs:
+      - staves:
           - clef: treble
             transposition: -12
-      - staffs:
+      - staves:
           - clef: tenor
     default:
-      staffs:
+      staves:
         - clef: vocal_tenor
           transposition: -12
   range_category:
@@ -750,7 +750,7 @@ timpani:
   family_key: kettledrum
   notation:
     default:
-      staffs:
+      staves:
         - clef: percussion
 triangle:
   classification_keys:
@@ -759,7 +759,7 @@ triangle:
     - idiophone
   notation:
     default:
-      staffs:
+      staves:
         - clef: percussion
   orchestra_section: percussion
 trombone:
@@ -770,7 +770,7 @@ trombone:
   family_key: trombone
   notation:
     default:
-      staffs:
+      staves:
         - clef: bass
 trumpet:
   fundamental_pitch_spelling:
@@ -778,7 +778,7 @@ trumpet:
   family_key: trumpet
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
           transposition: -2
 trumpet_in_c:
@@ -787,7 +787,7 @@ trumpet_in_c:
   family_key: trumpet
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
           transposition: 0
 trumpet_in_d:
@@ -796,7 +796,7 @@ trumpet_in_d:
   family_key: trumpet
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
           transposition: 2
 trumpet_in_e_flat:
@@ -805,7 +805,7 @@ trumpet_in_e_flat:
   family_key: trumpet
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
           transposition: 3
 tuba:
@@ -816,7 +816,7 @@ tuba:
   family_key: tuba
   notation:
     default:
-      staffs:
+      staves:
         - clef: bass
 tuba_in_c:
   alias_name_keys:
@@ -826,7 +826,7 @@ tuba_in_c:
   family_key: tuba
   notation:
     default:
-      staffs:
+      staves:
         - clef: bass
 vibraphone:
   alias_name_keys:
@@ -834,13 +834,13 @@ vibraphone:
   family_key: vibraphone
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
 viola:
   family_key: violin
   notation:
     default:
-      staffs:
+      staves:
         - clef: alto
 violin:
   alias_name_keys:
@@ -848,17 +848,17 @@ violin:
   family_key: violin
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble
 woodblock:
   family_key: woodblock
   notation:
     default:
-      staffs:
+      staves:
         - clef: percussion
 xylophone:
   family_key: xylophone
   notation:
     default:
-      staffs:
+      staves:
         - clef: treble

data/lib/head_music/instrument.rb

@@ -14,7 +14,7 @@
 #     - [treble, bass] for instruments that use the grand staff
 #   notation:
 #     a hash of default and alternative notation systems,
-#     each with a staffs key with an array of hashes
+#     each with a staff's key with an array of hashes
 #     including clef and transposition (where applicable)
 # Associations:
 #   family: the family of the instrument (e.g. "saxophone")
@@ -40,7 +40,7 @@ class HeadMusic::Instrument
     :family_key, :orchestra_section_key,
     :notation, :classification_keys,
     :fundamental_pitch_spelling, :transposition,
-    :default_staffs, :default_clefs
+    :default_staves, :default_clefs
   )
 
   def ==(other)
@@ -70,11 +70,11 @@ class HeadMusic::Instrument
   end
 
   def single_staff?
-    default_staffs.length == 1
+    default_staves.length == 1
   end
 
-  def multiple_staffs?
-    default_staffs.length > 1
+  def multiple_staves?
+    default_staves.length > 1
   end
 
   def pitched?
@@ -147,9 +147,9 @@ class HeadMusic::Instrument
     @orchestra_section_key ||= record["orchestra_section_key"]
     @classification_keys = [@classification_keys, record["classification_keys"]].flatten.compact.uniq
     @fundamental_pitch_spelling = record["fundamental_pitch_spelling"]
-    @default_staffs = (record.dig("notation", "default", "staffs") || [])
-    @default_clefs = @default_staffs.map { |staff| staff["clef"] }
-    @transposition = @default_staffs&.first&.[]("transposition") || 0
+    @default_staves = (record.dig("notation", "default", "staves") || [])
+    @default_clefs = @default_staves.map { |staff| staff["clef"] }
+    @transposition = @default_staves&.first&.[]("transposition") || 0
   end
 
   def inferred_name

data/lib/head_music/instrument_family.rb

@@ -8,7 +8,7 @@ class HeadMusic::InstrumentFamily
   INSTRUMENT_FAMILIES =
     YAML.load_file(File.expand_path("data/instrument_families.yml", __dir__)).freeze
 
-  attr_reader :name_key, :classification_keys, :orchestra_section_key, :default_staffs
+  attr_reader :name_key, :classification_keys, :orchestra_section_key
   attr_accessor :name
 
   def self.get(name)

data/lib/head_music/staff.rb

@@ -13,6 +13,6 @@ class HeadMusic::Staff
   end
 
   def clef
-    default_clef || instrument&.default_staffs&.first
+    default_clef || instrument&.default_staves&.first&.clef
   end
 end

data/lib/head_music/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HeadMusic
-  VERSION = "2.0.1"
+  VERSION = "3.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: head_music
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Rob Head
@@ -14,6 +14,9 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
     - - ">"
       - !ruby/object:Gem::Version
         version: '5.0'
@@ -21,6 +24,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
     - - ">"
       - !ruby/object:Gem::Version
         version: '5.0'
@@ -56,6 +62,9 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 12.3.3
@@ -63,6 +72,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 12.3.3
@@ -118,6 +130,7 @@ files:
 - TODO.md
 - bin/console
 - bin/setup
+- head_music-2.0.1.gem
 - head_music.gemspec
 - lib/head_music.rb
 - lib/head_music/chromatic_interval.rb
@@ -228,7 +241,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="