renamed lastm calls; partial fixup; generell call rename fixes

Gemfile.lock

@@ -46,7 +46,7 @@ GEM
       multipart-post (~> 1.1.0)
       rack (>= 1.1.0, < 2)
     gem_plugin (0.2.3)
-    haml (3.1.1)
+    haml (3.1.2)
     haml-rails (0.3.4)
       actionpack (~> 3.0)
       activesupport (~> 3.0)
@@ -113,7 +113,7 @@ GEM
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.9.2)
-    redis (2.2.0)
+    redis (2.2.1)
     ruby-openid (2.1.8)
     ruby-openid-apps-discovery (1.2.0)
       ruby-openid (>= 2.1.7)

app/controllers/artists_controller.rb

@@ -28,7 +28,7 @@ class ArtistsController < ApplicationController
   
   
   def more_tracks
-    more params
+    prepare params
     @tracks = LastFM::Artist.getTopTracks params[:q], @@limit[:tracks], (params[:size] / @@limit[:tracks] + 1)
     LastFM::Request.run_queue!
    
@@ -36,7 +36,7 @@ class ArtistsController < ApplicationController
   end
   
   def more_albums
-    more params
+    prepare params
     @albums = LastFM::Artist.getTopAlbums params[:q], @@limit[:albums], (params[:size] / @@limit[:albums] + 1)
     LastFM::Request.run_queue!
 
@@ -45,7 +45,7 @@ class ArtistsController < ApplicationController
 
   def album_info
     @album = LastFM::Album.getInfo CGI.unescape(params[:album]), CGI.unescape(params[:artist])
-    LastFM::LastFMRequest.run_queue!
+    LastFM::Request.run_queue!
 
     render :partial=>"album_info", :locals=>{:album=>@album}
   end

app/controllers/search_controller.rb

@@ -9,7 +9,7 @@ class SearchController < ApplicationController
     @tracks = LastFM::Track.search @q, @@limit[:tracks]
     @albums = LastFM::Album.search @q, @@limit[:albums]
 
-    LastFM::LastFMRequest.run_queue!
+    LastFM::Request.run_queue!
     
     render :partial=>"show", :locals=>{
       :artist=>@artist,
@@ -28,7 +28,7 @@ class SearchController < ApplicationController
   
   def more_artists
     @artists = LastFM::Artist.search params[:q].to_s.lstrip, @@limit[:artists], (params[:size].to_i / @@limit[:artists] + 1)
-    LastFM::LastFMRequest.run_queue!
+    LastFM::Request.run_queue!
 
     render :partial=>"more_artists", :locals=>{:artists=>@artists}
   end

app/views/artists/_more_tracks.html.haml

@@ -1,6 +1,6 @@
 - @tracks.track.each do |track|
-  %li{:artist=>track.artist.name,:track=>track.name}
+  - artist = track.artist.respond_to?(:name) ? track.artist.name : track.artist
+  %li{:artist=>artist,:track=>track.name}
     = track.name
     %span by
-    - artist = track.artist.respond_to?(:name) ? track.artist.name : track.artist
     = link_to trimString(artist, 50), "#!/artists/#{CGI.escape(artist)}"