optimized LastFM module (added limit + page params & beautified results)

lib/LastFM/LastFM.rb

@@ -1,75 +1,74 @@
-
 module LastFM  
 
   class Artist < LastFMRequest
-    def self.search artist
-      get('/', :query => {:method => 'artist.search', :artist => artist})
+    def self.search query, limit = nil, page = nil
+      artist_request "search", "artistmatches", query, limit, page
     end
     
     # return: artist name, tags, similar artists, artist bio (summary / long), mbid, image urls ( different sizes )
-    def self.getInfo artist = nil, mbid = nil, autocorrect = 1
-      get('/', :query => {:method => 'artist.getInfo', :artist => artist, :mbid => mbid, :autocorrect => autocorrect})
+    def self.getInfo artist
+      artist_request "getInfo", nil, artist
     end
     
     # return: artists ( name, mbid, image urls ( different sizes ) )
-    def self.getSimilar artist = nil, mbid = nil, autocorrect = 1
-      get('/', :query => {:method => 'artist.getSimilar', :artist => artist, :mbid => mbid, :autocorrect => autocorrect})
+    def self.getSimilar artist, limit = nil
+      artist_request "getSimilar", "similarartists", artist, limit
     end
     
     # return: tags ( name, tag´s last.fm-url ) ordered by popularity
-    def self.getTopTags artist = nil, mbid = nil, autocorrect = 1
-      get('/', :query => {:method => 'artist.getTopTags', :artist => artist, :mbid => mbid, :autocorrect => autocorrect})
+    def self.getTopTags artist
+      artist_request "getTopTags", "toptags", artist
     end
     
     # return: tracks ( name, image urls ( different sizes ) ) ordered by popularity
-    def self.getTopTracks artist = nil, mbid = nil, autocorrect = 1
-      get('/', :query => {:method => 'artist.getTopTracks', :artist => artist, :mbid => mbid, :autocorrect => autocorrect})
+    def self.getTopTracks artist, limit = nil, page = nil
+      artist_request "getTopTracks", "toptracks", artist, limit, page
     end
     
     # return: albums ( name, mbid, album url, image urls ( different sizes ) ) ordered by popularity
-    def self.getTopAlbums artist = nil, mbid = nil, autocorrect = 1
-      get('/', :query => {:method => 'artist.getTopAlbums', :artist => artist, :mbid => mbid, :autocorrect => autocorrect})
+    def self.getTopAlbums artist, limit = nil, page = nil
+      artist_request "getTopAlbums", "topalbums", artist, limit, page
     end
     
   end
   
   
   class Album < LastFMRequest
-    def self.search album
-      get('/', :query => {:method => 'album.search', :album => album})
+    def self.search query, limit = nil, page = nil
+      album_request "search", "albummatches", query, nil, limit, page
     end
     
     # return: album name, artist, (top)tags, tracks ( name, duration (in sec) ) mbid (album), release date, image urls ( different sizes )
-    def self.getInfo album = nil, artist = nil, mbid = nil, autocorrect = 1
-      get('/', :query => {:method => 'album.getInfo', :album =>album, :artist => artist, :mbid => mbid, :autocorrect => autocorrect})
+    def self.getInfo album, artist
+      album_request "getInfo", nil, album, artist
     end
     
     # return: tags ( name, tag´s last.fm-url ) ordered by popularity
-    def self.getTopTags album = nil, artist = nil, mbid = nil, autocorrect = 1
-      get('/', :query => {:method => 'album.getTopTags', :album =>album, :artist => artist, :mbid => mbid, :autocorrect => autocorrect})
+    def self.getTopTags album, artist
+      album_request "getTopTags", "toptags", album, artist
     end
     
   end
   
   
   class Track < LastFMRequest
-    def self.search track
-      get('/', :query => {:method => 'track.search', :track => track})
+    def self.search query, limit = nil, page = nil
+      track_request "search", "trackmatches", query, nil, limit, page
     end
     
     # return: track name, id, (top)tags, artist, duration (in msec), album ( artist, title, image urls ( different sizes) ), mbid
-    def self.getInfo track = nil, artist = nil, autocorrect = 1
-      get('/', :query => {:method => 'track.getInfo', :track => track, :artist => artist, :autocorrect => autocorrect})
+    def self.getInfo track, artist
+      track_request "getInfo", nil, track, artist
     end
     
     # return: tracks ( name, artist (name, mbid), duration (in msec), image urls (sometimes) )
-    def self.getSimilar track = nil, artist = nil, autocorrect = 1
-      get('/', :query => {:method => 'track.getSimilar', :track => track, :artist => artist, :autocorrect => autocorrect})
+    def self.getSimilar track, artist, limit = nil
+      track_request "getSimilar", "similartracks", track, artist, limit
     end
     
     # return: tags ( name, tag´s last.fm-url ) ordered by popularity
-    def self.getTopTags track = nil, artist = nil, autocorrect = 1
-      get('/', :query => {:method => 'track.getTopTags', :track => track, :artist => artist, :autocorrect => autocorrect})
+    def self.getTopTags track, artist
+      track_request "getTopTags", "toptags", track, artist
     end
   end
   

lib/LastFM/LastFMRequest.rb

@@ -7,7 +7,7 @@ class LastFMRequest
     
   base_uri "ws.audioscrobbler.com/2.0/"
   parser Proc.new { |data| Hashie::Mash.new(ActiveSupport::JSON.decode(data)) }
-  default_params :format => 'json'
+  default_params :format => 'json', :autocorrect => '1'
   debug_output $>
   format :json
 
@@ -16,13 +16,8 @@ class LastFMRequest
     default_params :api_key => key
   end
   
-  def self.api_key
-    @@api_key
-  end
-  
   def self.limit=(limit)
     @limit = limit
-    default_params :limit => limit
   end
   
   def self.limit
@@ -31,11 +26,32 @@ class LastFMRequest
   
   def self.page=(page)
     @page = page
-    default_params :page => page
   end
   
   def self.page
     @page
   end
+  
+  def self.artist_request method, node, q, limit = nil, page = nil
+    prepare_result method, node, get('/', :query => { :method => "artist.#{method.to_s}", :artist => q, :limit => limit, :page => page })
+  end
+  
+  def self.album_request method, node, q, artist = nil, limit = nil, page = nil
+    prepare_result method, node, get('/', :query => { :method => "album.#{method.to_s}", :album => q, :artist => artist, :limit => limit, :page => page })
+  end
+  
+  def self.track_request method, node, q, artist = nil, limit = nil, page = nil
+    prepare_result method, node, get('/', :query => { :method => "track.#{method.to_s}", :track => q, :artist => artist, :limit => limit, :page => page })
+  end
+  
+  private
+  
+  def self.prepare_result method, node, response_hash
+    if method.to_s == "search"
+      response_hash = response_hash.results
+    end
+    response_hash.send(node.to_sym)
+  end
+  
 end