head_music 0.23.1 → 0.23.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5df85a8374d61221a2217a55bc0766bbfde35a5040768353f8d006f53755acff
-  data.tar.gz: 9d749a3a8def07c981019ba936a2718a2c3a89e661ab945437223e902df830f2
+  metadata.gz: bb1e01b3119838d06ece395586b5ba1a83d8b432f01d6bc63dfbea324f48be1c
+  data.tar.gz: 3f6ac1484a66455949d27fe1af7b53e7becdfddaf66093e151d89ad31b31ffa5
 SHA512:
-  metadata.gz: 6e58ad0dd9dcb2358195aa47a59801eaae763a5c27926088318308b37c7b86ec0edc3cb0b14ffb314661209a4d7c652c5f8826c663c1f80f781e1933b3ac452a
-  data.tar.gz: a9deabf2b150cb062a617c9439094d4328a8c5fb0b390d915b73205fe226b82f3b96fe57c4eb542f29c23c62484e2513e0a68366840ac677660b38991975dabc
+  metadata.gz: fa9f404bd1a24082020cf72d0daef7ac68f3b954ab692fec5b3c1f23ecb3a913786550127a9de543b8f88aa0a3370e3c321867cf453ab26cca3cf98ee5b81bfb
+  data.tar.gz: '08bae5514fb6dc84f35cbaf44b16e8ab001688e379a640c462769e950193fb9b1361a018ef29d8a048e256de535a71fe3796336511f65b6cc6fbad40ab1d9209'

data/.rubocop.yml

@@ -13,12 +13,21 @@ Metrics/ClassLength:
 Metrics/LineLength:
   Max: 120
 
-Style/SymbolArray:
-  Enabled: true
-
 Style/ClassAndModuleChildren:
   EnforcedStyle: compact
 
+Style/HashEachMethods:
+  Enabled: false
+
+Style/HashTransformKeys:
+  Enabled: false
+
+Style/HashTransformValues:
+  Enabled: false
+
+Style/SymbolArray:
+  Enabled: true
+
 Style/TrailingCommaInArrayLiteral:
   EnforcedStyleForMultiline: consistent_comma
 
@@ -26,7 +35,7 @@ Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: consistent_comma
 
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.4
 
 Layout/EmptyLineAfterGuardClause:
   Enabled: false

data/Gemfile

@@ -9,7 +9,7 @@ gemspec
 
 group :test do
   gem 'codeclimate-test-reporter', '~> 1.0.0'
-  gem 'rubocop', '>= 0.56.0', require: false
+  gem 'rubocop', '>= 0.80.0', require: false
   gem 'rubocop-rspec', require: false
   gem 'simplecov'
 end

data/head_music.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'humanize', '~> 1.3'
 
   spec.add_development_dependency 'bundler', '~> 1.13'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec-its', '~> 1.2'
 end

data/lib/head_music/circle.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
+require 'head_music/interval_cycle'
+
 # A Circle of Fifths or Fourths shows relationships between pitch classes
-# TODO: Replace or empower with IntervalCycle (?)
-# https://en.wikipedia.org/wiki/Interval_cycle
-class HeadMusic::Circle
+class HeadMusic::Circle < HeadMusic::IntervalCycle
   def self.of_fifths
     get(7)
   end
@@ -19,6 +19,7 @@ class HeadMusic::Circle
 
   attr_reader :interval, :pitch_classes
 
+  # Accepts an interval (as an integer number of semitones)
   def initialize(interval)
     @interval = interval.to_i
     @pitch_classes = pitch_classes_by_interval
@@ -32,14 +33,11 @@ class HeadMusic::Circle
 
   private
 
+  def interval_cycle
+    @interval_cycle ||= HeadMusic::IntervalCycle.get(interval)
+  end
+
   def pitch_classes_by_interval
-    [HeadMusic::PitchClass.get(0)].tap do |list|
-      loop do
-        next_pitch_class = list.last + interval
-        break if next_pitch_class == list.first
-
-        list << next_pitch_class
-      end
-    end
+    interval_cycle.send(:pitch_classes_by_interval)
   end
 end

data/lib/head_music/clef.rb

