Cache power
This commit is contained in:
parent
4c40a928ab
commit
23cf09613d
1
Gemfile
1
Gemfile
|
@ -35,5 +35,6 @@ end
|
|||
|
||||
group :production do
|
||||
gem 'pg'
|
||||
gem 'dalli' # Memcache
|
||||
gem 'uglifier'
|
||||
end
|
|
@ -55,6 +55,7 @@ GEM
|
|||
execjs
|
||||
coffee-script-source (1.1.3)
|
||||
daemons (1.1.4)
|
||||
dalli (1.1.3)
|
||||
delayed_job (2.1.4)
|
||||
activesupport (~> 3.0)
|
||||
daemons
|
||||
|
@ -147,6 +148,7 @@ DEPENDENCIES
|
|||
awesome_print
|
||||
bitmask_attributes
|
||||
coffee-script
|
||||
dalli
|
||||
delayed_job
|
||||
haml
|
||||
heroku
|
||||
|
|
|
@ -15,7 +15,9 @@ class window.Search
|
|||
log "Loading artist page ..."
|
||||
_search.showSpinner()
|
||||
name = name.split(' ').join('+')
|
||||
$.get '/artist/' +name+ '/', (data) ->
|
||||
_ajax.previous_page = "/artist/#{name}/"
|
||||
_ajax.go "/artist/#{name}/"
|
||||
$.get "/artist/#{name}", (data) ->
|
||||
if data.status in ['ok', 'loading']
|
||||
_page.render data
|
||||
_search.hideSpinner()
|
||||
|
|
|
@ -48,5 +48,6 @@ table.stats {
|
|||
|
||||
.vk-like td {
|
||||
padding: 0 !important;
|
||||
border: none;
|
||||
line-height: 12px;
|
||||
}
|
|
@ -10,16 +10,28 @@ class ApplicationController < ActionController::Base
|
|||
end
|
||||
|
||||
def compile_page params
|
||||
@data = params[:data] unless params[:data].nil?
|
||||
compiler = lambda do |params|
|
||||
@data = params[:data].call(&(params[:data].lambda? ? :call : :serialize)) unless params[:data].nil?
|
||||
@status = params[:status] unless params[:status].nil?
|
||||
render json: {
|
||||
{
|
||||
renderer: "unified",
|
||||
data: @data,
|
||||
html: render_compact_partial(params[:partial]),
|
||||
title: params[:title],
|
||||
status: (params[:status] unless params[:status].nil?),
|
||||
callback: (params[:callback] unless params[:callback].nil?)
|
||||
}, include: (params[:include] unless params[:include].nil?)
|
||||
}.to_json.to_s
|
||||
end
|
||||
|
||||
unless params[:cache].nil?
|
||||
data = Rails.cache.fetch(params[:cache_key] || cache_key_for(params[:data]), expires_in: params[:cache]) do
|
||||
compiler.call(params)
|
||||
end
|
||||
else
|
||||
data = compiler.call(params)
|
||||
end
|
||||
|
||||
render text: data, content_type: 'application/json'
|
||||
end
|
||||
|
||||
def get_artist_name_from_query
|
||||
|
@ -28,6 +40,10 @@ class ApplicationController < ActionController::Base
|
|||
|
||||
protected
|
||||
|
||||
def cache_key_for object
|
||||
"#{object.class.to_s.underscore}_#{object.id}"
|
||||
end
|
||||
|
||||
def authorize
|
||||
unless Vkontakte.check(params)
|
||||
render json: { status: 'login failed' }, status: 403
|
||||
|
|
|
@ -20,25 +20,19 @@ class ArtistController < ApplicationController
|
|||
return render json: { status: 'corrected', correct_name: best_match }
|
||||
elsif best_match == artist_name
|
||||
queue_loading(artist_name, results[0][:mbid])
|
||||
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) }
|
||||
end
|
||||
end
|
||||
|
||||
# Artist loading failed
|
||||
if @artist.status == 2
|
||||
return render json: { status: 'fail', html: render_compact_partial(:fail) }
|
||||
end
|
||||
|
||||
cache_for 1.week
|
||||
compile_page(
|
||||
data: @artist.serialize,
|
||||
data: @artist,
|
||||
partial: "artist/page",
|
||||
title: @artist.name,
|
||||
status: @artist.status_str,
|
||||
callback: {object: :player, action: :updateLibrary}
|
||||
callback: {object: :player, action: :updateLibrary},
|
||||
cache: 3.minutes
|
||||
)
|
||||
end
|
||||
|
||||
|
|
|
@ -8,18 +8,22 @@ class PlaylistController < ApplicationController
|
|||
artist = Artist.find_by_name(get_artist_name_from_query)
|
||||
return if artist.nil?
|
||||
|
||||
compiler = lambda do
|
||||
playlist = Playlist.new(name: "#{artist.name}: Last.fm TOP 50", artist: artist, pic_url: artist.pic_url)
|
||||
LastFM::Artist.get_top_tracks(artist: artist.name)["toptracks"]["track"].each do |track|
|
||||
tracks = Track.joins(:album, :artists).where(name: track["name"], "track_artists.artist_id" => artist.id)
|
||||
playlist.playlist_items << PlaylistItem.new(track_id: tracks.first.id) unless tracks.empty?
|
||||
end
|
||||
playlist.serialize
|
||||
end
|
||||
|
||||
cache_for 1.week
|
||||
compile_page(
|
||||
data: playlist.serialize,
|
||||
data: compiler,
|
||||
partial: "playlist/tracks",
|
||||
title: playlist.name,
|
||||
callback: {object: :player, action: :updateLibrary}
|
||||
title: "#{artist.name}: Last.fm TOP 50",
|
||||
callback: {object: :player, action: :updateLibrary},
|
||||
cache: 3.minutes,
|
||||
cache_key: "lastfmtop50_#{artist.id}"
|
||||
)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -18,6 +18,7 @@ class Artist < ActiveRecord::Base
|
|||
self.status = 0
|
||||
save!
|
||||
Delayed::Job.enqueue(LoadArtistJob.new(name))
|
||||
clear_cache
|
||||
end
|
||||
|
||||
def serialize
|
||||
|
@ -32,6 +33,10 @@ class Artist < ActiveRecord::Base
|
|||
}
|
||||
end
|
||||
|
||||
def clear_cache
|
||||
Rails.cache.delete "artist_#{id}"
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def prepare_description
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
.fb-like{ "data-href" => "http://facebook.com/BeatHavenHQ", "data-send" => "false", "data-layout" => "button_count", "data-width" => "100", "data-show-faces" => "false", "data-font" => "lucida grande" }
|
||||
.vk-like
|
||||
%script{ type: "text/javascript" }
|
||||
document.write(VK.Share.button(false, {type: "round", text: "Нравится"}));
|
||||
= "document.write(VK.Share.button(false, {type: \"round\", text: \"#{t('global.like')}\"}));".html_safe
|
||||
|
|
|
@ -27,4 +27,7 @@ Beathaven::Application.configure do
|
|||
|
||||
# Expands the lines which load the assets
|
||||
config.assets.debug = true
|
||||
|
||||
# Storing cache inside app process
|
||||
config.cache_store = :memory_store
|
||||
end
|
||||
|
|
|
@ -37,7 +37,7 @@ Beathaven::Application.configure do
|
|||
# config.logger = SyslogLogger.new
|
||||
|
||||
# Use a different cache store in production
|
||||
# config.cache_store = :mem_cache_store
|
||||
config.cache_store = :dalli_store
|
||||
|
||||
# Enable serving of images, stylesheets, and JavaScripts from an asset server
|
||||
# config.action_controller.asset_host = "http://assets.example.com"
|
||||
|
|
|
@ -11,6 +11,7 @@ en:
|
|||
hello: "Hi there"
|
||||
settings: "Settings"
|
||||
your_ad_here: "Your ad couldn't<br/>be here"
|
||||
like: "Like"
|
||||
|
||||
title:
|
||||
greetings: Greetings
|
||||
|
|
|
@ -11,6 +11,7 @@ ru:
|
|||
hello: "Привет"
|
||||
settings: "Настройки"
|
||||
your_ad_here: "Здесь не могла бы<br/>быть Ваша реклама"
|
||||
like: "Нравится"
|
||||
|
||||
title:
|
||||
greetings: Привет
|
||||
|
|
Loading…
Reference in New Issue