karaoke 0.0.2 → 0.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. data/lib/karaoke/song/lyrics_mania.rb +9 -3
  2. data/lib/karaoke/version.rb +1 -1
  3. metadata +11 -11
data/lib/karaoke/song/lyrics_mania.rb CHANGED
@@ -10,19 +10,25 @@ module Karaoke
10
10
  def artist
11
11
  return @artist if defined?(@artist)
12
12
 
13
- @artist = data.match(/cf_page_artist = "([^"]+)";/)[1]
13
+ el = document.css(".lyrics-nav hgroup h3").first
14
+ return @artist = nil unless el
15
+
16
+ @artist = el.text
14
17
  end
15
18
 
16
19
  def title
17
20
  return @title if defined?(@title)
18
21
 
19
- @title = data.match(/cf_page_song = "([^"]+)";/)[1]
22
+ el = document.css(".lyrics-nav hgroup h2").first
23
+ return @title = nil unless el
24
+
25
+ @title = el.text.match("^(.+?) lyrics$")[1]
20
26
  end
21
27
 
22
28
  def lyrics
23
29
  return @lyrics if defined?(@lyrics)
24
30
 
25
- el = document.css(".lyrics-body").first
31
+ el = document.css(".lyrics-body").first || document.css(".lyrics .col-left").first
26
32
  return @lyrics = nil unless el
27
33
 
28
34
  el.css("div").remove
data/lib/karaoke/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Karaoke
2
- VERSION = "0.0.2"
2
+ VERSION = "0.0.3"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: karaoke
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.2
4
+ version: 0.0.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2014-09-14 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: nokogiri
16
- requirement: &70294424362520 !ruby/object:Gem::Requirement
16
+ requirement: &70332846597640 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70294424362520
24
+ version_requirements: *70332846597640
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: google-search
27
- requirement: &70294424362040 !ruby/object:Gem::Requirement
27
+ requirement: &70332846597140 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70294424362040
35
+ version_requirements: *70332846597140
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rake
38
- requirement: &70294424361520 !ruby/object:Gem::Requirement
38
+ requirement: &70332846596640 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *70294424361520
46
+ version_requirements: *70332846596640
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: rspec
49
- requirement: &70294424360960 !ruby/object:Gem::Requirement
49
+ requirement: &70332846596020 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
54
54
  version: '0'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *70294424360960
57
+ version_requirements: *70332846596020
58
58
  description: A Ruby library for easily finding the lyrics to your favorite songs
59
59
  email: douwe@selenight.nl
60
60
  executables: []
@@ -94,7 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
94
94
  version: '0'
95
95
  segments:
96
96
  - 0
97
- hash: -3680872080017449051
97
+ hash: -3328474391754664886
98
98
  required_rubygems_version: !ruby/object:Gem::Requirement
99
99
  none: false
100
100
  requirements:
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
103
103
  version: '0'
104
104
  segments:
105
105
  - 0
106
- hash: -3680872080017449051
106
+ hash: -3328474391754664886
107
107
  requirements: []
108
108
  rubyforge_project:
109
109
  rubygems_version: 1.8.6