beats 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 386d1a9b9e83c848b2f9ae9c802f1ce9c717c99a
-  data.tar.gz: 287a1390bed816c4bcf65bb5749af04297d8bfd9
+  metadata.gz: b76857d49851dc03ef574dadcbbc01aff5aaea9f
+  data.tar.gz: df598d61cfaa1a0ecb8f1bd493dc8b1f0436869e
 SHA512:
-  metadata.gz: dd8197163c74429d9e1ba1c5ded23af90f423ac48702e085732c5476e788064f497854d585da512f0babd1fb2ad85119fa21caea591e821105e4133cfa8ab443
-  data.tar.gz: 24f11590f134ee21e801d463c6be28334f009ab2da5294b27aa23af2db7ab27550817a61a6db1c3b699ae821e351f1c892da2f2644252ed2bd8faebe4f908236
+  metadata.gz: 59bd59d74a085c9d60c0f4584a9a6704c58aa05e4856d24884e4e5de622e578cd9e7a1a47edb35e172b8b1ff2f67c0386b7d99db238dcaf11d3f366a57ec42d7
+  data.tar.gz: 7ab6c3283977bcda76772ae287e67d2d120fdd8623fe777364dfc70bd6a1250b3c50e96bec6e047d7da199dd6ec6877b02cbf4e0b7d9009a480becdf92498656

data/README.markdown

