From ba65a8370c2641387021e0bcc98900aac7a7cd68 Mon Sep 17 00:00:00 2001 From: Gregory Eremin Date: Thu, 20 Oct 2011 15:02:39 +0400 Subject: [PATCH] Symbols syntax convert --- app/controllers/artist_controller.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/controllers/artist_controller.rb b/app/controllers/artist_controller.rb index debaf23..03c3fad 100644 --- a/app/controllers/artist_controller.rb +++ b/app/controllers/artist_controller.rb @@ -5,7 +5,7 @@ class ArtistController < ApplicationController def data # Bad params if params[:name].nil? or params[:name].empty? - return render :json => { :status => 'loading_failed' } + return render json: { status: 'loading_failed' } end # Searching for artist @@ -16,25 +16,25 @@ class ArtistController < ApplicationController unless @artist results = MusicBrainz::Artist.search(artist_name) if results.empty? - return render :json => { :status => 'not_found' } + return render json: { status: 'not_found' } end best_match = results[0][:name] if best_match != artist_name and (best_match.downcase == artist_name.downcase or best_match.downcase == 'the '+ artist_name.downcase) - return render :json => { :status => 'corrected', :correct_name => best_match } + return render json: { status: 'corrected', correct_name: best_match } elsif results[0][:name] == artist_name queue_loading(artist_name, results[0][:mbid]) - @artist = { :artist => @artist, :albums => [] } + @artist = { artist: @artist, albums: [] } @loading = true - return render :json => { :status => 'loading', :html => render_compact_partial(:page) } + return render json: { status: 'loading', html: render_compact_partial(:page) } else @suggestions = results.take(5) - return render :json => { :status => 'suggestions', :html => render_compact_partial(:suggestions) } + return render json: { status: 'suggestions', html: render_compact_partial(:suggestions) } end end # Artist loading failed if @artist.status == 2 - return render :json => { :status => 'fail', :html => render_compact_partial(:fail) } + return render json: { status: 'fail', html: render_compact_partial(:fail) } end render json: { status: @artist.status_str, artist: @artist, html: render_compact_partial(:page) }, include: {albums: {include: {tracks: {}}}} @@ -47,7 +47,7 @@ private end def queue_loading artist_name, mbid - @artist = Artist.create( :name => artist_name, :mbid => mbid, :status => 0 ) + @artist = Artist.create( name: artist_name, mbid: mbid, status: 0 ) Delayed::Job.enqueue(LoadArtistJob.new(artist_name)) end end