Fixes extraneous characters from lyrics results

[rbdr/lyricli.rb] / lib / lyricli / lyrics_engine.rb

diff --git a/lib/lyricli/lyrics_engine.rb b/lib/lyricli/lyrics_engine.rb
index beacd4610490d6c17af4dc94f9c035dff08fe027..1291d41131f497e453cba41da5862745da923777 100644 (file)
--- a/lib/lyricli/lyrics_engine.rb
+++ b/lib/lyricli/lyrics_engine.rb
@@ -24,18 +24,22 @@ module Lyricli
         doc = Nokogiri::HTML(open(response['url']))
         node = doc.search(".lyricbox").first
       rescue
         doc = Nokogiri::HTML(open(response['url']))
         node = doc.search(".lyricbox").first
       rescue

-        raise Lyricli::LyricsNotFoundException
+        raise Exceptions::LyricsNotFoundError

       end
 
       node.search(".rtMatcher").each do |n|
         n.remove
       end
 
       end
 
       node.search(".rtMatcher").each do |n|
         n.remove
       end
 

+      node.search("script").each do |n|
+        n.remove
+      end
+

       node.search("br").each do |br|
         br.replace "\n"
       end
 
       node.search("br").each do |br|
         br.replace "\n"
       end
 

-      node.inner_text
+      node.inner_text.gsub(/\s+$/, "")

     end
   end
 end
     end
   end
 end