lyrics_finder 0.3 → 0.3.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.travis.yml +1 -2
- data/lib/lyrics_finder.rb +5 -13
- data/lib/lyrics_finder/cli.rb +7 -1
- data/lib/lyrics_finder/version.rb +1 -1
- data/spec/lyrics_finder/lyrics_finder_spec.rb +8 -18
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7c2dc3897f414261f6c83e1d2bb505f55b347cd91a700cc362e0c60161f5e059
|
4
|
+
data.tar.gz: fbe3aff767d487af49aee3ef968fbcbc99d2a040414792dc4dd4048d978b917e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: ce8e3f0a37d8a94961eb2a87235edad70eb5ad0a7da2d6a032ae17b4e88353ce2d2c831593d18fa91b063b878e9a4bc35caad7d381b6fbd4f9e60bc816bcebcc
|
7
|
+
data.tar.gz: e55f68612ab278343ac7da9fedb4e7f916704b352691df532680b1afb2fdee1906df1855337aeeaeb0051d5d1553ce0d1b84118914d11c7b345873ca4b41d407
|
data/.travis.yml
CHANGED
data/lib/lyrics_finder.rb
CHANGED
@@ -7,20 +7,12 @@ require_relative 'lyrics_finder/song'
|
|
7
7
|
require_relative 'lyrics_finder/provider'
|
8
8
|
|
9
9
|
module LyricsFinder
|
10
|
-
|
11
10
|
def self.search(author, title)
|
12
|
-
|
13
|
-
Provider.
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
return result unless result.nil?
|
18
|
-
end
|
19
|
-
rescue SocketError => ex
|
20
|
-
puts "LyricsFinder can't connect to the internet"
|
21
|
-
rescue OpenURI::HTTPError => ex
|
22
|
-
puts "LyricsFinder can't find any matching lyrics for that song"
|
11
|
+
Provider.list.each do |provider|
|
12
|
+
url = Provider.url_for_song(provider, Song.new(author, title))
|
13
|
+
data = open(url)
|
14
|
+
result = Provider.extract_lyric_from_data(data) unless data.nil?
|
15
|
+
return result unless result.nil?
|
23
16
|
end
|
24
17
|
end
|
25
|
-
|
26
18
|
end
|
data/lib/lyrics_finder/cli.rb
CHANGED
@@ -7,7 +7,13 @@ module LyricsFinder
|
|
7
7
|
method_option 'author', :aliases => '-a', :type => :string
|
8
8
|
method_option 'title', :aliases => '-t', :type => :string
|
9
9
|
def search
|
10
|
-
|
10
|
+
begin
|
11
|
+
puts LyricsFinder.search(options[:author], options[:title])
|
12
|
+
rescue SocketError => ex
|
13
|
+
puts "lyrics_finder can't connect to the internet"
|
14
|
+
rescue OpenURI::HTTPError => ex
|
15
|
+
puts "lyrics_finder can't find any matching lyrics for that song"
|
16
|
+
end
|
11
17
|
end
|
12
18
|
end
|
13
19
|
end
|
@@ -1,6 +1,5 @@
|
|
1
1
|
describe LyricsFinder do
|
2
2
|
describe '#search' do
|
3
|
-
|
4
3
|
context 'With LyricsWikia as the provider' do
|
5
4
|
before :each do
|
6
5
|
allow(LyricsFinder::Provider).to receive(:list).and_return([LyricsFinder::Provider::LyricsWikia])
|
@@ -36,28 +35,19 @@ describe LyricsFinder do
|
|
36
35
|
end
|
37
36
|
|
38
37
|
context 'with a song that does not exist yet in any provider' do
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
# end
|
44
|
-
|
45
|
-
it 'returns nil' do
|
46
|
-
expect(LyricsFinder.search('', '')).to eq nil
|
38
|
+
it 'raises HTTP Error' do
|
39
|
+
expect{
|
40
|
+
LyricsFinder.search('asdfqwerty', 'poiulkj')
|
41
|
+
}.to raise_error(OpenURI::HTTPError)
|
47
42
|
end
|
48
43
|
end
|
49
44
|
|
50
45
|
context 'with invalid parameters' do
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
# end
|
56
|
-
|
57
|
-
it 'returns nil' do
|
58
|
-
expect(LyricsFinder.search('', '')).to eq nil
|
46
|
+
it 'raises HTTP Error' do
|
47
|
+
expect{
|
48
|
+
LyricsFinder.search('', '')
|
49
|
+
}.to raise_error(OpenURI::HTTPError)
|
59
50
|
end
|
60
51
|
end
|
61
|
-
|
62
52
|
end
|
63
53
|
end
|