@@ -5,17 +5,17 @@ class HeadMusic::Clef
   include HeadMusic::NamedRudiment
 
   CLEFS = [
-    { pitch: 'G4', line: 2, names: ['treble', 'G-clef'], modern: true },
+    { pitch: 'G4', line: 2, names: %w[treble G-clef], modern: true },
     { pitch: 'G4', line: 1, names: ['French', 'French violin'] },
     { pitch: 'G3', line: 2, names: ['choral tenor', 'tenor', 'tenor G-clef'], modern: true },
 
     { pitch: 'F3', line: 3, names: ['baritone'] },
-    { pitch: 'F3', line: 4, names: ['bass', 'F-clef'], modern: true },
+    { pitch: 'F3', line: 4, names: %w[bass F-clef], modern: true },
     { pitch: 'F3', line: 5, names: ['sub-bass'] },
 
     { pitch: 'C4', line: 1, names: ['soprano'] },
     { pitch: 'C4', line: 2, names: ['mezzo-soprano'] },
-    { pitch: 'C4', line: 3, names: ['alto', 'viola', 'counter-tenor', 'countertenor', 'C-clef'], modern: true },
+    { pitch: 'C4', line: 3, names: %w[alto viola counter-tenor countertenor C-clef], modern: true },
     { pitch: 'C4', line: 4, names: ['tenor', 'tenor C-clef'], modern: true },
     { pitch: 'C4', line: 5, names: ['baritone', 'baritone C-clef'] },
 

data/lib/head_music/diatonic_interval.rb

@@ -340,6 +340,14 @@ class HeadMusic::DiatonicInterval
     HeadMusic::Pitch.from_number_and_letter(pitch - semitones, pitch.letter_name.steps_down(number - 1))
   end
 
+  def interval_class
+    [simple_semitones, 12 - simple_semitones].min
+  end
+
+  def interval_class_name
+    "ic #{interval_class}"
+  end
+
   # diatonic set theory
   alias specific_interval simple_semitones
   alias diatonic_generic_interval simple_steps

data/lib/head_music/interval_cycle.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+# An Interval Cycle is a collection of pitch classes created from a sequence of the same interval class.
+class HeadMusic::IntervalCycle
+  def self.get(interval = 7)
+    @circles ||= {}
+    interval = interval.to_s.gsub(/^C/i, '').to_i
+    @circles[interval.to_i] ||= new(interval)
+  end
+
+  attr_reader :interval, :pitch_classes
+
+  def initialize(interval)
+    @interval = interval.to_i
+    @pitch_classes = pitch_classes_by_interval
+  end
+
+  def index(pitch_class)
+    @pitch_classes.index(HeadMusic::Spelling.get(pitch_class).pitch_class)
+  end
+
+  private_class_method :new
+
+  private
+
+  def pitch_classes_by_interval
+    [HeadMusic::PitchClass.get(0)].tap do |list|
+      loop do
+        next_pitch_class = list.last + interval
+        break if next_pitch_class == list.first
+
+        list << next_pitch_class
+      end
+    end
+  end
+end

data/lib/head_music/musical_symbol.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+# A symbol is a mark or sign that signifies a particular rudiment of music
+class HeadMusic::Symbol
+  attr_reader :ascii, :unicode, :html_entity
+
+  def initialize(ascii: nil, unicode: nil, html_entity: nil)
+    @ascii = ascii
+    @unicode = unicode
+    @html_entity = html_entity
+  end
+end

data/lib/head_music/reference_pitch.rb

@@ -67,7 +67,7 @@ class HeadMusic::ReferencePitch
       pitch.letter_name,
       format(
         '%<with_digits>g',
-        with_digits: format('%.2f', frequency)
+        with_digits: format('%.2<frequency>f', frequency: frequency)
       ),
     ].join('=')
   end

data/lib/head_music/sign.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
+require 'head_music/musical_symbol'
+
 # A Sign is a symbol that modifies pitch, such as a sharp, flat, or natural.
 class HeadMusic::Sign
   include Comparable
 
-  attr_reader :identifier, :ascii, :unicode, :html_entity, :cents
+  attr_reader :identifier, :cents, :symbol
 
   def self.all
     @all ||= [
@@ -64,14 +66,19 @@ class HeadMusic::Sign
     cents <=> other.cents
   end
 
+  delegate :ascii, :html_entity, :unicode, to: :symbol
+
   private
 
   def initialize(attributes)
     @identifier = attributes[:identifier]
-    @ascii = attributes[:ascii]
-    @unicode = attributes[:unicode]
-    @html_entity = attributes[:html_entity]
     @cents = attributes[:cents]
+
+    @symbol = HeadMusic::Symbol.new(
+      unicode: attributes[:unicode],
+      ascii: attributes[:ascii],
+      html_entity: attributes[:html_entity]
+    )
   end
 
   private_class_method :new

data/lib/head_music/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HeadMusic
-  VERSION = '0.23.1'
+  VERSION = '0.23.2'
 end

data/lib/head_music.rb

@@ -28,11 +28,13 @@ require 'head_music/diatonic_interval'
 require 'head_music/grand_staff'
 require 'head_music/harmonic_interval'
 require 'head_music/instrument'
+require 'head_music/interval_cycle'
 require 'head_music/key_signature'
 require 'head_music/letter_name'
 require 'head_music/melodic_interval'
 require 'head_music/meter'
 require 'head_music/motion'
+require 'head_music/musical_symbol'
 require 'head_music/octave'
 require 'head_music/pitch'
 require 'head_music/pitch/enharmonic_equivalence'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: head_music
 version: !ruby/object:Gem::Version
-  version: 0.23.1
+  version: 0.23.2
 platform: ruby
 authors:
 - Rob Head
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2020-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -56,16 +56,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -135,11 +135,13 @@ files:
 - lib/head_music/grand_staff.rb
 - lib/head_music/harmonic_interval.rb
 - lib/head_music/instrument.rb
+- lib/head_music/interval_cycle.rb
 - lib/head_music/key_signature.rb
 - lib/head_music/letter_name.rb
 - lib/head_music/melodic_interval.rb
 - lib/head_music/meter.rb
 - lib/head_music/motion.rb
+- lib/head_music/musical_symbol.rb
 - lib/head_music/named_rudiment.rb
 - lib/head_music/octave.rb
 - lib/head_music/pitch.rb