Support bridge directive

lib/chord_pro.rb

@@ -16,7 +16,7 @@ module ChordPro
   MEASURES_REGEX = %r{([\[[\w#b\/]+\]\s]+)[|]*}i
   CHORDS_REGEX = %r{\[([\w#b\/]+)\]?}i
   COMMENT_REGEX = /\{(?:c|comment|comment_italic|ci|comment_box|cb):([^$]*)\}/
-  SANITIZE_REGEX = /\{end_of_chorus|eoc|end_of_verse|eov|end_of_tab|eot|end_of_tab|eog|end_of_grid|colb\}/
+  SANITIZE_REGEX = /\{end_of_chorus|eoc|end_of_verse|eov|eob|end_of_bridge|end_of_tab|eot|end_of_tab|eog|end_of_grid|colb\}/
 
   class << self
     def parse(lines)
@@ -133,6 +133,7 @@ def section_name_by_directive(text)
       return "Chorus" if /soc|start_of_chorus|chorus/.match?(text)
       return "Verse" if /sov|start_of_verse/.match?(text)
       return "Tab" if /sot|start_of_tab/.match?(text)
+      return "Bridge" if /sob|start_of_bridge/.match?(text)
       "Grid" if /sot|start_of_grid/.match?(text)
     end
   end

spec/song_pro_spec.rb → spec/chord_pro_spec.rb

@@ -52,16 +52,22 @@
 {start_of_verse}
 {start_of_chorus: Chorus 1}
 {start_of_chorus}
+{start_of_bridge}
+{start_of_bridge: Bridge 2}
+{sob}
 {chorus}
 {chorus:Final}
 ')
-      expect(song.sections.size).to eq 6
+      expect(song.sections.size).to eq 9
       expect(song.sections[0].name).to eq "Verse 1"
       expect(song.sections[1].name).to eq "Verse"
       expect(song.sections[2].name).to eq "Chorus 1"
       expect(song.sections[3].name).to eq "Chorus"
-      expect(song.sections[4].name).to eq "Chorus"
-      expect(song.sections[5].name).to eq "Final"
+      expect(song.sections[4].name).to eq "Bridge"
+      expect(song.sections[5].name).to eq "Bridge 2"
+      expect(song.sections[6].name).to eq "Bridge"
+      expect(song.sections[7].name).to eq "Chorus"
+      expect(song.sections[8].name).to eq "Final"
     end
   end
 
@@ -208,7 +214,7 @@
       expect(song.title).to eq "Bad Moon Rising"
       expect(song.artist).to eq "Creedence Clearwater Revival"
       expect(song.capo).to eq "1"
-      expect(song.sections.size).to eq 9
+      expect(song.sections.size).to eq 10
       expect(song.custom[:difficulty]).to eq "Easy"
       expect(song.custom[:spotify_url])
         .to eq "https://open.spotify.com/track/20OFwXhEXf12DzwXmaV7fj?si=cE76lY5TT26fyoNmXEjNpA"

spec/fixtures/bad-moon-rising.html

@@ -1 +1 @@
-<div class="song"><h1 class="title">Bad Moon Rising</h1><h2 class="artist">Creedence Clearwater Revival</h2><dl class="information"><dt class="capo">Capo</dt><dd class="capo">1</dd></dl><div class="section"><div class="name">Intro</div><div class="lines"><div class="measures"><div class="measure"><div class="chord">D</div></div><div class="measure"><div class="chord">A</div><div class="chord">G</div></div><div class="measure"><div class="chord">D</div></div><div class="measure"><div class="chord">D</div></div></div></div></div><div class="section"><div class="name">Verse 1</div><div class="lines"><div class="line"><div class="part"><div class="chord">D</div><div class="lyric">I see a </div></div><div class="part"><div class="chord">A</div><div class="lyric">bad </div></div><div class="part"><div class="chord">G</div><div class="lyric">moon a-</div></div><div class="part"><div class="chord">D</div><div class="lyric">rising</div></div></div><div class="line"><div class="part"><div class="chord">D</div><div class="lyric">I see </div></div><div class="part"><div class="chord">A</div><div class="lyric">trouble </div></div><div class="part"><div class="chord">G</div><div class="lyric">on the </div></div><div class="part"><div class="chord">D</div><div class="lyric">way</div></div></div><div class="line"><div class="part"><div class="chord">D</div><div class="lyric">I see </div></div><div class="part"><div class="chord">A</div><div class="lyric">earth-</div></div><div class="part"><div class="chord">G</div><div class="lyric">quakes and </div></div><div class="part"><div class="chord">D</div><div class="lyric">lightnin'</div></div></div><div class="line"><div class="part"><div class="chord">D</div><div class="lyric">I see </div></div><div class="part"><div class="chord">A</div><div class="lyric">bad </div></div><div class="part"><div class="chord">G</div><div class="lyric">times to-</div></div><div class="part"><div class="chord">D</div><div class="lyric">day</div></div></div></div></div><div class="section"><div class="name">Riff</div><div class="lines"><div class="tablature">|-3---5-|</div><div class="tablature">|---4---|</div></div></div><div class="section"><div class="name">Chorus</div><div class="lines"><div class="line"><div class="part"><div class="chord">G</div><div class="lyric">Don't go 'round tonight</div></div></div><div class="line"><div class="part"><div class="chord"></div><div class="lyric">It's </div></div><div class="part"><div class="chord">D</div><div class="lyric">bound to take your life</div></div></div><div class="line"><div class="part"><div class="chord">A7</div><div class="lyric">There's a </div></div><div class="part"><div class="chord">G</div><div class="lyric">bad moon on the </div></div><div class="part"><div class="chord">D</div><div class="lyric">rise</div></div></div></div></div><div class="section"><div class="name">Verse 2</div><div class="lines"><div class="line"><div class="part"><div class="chord">D</div><div class="lyric">I hear </div></div><div class="part"><div class="chord">A</div><div class="lyric">hurri-</div></div><div class="part"><div class="chord">G</div><div class="lyric">canes a-</div></div><div class="part"><div class="chord">D</div><div class="lyric">blowing</div></div></div><div class="line"><div class="part"><div class="chord">D</div><div class="lyric">I know the </div></div><div class="part"><div class="chord">A</div><div class="lyric">end is </div></div><div class="part"><div class="chord">G</div><div class="lyric">coming </div></div><div class="part"><div class="chord">D</div><div class="lyric">soon</div></div></div><div class="line"><div class="part"><div class="chord">D</div><div class="lyric">I fear </div></div><div class="part"><div class="chord">A</div><div class="lyric">rivers </div></div><div class="part"><div class="chord">G</div><div class="lyric">over </div></div><div class="part"><div class="chord">D</div><div class="lyric">flowing</div></div></div><div class="line"><div class="part"><div class="chord">D</div><div class="lyric">I hear the </div></div><div class="part"><div class="chord">A</div><div class="lyric">voice of </div></div><div class="part"><div class="chord">G</div><div class="lyric">rage and </div></div><div class="part"><div class="chord">D</div><div class="lyric">ruin</div></div></div></div></div><div class="section"><div class="name">Chorus</div></div><div class="section"><div class="name">Solo</div><div class="lines"><div class="measures"><div class="measure"><div class="chord">D</div></div><div class="measure"><div class="chord">A</div><div class="chord">G</div></div><div class="measure"><div class="chord">D</div></div><div class="measure"><div class="chord">D</div></div></div><div class="measures"><div class="measure"><div class="chord">D</div></div><div class="measure"><div class="chord">A</div><div class="chord">G</div></div><div class="measure"><div class="chord">D</div></div><div class="measure"><div class="chord">D</div></div></div><div class="measures"><div class="measure"><div class="chord">G</div></div><div class="measure"><div class="chord">G</div></div><div class="measure"><div class="chord">D</div></div><div class="measure"><div class="chord">D</div></div></div><div class="measures"><div class="measure"><div class="chord">A7</div></div><div class="measure"><div class="chord">G</div></div><div class="measure"><div class="chord">D</div></div><div class="measure"><div class="chord">D</div></div></div></div></div><div class="section"><div class="name">Verse 3</div><div class="lines"><div class="line"><div class="part"><div class="chord">D</div><div class="lyric">I hope you </div></div><div class="part"><div class="chord">A</div><div class="lyric">got your </div></div><div class="part"><div class="chord">G</div><div class="lyric">things to-</div></div><div class="part"><div class="chord">D</div><div class="lyric">gether</div></div></div><div class="line"><div class="part"><div class="chord">D</div><div class="lyric">Hope you are </div></div><div class="part"><div class="chord">A</div><div class="lyric">quite pre-</div></div><div class="part"><div class="chord">G</div><div class="lyric">pared to </div></div><div class="part"><div class="chord">D</div><div class="lyric">die</div></div></div><div class="line"><div class="part"><div class="chord">D</div><div class="lyric">Look's like we're </div></div><div class="part"><div class="chord">A</div><div class="lyric">in for </div></div><div class="part"><div class="chord">G</div><div class="lyric">nasty </div></div><div class="part"><div class="chord">D</div><div class="lyric">weather</div></div></div><div class="line"><div class="part"><div class="chord">D</div><div class="lyric">One eye is </div></div><div class="part"><div class="chord">A</div><div class="lyric">taken </div></div><div class="part"><div class="chord">G</div><div class="lyric">for an </div></div><div class="part"><div class="chord">D</div><div class="lyric">eye</div></div></div></div></div><div class="section"><div class="name">Chorus</div><div class="lines"><div class="line"><div class="part"><div class="chord"></div><div class="lyric">Oh </div></div><div class="part"><div class="chord">G</div><div class="lyric">don't go 'round tonight</div></div></div><div class="line"><div class="part"><div class="chord"></div><div class="lyric">It's </div></div><div class="part"><div class="chord">D</div><div class="lyric">bound to take your life</div></div></div><div class="line"><div class="part"><div class="chord">A7</div><div class="lyric">There's a </div></div><div class="part"><div class="chord">G</div><div class="lyric">bad moon on the </div></div><div class="part"><div class="chord">D</div><div class="lyric">rise</div></div></div><div class="line"><div class="part"><div class="chord">A7</div><div class="lyric">There's a </div></div><div class="part"><div class="chord">G</div><div class="lyric">bad moon on the </div></div><div class="part"><div class="chord">D</div><div class="lyric">rise</div></div></div></div></div></div>
+<div class="song"><h1 class="title">Bad Moon Rising</h1><h2 class="artist">Creedence Clearwater Revival</h2><dl class="information"><dt class="capo">Capo</dt><dd class="capo">1</dd></dl><div class="section"><div class="name">Intro</div><div class="lines"><div class="measures"><div class="measure"><div class="chord">D</div></div><div class="measure"><div class="chord">A</div><div class="chord">G</div></div><div class="measure"><div class="chord">D</div></div><div class="measure"><div class="chord">D</div></div></div></div></div><div class="section"><div class="name">Verse 1</div><div class="lines"><div class="line"><div class="part"><div class="chord">D</div><div class="lyric">I see a </div></div><div class="part"><div class="chord">A</div><div class="lyric">bad </div></div><div class="part"><div class="chord">G</div><div class="lyric">moon a-</div></div><div class="part"><div class="chord">D</div><div class="lyric">rising</div></div></div><div class="line"><div class="part"><div class="chord">D</div><div class="lyric">I see </div></div><div class="part"><div class="chord">A</div><div class="lyric">trouble </div></div><div class="part"><div class="chord">G</div><div class="lyric">on the </div></div><div class="part"><div class="chord">D</div><div class="lyric">way</div></div></div><div class="line"><div class="part"><div class="chord">D</div><div class="lyric">I see </div></div><div class="part"><div class="chord">A</div><div class="lyric">earth-</div></div><div class="part"><div class="chord">G</div><div class="lyric">quakes and </div></div><div class="part"><div class="chord">D</div><div class="lyric">lightnin'</div></div></div><div class="line"><div class="part"><div class="chord">D</div><div class="lyric">I see </div></div><div class="part"><div class="chord">A</div><div class="lyric">bad </div></div><div class="part"><div class="chord">G</div><div class="lyric">times to-</div></div><div class="part"><div class="chord">D</div><div class="lyric">day</div></div></div></div></div><div class="section"><div class="name">Riff</div><div class="lines"><div class="tablature">|-3---5-|</div><div class="tablature">|---4---|</div></div></div><div class="section"><div class="name">Chorus</div><div class="lines"><div class="line"><div class="part"><div class="chord">G</div><div class="lyric">Don't go 'round tonight</div></div></div><div class="line"><div class="part"><div class="chord"></div><div class="lyric">It's </div></div><div class="part"><div class="chord">D</div><div class="lyric">bound to take your life</div></div></div><div class="line"><div class="part"><div class="chord">A7</div><div class="lyric">There's a </div></div><div class="part"><div class="chord">G</div><div class="lyric">bad moon on the </div></div><div class="part"><div class="chord">D</div><div class="lyric">rise</div></div></div></div></div><div class="section"><div class="name">Verse 2</div><div class="lines"><div class="line"><div class="part"><div class="chord">D</div><div class="lyric">I hear </div></div><div class="part"><div class="chord">A</div><div class="lyric">hurri-</div></div><div class="part"><div class="chord">G</div><div class="lyric">canes a-</div></div><div class="part"><div class="chord">D</div><div class="lyric">blowing</div></div></div><div class="line"><div class="part"><div class="chord">D</div><div class="lyric">I know the </div></div><div class="part"><div class="chord">A</div><div class="lyric">end is </div></div><div class="part"><div class="chord">G</div><div class="lyric">coming </div></div><div class="part"><div class="chord">D</div><div class="lyric">soon</div></div></div><div class="line"><div class="part"><div class="chord">D</div><div class="lyric">I fear </div></div><div class="part"><div class="chord">A</div><div class="lyric">rivers </div></div><div class="part"><div class="chord">G</div><div class="lyric">over </div></div><div class="part"><div class="chord">D</div><div class="lyric">flowing</div></div></div><div class="line"><div class="part"><div class="chord">D</div><div class="lyric">I hear the </div></div><div class="part"><div class="chord">A</div><div class="lyric">voice of </div></div><div class="part"><div class="chord">G</div><div class="lyric">rage and </div></div><div class="part"><div class="chord">D</div><div class="lyric">ruin</div></div></div></div></div><div class="section"><div class="name">Chorus</div></div><div class="section"><div class="name">Bridge</div><div class="lines"><div class="measures"><div class="measure"><div class="chord">D</div></div><div class="measure"><div class="chord">A</div><div class="chord">G</div></div><div class="measure"><div class="chord">D</div></div><div class="measure"><div class="chord">D</div></div></div><div class="measures"><div class="measure"><div class="chord">D</div></div><div class="measure"><div class="chord">A</div><div class="chord">G</div></div><div class="measure"><div class="chord">D</div></div><div class="measure"><div class="chord">D</div></div></div><div class="measures"><div class="measure"><div class="chord">G</div></div><div class="measure"><div class="chord">G</div></div><div class="measure"><div class="chord">D</div></div><div class="measure"><div class="chord">D</div></div></div><div class="measures"><div class="measure"><div class="chord">A7</div></div><div class="measure"><div class="chord">G</div></div><div class="measure"><div class="chord">D</div></div><div class="measure"><div class="chord">D</div></div></div></div></div><div class="section"><div class="name">Solo</div><div class="lines"><div class="measures"><div class="measure"><div class="chord">D</div></div><div class="measure"><div class="chord">A</div><div class="chord">G</div></div><div class="measure"><div class="chord">D</div></div><div class="measure"><div class="chord">D</div></div></div><div class="measures"><div class="measure"><div class="chord">D</div></div><div class="measure"><div class="chord">A</div><div class="chord">G</div></div><div class="measure"><div class="chord">D</div></div><div class="measure"><div class="chord">D</div></div></div><div class="measures"><div class="measure"><div class="chord">G</div></div><div class="measure"><div class="chord">G</div></div><div class="measure"><div class="chord">D</div></div><div class="measure"><div class="chord">D</div></div></div><div class="measures"><div class="measure"><div class="chord">A7</div></div><div class="measure"><div class="chord">G</div></div><div class="measure"><div class="chord">D</div></div><div class="measure"><div class="chord">D</div></div></div></div></div><div class="section"><div class="name">Verse 3</div><div class="lines"><div class="line"><div class="part"><div class="chord">D</div><div class="lyric">I hope you </div></div><div class="part"><div class="chord">A</div><div class="lyric">got your </div></div><div class="part"><div class="chord">G</div><div class="lyric">things to-</div></div><div class="part"><div class="chord">D</div><div class="lyric">gether</div></div></div><div class="line"><div class="part"><div class="chord">D</div><div class="lyric">Hope you are </div></div><div class="part"><div class="chord">A</div><div class="lyric">quite pre-</div></div><div class="part"><div class="chord">G</div><div class="lyric">pared to </div></div><div class="part"><div class="chord">D</div><div class="lyric">die</div></div></div><div class="line"><div class="part"><div class="chord">D</div><div class="lyric">Look's like we're </div></div><div class="part"><div class="chord">A</div><div class="lyric">in for </div></div><div class="part"><div class="chord">G</div><div class="lyric">nasty </div></div><div class="part"><div class="chord">D</div><div class="lyric">weather</div></div></div><div class="line"><div class="part"><div class="chord">D</div><div class="lyric">One eye is </div></div><div class="part"><div class="chord">A</div><div class="lyric">taken </div></div><div class="part"><div class="chord">G</div><div class="lyric">for an </div></div><div class="part"><div class="chord">D</div><div class="lyric">eye</div></div></div></div></div><div class="section"><div class="name">Chorus</div><div class="lines"><div class="line"><div class="part"><div class="chord"></div><div class="lyric">Oh </div></div><div class="part"><div class="chord">G</div><div class="lyric">don't go 'round tonight</div></div></div><div class="line"><div class="part"><div class="chord"></div><div class="lyric">It's </div></div><div class="part"><div class="chord">D</div><div class="lyric">bound to take your life</div></div></div><div class="line"><div class="part"><div class="chord">A7</div><div class="lyric">There's a </div></div><div class="part"><div class="chord">G</div><div class="lyric">bad moon on the </div></div><div class="part"><div class="chord">D</div><div class="lyric">rise</div></div></div><div class="line"><div class="part"><div class="chord">A7</div><div class="lyric">There's a </div></div><div class="part"><div class="chord">G</div><div class="lyric">bad moon on the </div></div><div class="part"><div class="chord">D</div><div class="lyric">rise</div></div></div></div></div></div>

spec/fixtures/bad-moon-rising.pro

@@ -35,6 +35,13 @@ It's [D]bound to take your life
 
 {chorus}
 
+{start_of_bridge}
+| [D] | [A] [G] | [D] | [D] |
+| [D] | [A] [G] | [D] | [D] |
+| [G] | [G] | [D] | [D] |
+| [A7] | [G] | [D] | [D] |
+{end_of_bridge}
+
 {start_of_grid: Solo}
 | [D] | [A] [G] | [D] | [D] |
 | [D] | [A] [G] | [D] | [D] |