@@ -35,7 +35,7 @@ For more, check out [beatsdrummachine.com](http://beatsdrummachine.com)
 Installation
 ------------
 
-To install the latest stable version (2.0.0) from [rubygems.org](http://rubygems.org/gems/beats), run the following from the command line:
+To install the latest stable version (2.1.0) from [rubygems.org](http://rubygems.org/gems/beats), run the following from the command line:
 
     gem install beats
 
@@ -57,7 +57,72 @@ Check out [this tutorial at beatsdrummachine.com](http://beatsdrummachine.com/tu
 What's New
 ----------
 
-The latest stable version of Beats is 2.0.0, released on September 4, 2017. It is primarily a modernization release, and contains some relatively small backwards incompatible changes.
+The latest version of Beats is 2.1.0, released on September 9, 2017.
+
+This version adds support for *composite sounds*. That is, sounds that are made by combining two or more sounds together. They are a more succinct way of writing songs where multiple tracks play the same rhythm.
+
+Composite sounds can be defined in the Kit by putting multiple sound files in an array:
+
+    Kit:
+      - bass:         bass.wav                    # A traditional non-composite sound
+      - combo_snare:  [clap.wav, 808_snare.wav]   # A composite sound
+
+The `combo_snare` sound above is a composite sound made by combining `clap.wav` and `808_snare.wav` together. It can then be used in a pattern:
+
+    Verse:
+      - bass:         X.......X.......
+      - combo_snare:  ....X.......X...
+
+This is equivalent to the following song:
+
+    Kit:
+      - bass:   bass.wav
+      - clap:   clap.wav
+      - snare:  808_snare.wav
+
+    Verse:
+      - bass:   X.......X.......
+      - clap:   ....X.......X...
+      - snare:  ....X.......X...
+
+When using the `-s` command-line option to write each track to its own *.wav file, each sub-sound in a composite sound will be written to its own file. For example, this song:
+
+    Kit:
+      - combo_snare:  [clap.wav, 808_snare.wav]
+
+    Verse:
+      - combo_snare:  X...X...X...X...
+
+...will be written to two different files, `combo_snare-clap.wav` and `combo_snare-808_snare.wav`, when using the `-s` option.
+
+Finally, when defining a track in a pattern, multiple sounds can be given in an array as a composite sound. Kit sounds and non-Kit sounds can be used together:
+
+    Kit:
+      - bass:         bass.wav
+      - combo_snare:  [clap.wav, 808_snare.wav]
+
+    Verse:
+      - [bass, combo_snare, other_sound.wav]:   X...X...X...X...
+
+This is a equivalent to:
+
+    Kit:
+      - bass:   bass.wav
+      - clap:   clap.wav
+      - snare:  808_snare.wav
+
+    Verse:
+      - bass:             X...X...X...X...
+      - clap:             X...X...X...X...
+      - snare:            X...X...X...X...
+      - other_sound.wav:  X...X...X...X...
+
+
+
+What's Slightly Less New
+------------------------
+
+The previous version of Beats is 2.0.0, released on September 4, 2017. It is primarily a modernization release, and contains some relatively small backwards incompatible changes.
 
 * Track rhythms can now have spaces in them. For example, `X... .... X... ....` is now a valid rhythm. Spaces are ignored, and don't affect the rhythm. For example, `X...    X...` is treated as the same rhythm as `X...X...`
 * Wave files using `WAVEFORMATEXTENSIBLE` format can now be used, due to upgrading the WaveFile gem dependency to v0.8.1 behind the scenes.

data/lib/beats.rb

@@ -11,5 +11,5 @@ require 'beats/track'
 require 'beats/transforms/song_swinger'
 
 module Beats
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

data/lib/beats/kit_builder.rb

@@ -14,10 +14,26 @@ module Beats
     def initialize(base_path)
       @base_path = base_path
       @labels_to_filenames = {}
+      @composite_replacements = {}
     end
 
-    def add_item(label, filename)
-      @labels_to_filenames[label] = absolute_file_name(filename)
+    def add_item(label, filenames)
+      if filenames.is_a?(Array)
+        if filenames.empty?
+          raise SoundFileNotFoundError, "Kit sound '#{label}' has an empty composite pattern (i.e. \"[]\"), which is not valid."
+        end
+
+        filenames.each do |filename|
+          unless filename.is_a?(String)
+            raise SoundFileNotFoundError, "The Kit sound '#{label}' contains an invalid file: '#{filename}'"
+          end
+          @labels_to_filenames["#{label}-#{File.basename(filename, ".*")}"] = absolute_file_name(filename)
+        end
+
+        @composite_replacements[label] = filenames.map {|filename| "#{label}-#{File.basename(filename, ".*")}" }
+      else
+        @labels_to_filenames[label] = absolute_file_name(filenames)
+      end
     end
 
     def has_label?(label)
@@ -45,6 +61,8 @@ module Beats
       Kit.new(labels_to_buffers, num_channels, BITS_PER_SAMPLE)
     end
 
+    attr_reader :composite_replacements
+
     private
 
     # Converts relative path into absolute path. Note that this will also handle

data/lib/beats/songoptimizer.rb

@@ -137,8 +137,7 @@ module Beats
       replacements = {}
 
       # Pattern names are sorted to ensure predictable pattern replacement. Makes tests easier to write.
-      # Sort function added manually because Ruby 1.8 doesn't know how to sort symbols...
-      pattern_names = patterns.keys.sort {|x, y| x.to_s <=> y.to_s }
+      pattern_names = patterns.keys.sort
 
       # Detect duplicates
       pattern_names.each do |pattern_name|

data/lib/beats/songparser.rb

@@ -11,11 +11,11 @@ module Beats
     NO_SONG_HEADER_ERROR_MSG =
   "Song must have a header. Here's an example:
 
-    Song:
-      Tempo: 120
-      Flow:
-        - Verse: x2
-        - Chorus: x2"
+  Song:
+    Tempo: 120
+    Flow:
+      - Verse: x2
+      - Chorus: x2"
 
     def initialize
     end
@@ -30,8 +30,9 @@ module Beats
       end
 
       song = Song.new
+      kit_builder = KitBuilder.new(base_path)
 
-      # 1.) Set tempo
+      # Set tempo
       begin
         unless raw_song_components[:tempo].nil?
           song.tempo = raw_song_components[:tempo]
@@ -40,26 +41,26 @@ module Beats
         raise ParseError, "#{detail}"
       end
 
-      # 2.) Build the kit
+      # Add sounds defined in the Kit section
       begin
-        kit = build_kit(base_path, raw_song_components[:kit], raw_song_components[:patterns])
+        add_kit_sounds_from_kit(kit_builder, raw_song_components[:kit])
       rescue KitBuilder::SoundFileNotFoundError => detail
         raise ParseError, "#{detail}"
       rescue KitBuilder::InvalidSoundFormatError => detail
         raise ParseError, "#{detail}"
       end
 
-      # 3.) Load patterns
-      add_patterns_to_song(song, raw_song_components[:patterns])
+      # Load patterns
+      add_patterns_to_song(song, kit_builder, raw_song_components[:patterns])
 
-      # 4.) Set flow
+      # Set flow
       if raw_song_components[:flow].nil?
         raise ParseError, "Song must have a Flow section in the header."
       else
         set_song_flow(song, raw_song_components[:flow])
       end
 
-      # 5.) Swing, if swing flag is set
+      # Swing, if swing flag is set
       if raw_song_components[:swing]
         begin
           song = Transforms::SongSwinger.transform(song, raw_song_components[:swing])
@@ -68,6 +69,16 @@ module Beats
         end
       end
 
+      # Build the final kit
+      begin
+        add_kit_sounds_from_patterns(kit_builder, song.patterns)
+        kit = kit_builder.build_kit
+      rescue KitBuilder::SoundFileNotFoundError => detail
+        raise ParseError, "#{detail}"
+      rescue KitBuilder::InvalidSoundFormatError => detail
+        raise ParseError, "#{detail}"
+      end
+
       return song, kit
     end
 
@@ -104,9 +115,7 @@ module Beats
       return raw_song_components
     end
 
-    def build_kit(base_path, raw_kit, raw_patterns)
-      kit_builder = KitBuilder.new(base_path)
-
+    def add_kit_sounds_from_kit(kit_builder, raw_kit)
       # Add sounds defined in the Kit section of the song header
       # Converts [{a=>1}, {b=>2}, {c=>3}] from raw YAML to {a=>1, b=>2, c=>3}
       # TODO: Raise error is same name is defined more than once in the Kit
@@ -115,45 +124,54 @@ module Beats
           kit_builder.add_item(kit_item.keys.first, kit_item.values.first)
         end
       end
+    end
 
+    def add_kit_sounds_from_patterns(kit_builder, patterns)
       # Add sounds not defined in Kit section, but used in individual tracks
-      raw_patterns.keys.each do |key|
-        track_list = raw_patterns[key]
-
-        unless track_list.nil?
-          track_list.each do |track_definition|
-            track_name = track_definition.keys.first
-            track_path = track_name
+      patterns.each do |pattern_name, pattern|
+        pattern.tracks.each do |track_name, track|
+          track_path = track.name
 
-            if !kit_builder.has_label?(track_name)
-              kit_builder.add_item(track_name, track_path)
-            end
+          if !kit_builder.has_label?(track.name)
+            kit_builder.add_item(track.name, track_path)
           end
         end
       end
-
-      kit_builder.build_kit
     end
 
-    def add_patterns_to_song(song, raw_patterns)
-      raw_patterns.keys.each do |key|
-        new_pattern = song.pattern key.to_sym
-
-        track_list = raw_patterns[key]
-
-        if track_list.nil?
+    def add_patterns_to_song(song, kit_builder, raw_patterns)
+      raw_patterns.each do |pattern_name, raw_tracks|
+        if raw_tracks.nil?
           # TODO: Use correct capitalization of pattern name in error message
           # TODO: Possibly allow if pattern not referenced in the Flow, or has 0 repeats?
-          raise ParseError, "Pattern '#{key}' has no tracks. It needs at least one."
+          raise ParseError, "Pattern '#{pattern_name}' has no tracks. It needs at least one."
         end
 
-        track_list.each do |track_definition|
-          track_name = track_definition.keys.first
+        new_pattern = song.pattern(pattern_name.to_sym)
+
+        raw_tracks.each do |raw_track|
+          track_names = raw_track.keys.first
+          rhythm = raw_track.values.first
 
           # Handle case where no track rhythm is specified (i.e. "- foo.wav:" instead of "- foo.wav: X.X.X.X.")
-          track_definition[track_name] ||= ""
+          rhythm = "" if rhythm.nil?
 
-          new_pattern.track track_name, track_definition[track_name]
+          track_names = Array(track_names)
+          if track_names.empty?
+            raise ParseError, "Pattern '#{pattern_name}' has an empty composite pattern (i.e. \"[]\"), which is not valid."
+          end
+
+          track_names.map! do |track_name|
+            unless track_name.is_a?(String)
+              raise ParseError, "'#{track_name}' in pattern '#{pattern_name}' is not a valid track sound"
+            end
+            kit_builder.composite_replacements[track_name] || track_name
+          end
+          track_names.flatten!
+
+          track_names.each do |track_name|
+            new_pattern.track track_name, rhythm
+          end
         end
       end
     end

data/test/fixtures/invalid/kit_with_composite_empty_sound.txt

@@ -0,0 +1,16 @@
+Song:
+  Tempo: 100
+  Kit:
+    - bass:   test/sounds/bass_mono_8.wav
+    - snare:  test/sounds/snare_mono_8.wav
+    - hihat:  []   # Empty composite sounds aren't allowed
+  Flow:
+    - Verse:  x2
+    - Chorus: x2
+
+Verse:
+  - bass:    X...X...
+  - snare:   ..X...X.
+Chorus:
+  - bass:    XXXXXXXX
+  - hihat:   .X.X.X.X

data/test/fixtures/invalid/kit_with_composite_nested_sounds.txt

@@ -0,0 +1,16 @@
+Song:
+  Tempo: 100
+  Kit:
+    - bass:      test/sounds/bass_mono_8.wav
+    - snare:     test/sounds/snare_mono_8.wav
+    - hh_closed: [test/sounds/hh_closed_mono_8.wav, [test/sounds/hh_open_mono_8.wav]]
+  Flow:
+    - Verse:  x2
+    - Chorus: x2
+
+Verse:
+  - bass:   X...X...
+  - snare:  ..X...X.
+Chorus:
+  - bass:       XXXXXXXX
+  - hh_closed:  .X.X.X.X

data/test/fixtures/invalid/kit_with_composite_non_existent_sound.txt

@@ -0,0 +1,17 @@
+Song:
+  Tempo: 100
+  Kit:
+    - bass:   test/sounds/bass_mono_8.wav
+    - snare:  test/sounds/snare_mono_8.wav
+    - hihat:  [test/sounds/hh_closed_mono_8.wav, test/sounds/missing.wav]   # "missing.wav" is a non-existent file
+  Flow:
+    - Verse:  x2
+    - Chorus: x2
+
+Verse:
+  - bass:    X...X...
+  - snare:   ..X...X.
+Chorus:
+  - bass:    XXXXXXXX
+  - [snare, hihat]:  .X.X.X.X
+

data/test/fixtures/invalid/track_with_composite_empty_sound.txt

@@ -0,0 +1,16 @@
+Song:
+  Tempo: 100
+  Kit:
+    - bass:      test/sounds/bass_mono_8.wav
+    - snare:     test/sounds/snare_mono_8.wav
+    - hh_closed: test/sounds/hh_closed_mono_8.wav
+  Flow:
+    - Verse:  x2
+    - Chorus: x2
+
+Verse:
+  - bass:    X...X...
+  - snare:   ..X...X.
+Chorus:
+  - bass:    XXXXXXXX
+  - []:      .X.X.X.X   # Empty composite sounds aren't allowed

data/test/fixtures/invalid/track_with_composite_nested_sounds.txt

@@ -0,0 +1,16 @@
+Song:
+  Tempo: 100
+  Kit:
+    - bass:      test/sounds/bass_mono_8.wav
+    - snare:     test/sounds/snare_mono_8.wav
+    - hh_closed: test/sounds/hh_closed_mono_8.wav
+  Flow:
+    - Verse:  x2
+    - Chorus: x2
+
+Verse:
+  - [bass, [hh_closed]]:  X...X...
+  - snare:              ..X...X.
+Chorus:
+  - bass:          XXXXXXXX
+  - [snare, [bass, hh_closed]]: .X.X.X.X

data/test/fixtures/invalid/track_with_composite_non_existent_sound.txt

@@ -0,0 +1,16 @@
+Song:
+  Tempo: 100
+  Kit:
+    - bass:      test/sounds/bass_mono_8.wav
+    - snare:     test/sounds/snare_mono_8.wav
+    - hh_closed: test/sounds/hh_closed_mono_8.wav
+  Flow:
+    - Verse:  x2
+    - Chorus: x2
+
+Verse:
+  - bass:    X...X...
+  - snare:   ..X...X.
+Chorus:
+  - bass:    XXXXXXXX
+  - [snare, missing]:  .X.X.X.X   # "missing" is not a valid file, and is not defined in the kit

data/test/fixtures/valid/example_flow_patterns_different_capitalization.txt

@@ -0,0 +1,20 @@
+# The patterns in the Flow have different capitalization from how the patterns are defined
+
+Song:
+  Tempo: 100
+  Flow:
+    - verse:   x1
+    - CHORUS:  x2
+    - VeRsE:   x1
+    - ChoRUS:  x2
+  Kit:
+    - bass:       test/sounds/bass_mono_8.wav
+    - snare:      test/sounds/snare_mono_8.wav
+
+Verse:
+  - bass:       X...X...X...X...
+  - snare:      ..............X.
+
+Chorus:
+  - bass:       X...X...XX..X...
+  - snare:      ....X.......X...

data/test/fixtures/valid/kit_with_composite_single_sound.txt

@@ -0,0 +1,16 @@
+Song:
+  Tempo: 100
+  Kit:
+    - bass:   test/sounds/bass_mono_8.wav
+    - snare:  test/sounds/snare_mono_8.wav
+    - hihat:  [test/sounds/hh_closed_mono_8.wav]
+  Flow:
+    - Verse:  x2
+    - Chorus: x2
+
+Verse:
+  - hihat:  X...X...
+  - snare:  ..X...X.
+Chorus:
+  - bass:            XXXXXXXX
+  - [snare, hihat]:  .X.X.X.X

data/test/fixtures/valid/kit_with_composite_sounds.txt

@@ -0,0 +1,16 @@
+Song:
+  Tempo: 100
+  Kit:
+    - bass:   test/sounds/bass_mono_8.wav
+    - snare:  test/sounds/snare_mono_8.wav
+    - hihat:  [test/sounds/hh_closed_mono_8.wav, test/sounds/hh_open_mono_8.wav]
+  Flow:
+    - Verse:  x2
+    - Chorus: x2
+
+Verse:
+  - hihat:  X...X...
+  - snare:  ..X...X.
+Chorus:
+  - bass:            XXXXXXXX
+  - [snare, hihat]:  .X.X.X.X

data/test/fixtures/valid/track_with_composite_kit_sounds.txt

@@ -0,0 +1,16 @@
+Song:
+  Tempo: 100
+  Kit:
+    - bass:      test/sounds/bass_mono_8.wav
+    - snare:     test/sounds/snare_mono_8.wav
+    - hh_closed: test/sounds/hh_closed_mono_8.wav
+  Flow:
+    - Verse:  x2
+    - Chorus: x2
+
+Verse:
+  - [bass, hh_closed]:  X...X...
+  - snare:              ..X...X.
+Chorus:
+  - bass:          XXXXXXXX
+  - [snare, bass]: .X.X.X.X

data/test/fixtures/valid/track_with_composite_mix_kit_and_not_kit_sound.txt

@@ -0,0 +1,16 @@
+Song:
+  Tempo: 100
+  Kit:
+    - bass:      test/sounds/bass_mono_8.wav
+    - snare:     test/sounds/snare_mono_8.wav
+    - hh_closed: test/sounds/hh_closed_mono_8.wav
+  Flow:
+    - Verse:  x2
+    - Chorus: x2
+
+Verse:
+  - bass:   X...X...
+  - snare:  ..X...X.
+Chorus:
+  - bass:   XXXXXXXX
+  - [hh_closed, test/sounds/hh_open_mono_8.wav]: .X.X.X.X

data/test/fixtures/valid/track_with_composite_mix_kit_and_not_kit_sound_2.txt

@@ -0,0 +1,16 @@
+Song:
+  Tempo: 100
+  Kit:
+    - bass:   test/sounds/bass_mono_8.wav
+    - snare:  test/sounds/snare_mono_8.wav
+    - hihat:  [test/sounds/hh_closed_mono_8.wav, test/sounds/hh_open_mono_8.wav]
+  Flow:
+    - Verse:  x2
+    - Chorus: x2
+
+Verse:
+  - hihat:  X...X...
+  - snare:  ..X...X.
+Chorus:
+  - bass:            XXXXXXXX
+  - [test/sounds/agogo_high_mono_8.wav, hihat, test/sounds/agogo_low_mono_8.wav]:  .X.X.X.X

data/test/fixtures/valid/track_with_composite_non_kit_sound.txt

@@ -0,0 +1,16 @@
+Song:
+  Tempo: 100
+  Kit:
+    - bass:      test/sounds/bass_mono_8.wav
+    - snare:     test/sounds/snare_mono_8.wav
+    - hh_closed: test/sounds/hh_closed_mono_8.wav
+  Flow:
+    - Verse:  x2
+    - Chorus: x2
+
+Verse:
+  - bass:   X...X...
+  - snare:  ..X...X.
+Chorus:
+  - bass:   XXXXXXXX
+  - [test/sounds/agogo_high_mono_8.wav, test/sounds/hh_open_mono_8.wav]: .X.X.X.X

data/test/fixtures/valid/track_with_composite_single_sound.txt

@@ -0,0 +1,16 @@
+Song:
+  Tempo: 100
+  Kit:
+    - bass:      test/sounds/bass_mono_8.wav
+    - snare:     test/sounds/snare_mono_8.wav
+    - hh_closed: test/sounds/hh_closed_mono_8.wav
+  Flow:
+    - Verse:  x2
+    - Chorus: x2
+
+Verse:
+  - bass:    X...X...
+  - snare:   ..X...X.
+Chorus:
+  - bass:    XXXXXXXX
+  - [snare]: .X.X.X.X

data/test/songparser_test.rb

@@ -3,20 +3,6 @@ require 'includes'
 class SongParserTest < Minitest::Test
   FIXTURE_BASE_PATH = File.dirname(__FILE__) + "/.."
 
-  # TODO: Add fixture for track with no rhythm
-  VALID_FIXTURES =   [:no_tempo,
-                      :fractional_tempo,
-                      :repeats_not_specified,
-                      :pattern_with_overflow,
-                      :example_no_kit,
-                      :example_with_kit,
-                      :example_with_empty_track,
-                      :track_with_spaces,
-                      :multiple_tracks_same_sound,
-                      :example_swung_8th,
-                      :example_swung_16th,
-                      :example_unswung]
-
   INVALID_FIXTURES = [:bad_repeat_count,
                       :bad_flow,
                       :bad_tempo,
@@ -26,46 +12,62 @@ class SongParserTest < Minitest::Test
                       :no_flow,
                       :with_structure,
                       :pattern_with_no_tracks,
+                      :track_with_composite_non_existent_sound,
+                      :kit_with_composite_non_existent_sound,
+                      :track_with_composite_empty_sound,
+                      :kit_with_composite_empty_sound,
+                      :track_with_composite_nested_sounds,
+                      :kit_with_composite_nested_sounds,
                       :leading_bar_line,
                       :sound_in_kit_not_found,
                       :sound_in_track_not_found,
                       :sound_in_kit_wrong_format,
                       :sound_in_track_wrong_format]
 
-  def self.load_fixture(fixture_name)
-    SongParser.new.parse(FIXTURE_BASE_PATH, File.read("test/fixtures/#{fixture_name}"))
-  end
+  # TODO: Add somes tests to validate the Kits
 
-  def self.generate_test_data
-    test_songs = {}
-    test_kits = {}
+  def test_no_tempo
+    song, kit = load_fixture("valid/no_tempo.txt")
 
-    VALID_FIXTURES.each do |fixture_name|
-      song, kit = load_fixture("valid/#{fixture_name}.txt")
-      test_songs[fixture_name] = song
-      test_kits[fixture_name] = kit
-    end
+    assert_equal(120, song.tempo)
+    assert_equal([:verse], song.flow)
+  end
 
-    return test_songs, test_kits
+  def test_fractional_tempo
+    song, kit = load_fixture("valid/fractional_tempo.txt")
+
+    assert_equal(95.764, song.tempo)
+    assert_equal([:verse, :verse, :chorus, :chorus], song.flow)
   end
 
-  # TODO: Add somes tests to validate the Kits
-  def test_valid_parse
-    test_songs, test_kits = SongParserTest.generate_test_data
+  def test_repeats_not_specified
+    song, kit = load_fixture("valid/repeats_not_specified.txt")
 
-    assert_equal(120, test_songs[:no_tempo].tempo)
-    assert_equal([:verse], test_songs[:no_tempo].flow)
+    assert_equal(100, song.tempo)
+    assert_equal([:verse], song.flow)
+  end
 
-    assert_equal(95.764, test_songs[:fractional_tempo].tempo)
-    assert_equal([:verse, :verse, :chorus, :chorus], test_songs[:fractional_tempo].flow)
+  def test_flow_patterns_different_capitalization
+    song, kit = load_fixture("valid/example_flow_patterns_different_capitalization.txt")
 
-    assert_equal(100, test_songs[:repeats_not_specified].tempo)
-    assert_equal([:verse], test_songs[:repeats_not_specified].flow)
+    assert_equal(100, song.tempo)
+    assert_equal([:verse, :chorus, :chorus, :verse, :chorus, :chorus], song.flow)
+    assert_equal(2, song.patterns.length)
+    assert_equal(2, song.patterns[:verse].tracks.length)
+    assert_equal("X...X...X...X...", song.patterns[:verse].tracks["bass"].rhythm)
+    assert_equal("..............X.", song.patterns[:verse].tracks["snare"].rhythm)
+    assert_equal(2, song.patterns[:chorus].tracks.length)
+    assert_equal("X...X...XX..X...", song.patterns[:chorus].tracks["bass"].rhythm)
+    assert_equal("....X.......X...", song.patterns[:chorus].tracks["snare"].rhythm)
+  end
+
+  def test_song_with_unused_kit
+    no_kit_song, no_kit_kit = load_fixture("valid/example_no_kit.txt")
+    kit_song, kit_kit = load_fixture("valid/example_with_kit.txt")
 
     # These two songs should be the same, except that one uses a kit in the song header
     # and the other doesn't.
-    [:example_no_kit, :example_with_kit].each do |song_key|
-      song = test_songs[song_key]
+    [no_kit_song, kit_song].each do |song|
       assert_equal([:verse, :verse,
                     :chorus, :chorus,
                     :verse, :verse,
@@ -79,20 +81,29 @@ class SongParserTest < Minitest::Test
       assert_equal(5, song.patterns[:chorus].tracks.length)
       assert_equal(1, song.patterns[:bridge].tracks.length)
     end
+  end
+
+  def test_empty_track
+    song, kit = load_fixture("valid/example_with_empty_track.txt")
 
-    song = test_songs[:example_with_empty_track]
     assert_equal(1, song.patterns.length)
     assert_equal(2, song.patterns[:verse].tracks.length)
     assert_equal("........", song.patterns[:verse].tracks["test/sounds/bass_mono_8.wav"].rhythm)
     assert_equal("X...X...", song.patterns[:verse].tracks["test/sounds/snare_mono_8.wav"].rhythm)
+  end
+
+  def test_track_with_spaces
+    song, kit = load_fixture("valid/track_with_spaces.txt")
 
-    song = test_songs[:track_with_spaces]
     assert_equal(1, song.patterns.length)
     assert_equal(2, song.patterns[:verse].tracks.length)
     assert_equal("X...X...X...X...", song.patterns[:verse].tracks["bass"].rhythm)
     assert_equal("....X.......X...", song.patterns[:verse].tracks["snare"].rhythm)
+  end
+
+  def test_multiple_tracks_same_sound
+    song, kit = load_fixture("valid/multiple_tracks_same_sound.txt")
 
-    song = test_songs[:multiple_tracks_same_sound]
     assert_equal(2, song.patterns.length)
     assert_equal(7, song.patterns[:verse].tracks.length)
     assert_equal(["agogo", "bass", "bass2", "bass3", "bass4", "hh_closed", "snare"],
@@ -112,8 +123,11 @@ class SongParserTest < Minitest::Test
     assert_equal("..X..X..X..X..X.", song.patterns[:chorus].tracks["bass2"].rhythm)
     assert_equal("...........X....", song.patterns[:chorus].tracks["test/sounds/tom4_mono_16.wav"].rhythm)
     assert_equal("..............X.", song.patterns[:chorus].tracks["test/sounds/tom2_mono_16.wav"].rhythm)
+  end
+
+  def test_swung_8
+    song, kit = load_fixture("valid/example_swung_8th.txt")
 
-    song = test_songs[:example_swung_8th]
     assert_equal(180, song.tempo)
     assert_equal([:verse, :verse, :chorus, :chorus], song.flow)
     assert_equal(2, song.patterns.length)
@@ -123,8 +137,11 @@ class SongParserTest < Minitest::Test
     assert_equal(2, song.patterns[:chorus].tracks.length)
     assert_equal("X.X.XXX.X.XX", song.patterns[:chorus].tracks["bass"].rhythm)
     assert_equal("..X..X..X..X", song.patterns[:chorus].tracks["snare"].rhythm)
+  end
+
+  def test_swung_16
+    song, kit = load_fixture("valid/example_swung_16th.txt")
 
-    song = test_songs[:example_swung_16th]
     assert_equal(180, song.tempo)
     assert_equal([:verse, :verse, :chorus, :chorus], song.flow)
     assert_equal(2, song.patterns.length)
@@ -134,8 +151,11 @@ class SongParserTest < Minitest::Test
     assert_equal(2, song.patterns[:chorus].tracks.length)
     assert_equal("X.XX.XX.XX.X", song.patterns[:chorus].tracks["bass"].rhythm)
     assert_equal("..X..X..X..X", song.patterns[:chorus].tracks["snare"].rhythm)
+  end
+
+  def test_unswung_song
+    song, kit = load_fixture("valid/example_unswung.txt")
 
-    song = test_songs[:example_unswung]
     assert_equal(120, song.tempo)
     assert_equal([:verse, :verse, :chorus, :chorus], song.flow)
     assert_equal(2, song.patterns.length)
@@ -147,15 +167,131 @@ class SongParserTest < Minitest::Test
     assert_equal(".X.X.X.X", song.patterns[:chorus].tracks["snare"].rhythm)
   end
 
+  def test_track_with_composite_kit_sounds
+    song, kit = load_fixture("valid/track_with_composite_kit_sounds.txt")
+
+    assert_equal(100, song.tempo)
+    assert_equal([:verse, :verse, :chorus, :chorus], song.flow)
+    assert_equal(2, song.patterns.length)
+    assert_equal(3, song.patterns[:verse].tracks.length)
+    assert_equal("X...X...", song.patterns[:verse].tracks["bass"].rhythm)
+    assert_equal("X...X...", song.patterns[:verse].tracks["hh_closed"].rhythm)
+    assert_equal("..X...X.", song.patterns[:verse].tracks["snare"].rhythm)
+    assert_equal(3, song.patterns[:chorus].tracks.length)
+    assert_equal("XXXXXXXX", song.patterns[:chorus].tracks["bass"].rhythm)
+    assert_equal(".X.X.X.X", song.patterns[:chorus].tracks["snare"].rhythm)
+    assert_equal(".X.X.X.X", song.patterns[:chorus].tracks["bass2"].rhythm)
+  end
+
+  def test_track_with_composite_non_kit_sound
+    song, kit = load_fixture("valid/track_with_composite_non_kit_sound.txt")
+
+    assert_equal(100, song.tempo)
+    assert_equal([:verse, :verse, :chorus, :chorus], song.flow)
+    assert_equal(2, song.patterns.length)
+    assert_equal(2, song.patterns[:verse].tracks.length)
+    assert_equal("X...X...", song.patterns[:verse].tracks["bass"].rhythm)
+    assert_equal("..X...X.", song.patterns[:verse].tracks["snare"].rhythm)
+    assert_equal(3, song.patterns[:chorus].tracks.length)
+    assert_equal("XXXXXXXX", song.patterns[:chorus].tracks["bass"].rhythm)
+    assert_equal(".X.X.X.X", song.patterns[:chorus].tracks["test/sounds/agogo_high_mono_8.wav"].rhythm)
+    assert_equal(".X.X.X.X", song.patterns[:chorus].tracks["test/sounds/hh_open_mono_8.wav"].rhythm)
+  end
+
+  def test_track_with_composite_mix_kit_and_not_kit_sound
+    song, kit = load_fixture("valid/track_with_composite_mix_kit_and_not_kit_sound.txt")
+
+    assert_equal(100, song.tempo)
+    assert_equal([:verse, :verse, :chorus, :chorus], song.flow)
+    assert_equal(2, song.patterns.length)
+    assert_equal(2, song.patterns[:verse].tracks.length)
+    assert_equal("X...X...", song.patterns[:verse].tracks["bass"].rhythm)
+    assert_equal("..X...X.", song.patterns[:verse].tracks["snare"].rhythm)
+    assert_equal(3, song.patterns[:chorus].tracks.length)
+    assert_equal("XXXXXXXX", song.patterns[:chorus].tracks["bass"].rhythm)
+    assert_equal(".X.X.X.X", song.patterns[:chorus].tracks["hh_closed"].rhythm)
+    assert_equal(".X.X.X.X", song.patterns[:chorus].tracks["test/sounds/hh_open_mono_8.wav"].rhythm)
+  end
+
+  def test_track_with_composite_mix_kit_and_not_kit_sound_2
+    song, kit = load_fixture("valid/track_with_composite_mix_kit_and_not_kit_sound_2.txt")
+
+    assert_equal(100, song.tempo)
+    assert_equal([:verse, :verse, :chorus, :chorus], song.flow)
+    assert_equal(2, song.patterns.length)
+    assert_equal(3, song.patterns[:verse].tracks.length)
+    assert_equal("X...X...", song.patterns[:verse].tracks["hihat-hh_closed_mono_8"].rhythm)
+    assert_equal("X...X...", song.patterns[:verse].tracks["hihat-hh_open_mono_8"].rhythm)
+    assert_equal("..X...X.", song.patterns[:verse].tracks["snare"].rhythm)
+    assert_equal(5, song.patterns[:chorus].tracks.length)
+    assert_equal("XXXXXXXX", song.patterns[:chorus].tracks["bass"].rhythm)
+    assert_equal(".X.X.X.X", song.patterns[:chorus].tracks["test/sounds/agogo_high_mono_8.wav"].rhythm)
+    assert_equal(".X.X.X.X", song.patterns[:chorus].tracks["hihat-hh_closed_mono_8"].rhythm)
+    assert_equal(".X.X.X.X", song.patterns[:chorus].tracks["hihat-hh_open_mono_8"].rhythm)
+    assert_equal(".X.X.X.X", song.patterns[:chorus].tracks["test/sounds/agogo_low_mono_8.wav"].rhythm)
+  end
+
+  def test_track_with_composite_single_sound
+    song, kit = load_fixture("valid/track_with_composite_single_sound.txt")
+
+    assert_equal(100, song.tempo)
+    assert_equal([:verse, :verse, :chorus, :chorus], song.flow)
+    assert_equal(2, song.patterns.length)
+    assert_equal(2, song.patterns[:verse].tracks.length)
+    assert_equal("X...X...", song.patterns[:verse].tracks["bass"].rhythm)
+    assert_equal("..X...X.", song.patterns[:verse].tracks["snare"].rhythm)
+    assert_equal(2, song.patterns[:chorus].tracks.length)
+    assert_equal("XXXXXXXX", song.patterns[:chorus].tracks["bass"].rhythm)
+    assert_equal(".X.X.X.X", song.patterns[:chorus].tracks["snare"].rhythm)
+  end
+
+  def test_kit_with_composite_sounds
+    song, kit = load_fixture("valid/kit_with_composite_sounds.txt")
+
+    assert_equal(100, song.tempo)
+    assert_equal([:verse, :verse, :chorus, :chorus], song.flow)
+    assert_equal(2, song.patterns.length)
+    assert_equal(3, song.patterns[:verse].tracks.length)
+    assert_equal("X...X...", song.patterns[:verse].tracks["hihat-hh_closed_mono_8"].rhythm)
+    assert_equal("X...X...", song.patterns[:verse].tracks["hihat-hh_open_mono_8"].rhythm)
+    assert_equal("..X...X.", song.patterns[:verse].tracks["snare"].rhythm)
+    assert_equal(4, song.patterns[:chorus].tracks.length)
+    assert_equal("XXXXXXXX", song.patterns[:chorus].tracks["bass"].rhythm)
+    assert_equal(".X.X.X.X", song.patterns[:chorus].tracks["snare"].rhythm)
+    assert_equal(".X.X.X.X", song.patterns[:chorus].tracks["hihat-hh_closed_mono_8"].rhythm)
+    assert_equal(".X.X.X.X", song.patterns[:chorus].tracks["hihat-hh_open_mono_8"].rhythm)
+  end
+
+  def test_kit_with_composite_single_sound
+    song, kit = load_fixture("valid/kit_with_composite_single_sound.txt")
+
+    assert_equal(100, song.tempo)
+    assert_equal([:verse, :verse, :chorus, :chorus], song.flow)
+    assert_equal(2, song.patterns.length)
+    assert_equal(2, song.patterns[:verse].tracks.length)
+    assert_equal("X...X...", song.patterns[:verse].tracks["hihat-hh_closed_mono_8"].rhythm)
+    assert_equal("..X...X.", song.patterns[:verse].tracks["snare"].rhythm)
+    assert_equal(3, song.patterns[:chorus].tracks.length)
+    assert_equal("XXXXXXXX", song.patterns[:chorus].tracks["bass"].rhythm)
+    assert_equal(".X.X.X.X", song.patterns[:chorus].tracks["snare"].rhythm)
+    assert_equal(".X.X.X.X", song.patterns[:chorus].tracks["hihat-hh_closed_mono_8"].rhythm)
+  end
+
   def test_invalid_parse
     INVALID_FIXTURES.each do |fixture|
       assert_raises(SongParser::ParseError) do
-        song = SongParserTest.load_fixture("invalid/#{fixture}.txt")
+        song, kit = load_fixture("invalid/#{fixture}.txt")
       end
     end
 
     assert_raises(Track::InvalidRhythmError) do
-      song = SongParserTest.load_fixture("invalid/bad_rhythm.txt")
+      song, kit = load_fixture("invalid/bad_rhythm.txt")
     end
   end
+
+private
+
+  def load_fixture(fixture_name)
+    SongParser.new.parse(FIXTURE_BASE_PATH, File.read("test/fixtures/#{fixture_name}"))
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beats
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Joel Strait
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-04 00:00:00.000000000 Z
+date: 2017-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wavefile
@@ -90,6 +90,9 @@ files:
 - test/fixtures/invalid/bad_swing_rate_1.txt
 - test/fixtures/invalid/bad_swing_rate_2.txt
 - test/fixtures/invalid/bad_tempo.txt
+- test/fixtures/invalid/kit_with_composite_empty_sound.txt
+- test/fixtures/invalid/kit_with_composite_nested_sounds.txt
+- test/fixtures/invalid/kit_with_composite_non_existent_sound.txt
 - test/fixtures/invalid/leading_bar_line.txt
 - test/fixtures/invalid/no_flow.txt
 - test/fixtures/invalid/no_header.txt
@@ -98,7 +101,11 @@ files:
 - test/fixtures/invalid/sound_in_kit_wrong_format.txt
 - test/fixtures/invalid/sound_in_track_not_found.txt
 - test/fixtures/invalid/sound_in_track_wrong_format.txt
+- test/fixtures/invalid/track_with_composite_empty_sound.txt
+- test/fixtures/invalid/track_with_composite_nested_sounds.txt
+- test/fixtures/invalid/track_with_composite_non_existent_sound.txt
 - test/fixtures/invalid/with_structure.txt
+- test/fixtures/valid/example_flow_patterns_different_capitalization.txt
 - test/fixtures/valid/example_mono_16.txt
 - test/fixtures/valid/example_mono_16_base_path.txt
 - test/fixtures/valid/example_mono_8.txt
@@ -111,13 +118,19 @@ files:
 - test/fixtures/valid/example_with_empty_track.txt
 - test/fixtures/valid/example_with_kit.txt
 - test/fixtures/valid/fractional_tempo.txt
+- test/fixtures/valid/kit_with_composite_single_sound.txt
+- test/fixtures/valid/kit_with_composite_sounds.txt
 - test/fixtures/valid/multiple_tracks_same_sound.txt
 - test/fixtures/valid/no_tempo.txt
 - test/fixtures/valid/optimize_pattern_collision.txt
 - test/fixtures/valid/pattern_with_overflow.txt
 - test/fixtures/valid/repeats_not_specified.txt
+- test/fixtures/valid/track_with_composite_kit_sounds.txt
+- test/fixtures/valid/track_with_composite_mix_kit_and_not_kit_sound.txt
+- test/fixtures/valid/track_with_composite_mix_kit_and_not_kit_sound_2.txt
+- test/fixtures/valid/track_with_composite_non_kit_sound.txt
+- test/fixtures/valid/track_with_composite_single_sound.txt
 - test/fixtures/valid/track_with_spaces.txt
-- test/fixtures/yaml/song_yaml.txt
 - test/includes.rb
 - test/integration_test.rb
 - test/kit_builder_test.rb
@@ -280,6 +293,9 @@ test_files:
 - test/fixtures/invalid/bad_swing_rate_1.txt
 - test/fixtures/invalid/bad_swing_rate_2.txt
 - test/fixtures/invalid/bad_tempo.txt
+- test/fixtures/invalid/kit_with_composite_empty_sound.txt
+- test/fixtures/invalid/kit_with_composite_nested_sounds.txt
+- test/fixtures/invalid/kit_with_composite_non_existent_sound.txt
 - test/fixtures/invalid/leading_bar_line.txt
 - test/fixtures/invalid/no_flow.txt
 - test/fixtures/invalid/no_header.txt
@@ -288,7 +304,11 @@ test_files:
 - test/fixtures/invalid/sound_in_kit_wrong_format.txt
 - test/fixtures/invalid/sound_in_track_not_found.txt
 - test/fixtures/invalid/sound_in_track_wrong_format.txt
+- test/fixtures/invalid/track_with_composite_empty_sound.txt
+- test/fixtures/invalid/track_with_composite_nested_sounds.txt
+- test/fixtures/invalid/track_with_composite_non_existent_sound.txt
 - test/fixtures/invalid/with_structure.txt
+- test/fixtures/valid/example_flow_patterns_different_capitalization.txt
 - test/fixtures/valid/example_mono_16.txt
 - test/fixtures/valid/example_mono_16_base_path.txt
 - test/fixtures/valid/example_mono_8.txt
@@ -301,13 +321,19 @@ test_files:
 - test/fixtures/valid/example_with_empty_track.txt
 - test/fixtures/valid/example_with_kit.txt
 - test/fixtures/valid/fractional_tempo.txt
+- test/fixtures/valid/kit_with_composite_single_sound.txt
+- test/fixtures/valid/kit_with_composite_sounds.txt
 - test/fixtures/valid/multiple_tracks_same_sound.txt
 - test/fixtures/valid/no_tempo.txt
 - test/fixtures/valid/optimize_pattern_collision.txt
 - test/fixtures/valid/pattern_with_overflow.txt
 - test/fixtures/valid/repeats_not_specified.txt
+- test/fixtures/valid/track_with_composite_kit_sounds.txt
+- test/fixtures/valid/track_with_composite_mix_kit_and_not_kit_sound.txt
+- test/fixtures/valid/track_with_composite_mix_kit_and_not_kit_sound_2.txt
+- test/fixtures/valid/track_with_composite_non_kit_sound.txt
+- test/fixtures/valid/track_with_composite_single_sound.txt
 - test/fixtures/valid/track_with_spaces.txt
-- test/fixtures/yaml/song_yaml.txt
 - test/includes.rb
 - test/integration_test.rb
 - test/kit_builder_test.rb

data/test/fixtures/yaml/song_yaml.txt

@@ -1,30 +0,0 @@
-Song:
-  Tempo: 99
-  Flow:
-    - Verse:   x2
-    - Chorus:  x2
-    - Verse:   x2
-    - Chorus:  x4
-    - Bridge:  x1
-    - Chorus:  x4
-  Kit:
-    - bass:      bass_mono_8.wav
-    - hhclosed:  hh_closed_mono_8.wav
-    - hhopen:    hh_open_mono_8.wav
-    - snare:     snare_mono_8.wav
-
-Bridge:
-  - hhclosed:  XX.XXX.XXX.XXX.XXX.XXX.XXX.XXX.X
-
-Chorus:
-  - bass:                              X...X...XXXXXXXXX...X...X...X...
-  - hhopen:                            ........X.......X.......X.......
-  - snare:                             ...................X...X...X...X
-  - test/sounds/hh_closed_mono_8.wav:  X.X.XXX.X.X.XXX.X.X.XXX.X.X.XXX.
-  - test/sounds/ride_mono_8.wav:       ....X...................X.......
-
-Verse:
-  - bass:      X...X...X...XX..X...X...XX..X...
-  - hhclosed:  X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.
-  - hhopen:    X...............X..............X
-  - snare:     ..X...X...X...X.X...X...X...X...