head_music 6.0.0 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee7c3b6377d30fa88d3f9e7f5b5450bf0664c65b4559ba6fccaf79d19ef3cfcf
-  data.tar.gz: 56ec218fb604b9c1c2fe3a6c2935a1157340afc0a23f3cb882ad9dd9980f1bcd
+  metadata.gz: 5329e3d4233738556d545c62cf0c721f42f8736aa483f58b80a6812318af0aa7
+  data.tar.gz: 5267548a7f4be05a8a3cbd76354ac1d6cc501475c235b0b5626a725be7f136a1
 SHA512:
-  metadata.gz: 6c8b2afd59aae59bcd88a8d67aa1662e79d6086166da1588bdf502a720fb471b2c55b3b6ada13eb7f09e998cd8b8c8408ec4888303d0edd9cdf09accc64c92ed
-  data.tar.gz: 4076e9b2b22c369f6f7e08bd202cf333d54c410df206bcc0d06417a68142be232ef58fe174aae627922e5a5ef993a9f247e706d23c17cce0f927b49198f3b987
+  metadata.gz: 0d90ef9a5432dc7fe68584f6ecccf7b2441aaaf756f5c19555fed48e8bb1f68a5bf0bf124500189f7f4366d62b0901e8910f07e3ed2a7ba43a47e6dddbf9df61
+  data.tar.gz: c9787b84e779684e2a807ff9af4bdc4bc98a7eafda0512c1d1beb0c0ab9034a7c28b551983ca914f2b6b364ba968b696086762777c3d58682f76577f811daee0

data/.rubocop.yml

@@ -25,5 +25,8 @@ RSpec/ContextWording:
     - for
     - by
 
+RSpec/MultipleExpectations:
+  Enabled: false
+
 RSpec/NestedGroups:
-  Max: 4
+  Max: 5

data/lib/head_music/consonance.rb

@@ -9,7 +9,7 @@ class HeadMusic::Consonance
 
   attr_reader :name
 
-  delegate :to_s, to: :name
+  delegate :to_s, :to_sym, to: :name
 
   def initialize(name)
     @name = name.to_s.to_sym

data/lib/head_music/content/composition.rb

@@ -46,7 +46,7 @@ class HeadMusic::Content::Composition
   end
 
   def latest_bar_number
-    [voices.map(&:earliest_bar_number), 1].flatten.max
+    [voices.map(&:latest_bar_number), 1].flatten.max
   end
 
   def cantus_firmus_voice
@@ -58,7 +58,7 @@ class HeadMusic::Content::Composition
   end
 
   def to_s
-    "#{name} — #{voices.count} voice(s)"
+    "#{name} — #{voices.count} #{voices.count == 1 ? 'voice' : 'voices'}"
   end
 
   private
@@ -71,6 +71,7 @@ class HeadMusic::Content::Composition
   end
 
   def last_meter_change(bar_number)
+    bar_number = [bar_number, earliest_bar_number].max
     bars(bar_number)[earliest_bar_number..bar_number].reverse.detect(&:meter)
   end
 

data/lib/head_music/content/position.rb

@@ -27,10 +27,6 @@ class HeadMusic::Content::Position
     [bar_number, count, tick_string].join(":")
   end
 
-  def state
-    [composition.name, code].join(" ")
-  end
-
   def values
     [bar_number, count, tick]
   end

data/lib/head_music/content/voice.rb

@@ -105,7 +105,9 @@ class HeadMusic::Content::Voice
   end
 
   def to_s
-    "#{role}: #{pitches.first(10).map(&:to_s)}"
+    return pitches_string if role.to_s.strip == ""
+
+    [role, pitches_string].join(": ")
   end
 
   private
@@ -114,4 +116,8 @@ class HeadMusic::Content::Voice
     @placements << placement
     @placements = @placements.sort
   end
+
+  def pitches_string
+    pitches.first(10).map(&:to_s).join(" ")
+  end
 end