Mass artist controller refactoring

app/views/artist/_page.html.haml

@@ -1,32 +1,32 @@
-- if @loading
+- if @artist.status == 0
   .alert-message.warning
     %p= I18n.t 'search.loading'
 .row.artist-info
   .span4.columns.pic
-    = image_tag @artist[:artist][:pic] unless @artist[:artist][:pic].nil?
+    = image_tag @artist.pic_url unless @artist.pic_url.nil?
   .span7.columns.desc
-    %h2= @artist[:artist][:name]
-    = @artist[:artist][:desc] unless @artist[:artist][:desc].nil?
-    - unless @artist[:artist][:urls].nil?
+    %h2= @artist.name
+    = @artist.desc unless @artist.desc.nil?
+    - unless @artist.artist_links.empty?
       .service-icons
-        - @artist[:artist][:urls].each do |service|
+        - @artist.artist_links.each do |service|
           - if ['wikipedia', 'microblog', 'official_homepage', 'social_network'].include?service.service
             %a.foreign-link{ :href => service.url, :target => '_blank' }
               = image_tag 'services/'+service.service+(service.service == 'official_homepage' ? '.png' : '.ico')
 
 
-- @artist[:albums].each do |album|
+- @artist.albums.each do |album|
   .row.album
     .span4.columns.art
-      %img{ :src => album[:pic] }
+      %img{ :src => album.pic_url }
       .button-container
-        %a.btn.add-album{ :'data-album-id' => album[:id] }= I18n.t 'player.add'
+        %a.btn.add-album{ :'data-album-id' => album.id }= I18n.t 'player.add'
     .span7.columns.tracks
-      %h3{ :'data-album-id' => album[:id] }= album[:name] + " (" + album[:year].to_s + ")"
+      %h3{ :'data-album-id' => album.id }= album.name + " (" + album.year.to_s + ")"
       %table.zebra-striped.tracklist
-        - album[:tracks].each do |track|
+        - album.tracks.each do |track|
           %tr
-            %td.song-title= track[:name]
+            %td.song-title= track.name
             %td.song-duration
-              .s-duration= (track[:duration] != '0:00' ? track[:duration] : ' '.html_safe)
-              .s-add{ :'data-album-id' => album[:id], :'data-id' => track[:id] }= I18n.t 'player.add_one'
+              .s-duration= (track.duration != '0:00' ? track.duration : ' '.html_safe)
+              .s-add{ :'data-album-id' => album.id, :'data-id' => track.id }= I18n.t 'player.add_one'