musix_match 0.1.6 → 0.1.7
Sign up to get free protection for your applications and to get access to all the features.
- data/README.rdoc +1 -1
- data/lib/musix_match/api/finder.rb +5 -5
- data/lib/musix_match/instant_lyrics.rb +5 -5
- data/lib/musix_match/lyrics_find_result.rb +1 -1
- data/lib/musix_match/models/lyrics.rb +1 -1
- data/lib/musix_match/track_find_result.rb +1 -1
- data/spec/lyrics_find_result_spec.rb +1 -1
- data/spec/track_find_result_spec.rb +1 -1
- metadata +3 -3
data/README.rdoc
CHANGED
@@ -41,7 +41,7 @@ Available options for the search_lyrics methods are:
|
|
41
41
|
|
42
42
|
=== Getting lyrics
|
43
43
|
|
44
|
-
response = MusixMatch.get_lyrics(
|
44
|
+
response = MusixMatch.get_lyrics(track_id)
|
45
45
|
if response.status_code == 200 && lyrics = response.lyrics
|
46
46
|
puts lyrics.lyrics_body
|
47
47
|
end
|
@@ -1,18 +1,18 @@
|
|
1
1
|
module MusixMatch
|
2
2
|
module API
|
3
3
|
class Finder < Base
|
4
|
-
def find_lyrics(
|
5
|
-
response = get('lyrics.get', {:
|
4
|
+
def find_lyrics(track_id)
|
5
|
+
response = get('track.lyrics.get', {:track_id => track_id})
|
6
6
|
LyricsFindResult.new(response)
|
7
7
|
end
|
8
8
|
|
9
9
|
def find_track(track_id)
|
10
|
-
response = get('track.get', {:track_id => track_id})
|
10
|
+
response = get('track.get', {:track_id => track_id})
|
11
11
|
TrackFindResult.new(response)
|
12
12
|
end
|
13
13
|
|
14
|
-
def self.find_lyrics(
|
15
|
-
Finder.new.find_lyrics(
|
14
|
+
def self.find_lyrics(track_id)
|
15
|
+
Finder.new.find_lyrics(track_id)
|
16
16
|
end
|
17
17
|
|
18
18
|
def self.find_track(track_id)
|
@@ -18,20 +18,20 @@ module MusixMatch
|
|
18
18
|
end
|
19
19
|
|
20
20
|
def start
|
21
|
-
|
22
|
-
lyrics = find_lyrics(
|
21
|
+
track_id = search_track
|
22
|
+
lyrics = find_lyrics(track_id) if track_id
|
23
23
|
Result.new(lyrics)
|
24
24
|
end
|
25
25
|
|
26
26
|
def search_track
|
27
27
|
result = MusixMatch.search_track(:q => @q, :f_has_lyrics => 1)
|
28
28
|
if result.status_code == 200 && lyrics = result.track_list.first
|
29
|
-
lyrics.
|
29
|
+
lyrics.track_id
|
30
30
|
end
|
31
31
|
end
|
32
32
|
|
33
|
-
def find_lyrics(
|
34
|
-
result = MusixMatch.get_lyrics(
|
33
|
+
def find_lyrics(track_id)
|
34
|
+
result = MusixMatch.get_lyrics(track_id)
|
35
35
|
if result.status_code == 200 && lyrics = result.lyrics
|
36
36
|
lyrics
|
37
37
|
end
|
@@ -21,7 +21,7 @@ module MusixMatch
|
|
21
21
|
|
22
22
|
def parse_response_body(response)
|
23
23
|
if status_code == 200
|
24
|
-
@lyrics = Models::Lyrics.new(response['message']['body']['
|
24
|
+
@lyrics = Models::Lyrics.new(response['message']['body']['lyrics'])
|
25
25
|
end
|
26
26
|
end
|
27
27
|
end
|
@@ -3,7 +3,7 @@ module MusixMatch
|
|
3
3
|
class Lyrics
|
4
4
|
include Model
|
5
5
|
|
6
|
-
model_with_attributes :lyrics_id, :lyrics_body, :
|
6
|
+
model_with_attributes :lyrics_id, :lyrics_body, :lyrics_language, :script_tracking_url, :lyrics_copyright, :track_name, :artist_name
|
7
7
|
end
|
8
8
|
end
|
9
9
|
end
|
@@ -15,7 +15,7 @@ describe MusixMatch::LyricsFindResult do
|
|
15
15
|
|
16
16
|
it 'should initialize a new lyrics with the first lyrics of lyrics_list' do
|
17
17
|
response = load_fixture('lyrics.get')
|
18
|
-
MusixMatch::Models::Lyrics.should_receive(:new).with(response['message']['body']['
|
18
|
+
MusixMatch::Models::Lyrics.should_receive(:new).with(response['message']['body']['lyrics'])
|
19
19
|
MusixMatch::LyricsFindResult.new(response)
|
20
20
|
end
|
21
21
|
end
|
@@ -15,7 +15,7 @@ describe MusixMatch::TrackFindResult do
|
|
15
15
|
|
16
16
|
it 'should initialize a new track with the first track of track_list' do
|
17
17
|
response = load_fixture('track.get')
|
18
|
-
MusixMatch::Models::Track.should_receive(:new).with(response['message']['body']['
|
18
|
+
MusixMatch::Models::Track.should_receive(:new).with(response['message']['body']['track'])
|
19
19
|
MusixMatch::TrackFindResult.new(response)
|
20
20
|
end
|
21
21
|
end
|
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: musix_match
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 21
|
5
5
|
prerelease: false
|
6
6
|
segments:
|
7
7
|
- 0
|
8
8
|
- 1
|
9
|
-
-
|
10
|
-
version: 0.1.
|
9
|
+
- 7
|
10
|
+
version: 0.1.7
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Andrea Franz
|