karaoke 0.0.2 → 0.0.3

data/lib/karaoke/song/lyrics_mania.rb

@@ -10,19 +10,25 @@ module Karaoke
       def artist
         return @artist if defined?(@artist)
 
-        @artist = data.match(/cf_page_artist = "([^"]+)";/)[1]
+        el = document.css(".lyrics-nav hgroup h3").first
+        return @artist = nil unless el
+
+        @artist = el.text
       end
 
       def title
         return @title if defined?(@title)
 
-        @title = data.match(/cf_page_song = "([^"]+)";/)[1]
+        el = document.css(".lyrics-nav hgroup h2").first
+        return @title = nil unless el
+
+        @title = el.text.match("^(.+?) lyrics$")[1]
       end
 
       def lyrics
         return @lyrics if defined?(@lyrics)
 
-        el = document.css(".lyrics-body").first
+        el = document.css(".lyrics-body").first || document.css(".lyrics .col-left").first
         return @lyrics = nil unless el
 
         el.css("div").remove

data/lib/karaoke/version.rb

@@ -1,3 +1,3 @@
 module Karaoke
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: karaoke
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2014-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70294424362520 !ruby/object:Gem::Requirement
+  requirement: &70332846597640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70294424362520
+  version_requirements: *70332846597640
 - !ruby/object:Gem::Dependency
   name: google-search
-  requirement: &70294424362040 !ruby/object:Gem::Requirement
+  requirement: &70332846597140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70294424362040
+  version_requirements: *70332846597140
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70294424361520 !ruby/object:Gem::Requirement
+  requirement: &70332846596640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70294424361520
+  version_requirements: *70332846596640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70294424360960 !ruby/object:Gem::Requirement
+  requirement: &70332846596020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70294424360960
+  version_requirements: *70332846596020
 description: A Ruby library for easily finding the lyrics to your favorite songs
 email: douwe@selenight.nl
 executables: []
@@ -94,7 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3680872080017449051
+      hash: -3328474391754664886
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3680872080017449051
+      hash: -3328474391754664886
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.6