musix_match 0.1.6 → 0.1.7

data/README.rdoc

@@ -41,7 +41,7 @@ Available options for the search_lyrics methods are:
     
 === Getting lyrics
 
-  response = MusixMatch.get_lyrics(lyrics_id)
+  response = MusixMatch.get_lyrics(track_id)
   if response.status_code == 200 && lyrics = response.lyrics
     puts lyrics.lyrics_body
   end

data/lib/musix_match/api/finder.rb

@@ -1,18 +1,18 @@
 module MusixMatch  
   module API
     class Finder < Base
-      def find_lyrics(lyrics_id)
-        response = get('lyrics.get', {:lyrics_id => lyrics_id})
+      def find_lyrics(track_id)
+        response = get('track.lyrics.get', {:track_id => track_id})
         LyricsFindResult.new(response)
       end
 
       def find_track(track_id)
-        response = get('track.get', {:track_id => track_id})
+        response = get('track.get', {:track_id => track_id})        
         TrackFindResult.new(response)
       end
 
-      def self.find_lyrics(lyrics_id)
-        Finder.new.find_lyrics(lyrics_id)
+      def self.find_lyrics(track_id)
+        Finder.new.find_lyrics(track_id)
       end
 
       def self.find_track(track_id)

data/lib/musix_match/instant_lyrics.rb

@@ -18,20 +18,20 @@ module MusixMatch
       end
 
       def start
-        lyrics_id = search_track
-        lyrics    = find_lyrics(lyrics_id) if lyrics_id
+        track_id = search_track
+        lyrics    = find_lyrics(track_id) if track_id
         Result.new(lyrics)
       end
 
       def search_track
         result = MusixMatch.search_track(:q => @q, :f_has_lyrics => 1)
         if result.status_code == 200 && lyrics = result.track_list.first
-          lyrics.lyrics_id
+          lyrics.track_id
         end
       end
 
-      def find_lyrics(lyrics_id)
-        result = MusixMatch.get_lyrics(lyrics_id)
+      def find_lyrics(track_id)
+        result = MusixMatch.get_lyrics(track_id)
         if result.status_code == 200 && lyrics = result.lyrics
           lyrics
         end

data/lib/musix_match/lyrics_find_result.rb

@@ -21,7 +21,7 @@ module MusixMatch
   
     def parse_response_body(response)
       if status_code == 200        
-        @lyrics = Models::Lyrics.new(response['message']['body']['lyrics_list'].first['lyrics'])
+        @lyrics = Models::Lyrics.new(response['message']['body']['lyrics'])
       end
     end
   end

data/lib/musix_match/models/lyrics.rb

@@ -3,7 +3,7 @@ module MusixMatch
     class Lyrics
       include Model
       
-      model_with_attributes :lyrics_id, :lyrics_body, :track_name, :artist_name, :script_tracking_url
+      model_with_attributes :lyrics_id, :lyrics_body, :lyrics_language, :script_tracking_url, :lyrics_copyright, :track_name, :artist_name
     end
   end
 end

data/lib/musix_match/track_find_result.rb

@@ -21,7 +21,7 @@ module MusixMatch
   
     def parse_response_body(response)
       if status_code == 200
-        @track = Models::Track.new(response['message']['body']['track_list'].first['track'])
+        @track = Models::Track.new(response['message']['body']['track'])
       end
     end
   end

data/spec/lyrics_find_result_spec.rb

@@ -15,7 +15,7 @@ describe MusixMatch::LyricsFindResult do
   
   it 'should initialize a new lyrics with the first lyrics of lyrics_list' do
     response = load_fixture('lyrics.get')
-    MusixMatch::Models::Lyrics.should_receive(:new).with(response['message']['body']['lyrics_list'].first['lyrics'])
+    MusixMatch::Models::Lyrics.should_receive(:new).with(response['message']['body']['lyrics'])
     MusixMatch::LyricsFindResult.new(response)
   end
 end

data/spec/track_find_result_spec.rb

@@ -15,7 +15,7 @@ describe MusixMatch::TrackFindResult do
   
   it 'should initialize a new track with the first track of track_list' do
     response = load_fixture('track.get')
-    MusixMatch::Models::Track.should_receive(:new).with(response['message']['body']['track_list'].first['track'])
+    MusixMatch::Models::Track.should_receive(:new).with(response['message']['body']['track'])
     MusixMatch::TrackFindResult.new(response)
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: musix_match
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Andrea Franz