Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

Browse source
This commit is contained in:
Jenkins 2018-01-04 23:17:11 +00:00
commit c69a23ae46
29 changed files with 246 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/controllers/application_controller.rb
View file

@ -198,11 +198,24 @@ class ApplicationController < ActionController::Base
end
def render_cached_json(cache_key, **options)
options[:expires_in] ||= 3.minutes
options[:public] ||= true
cache_key = cache_key.join(':') if cache_key.is_a?(Enumerable)
content_type = options.delete(:content_type) || 'application/json'
data = Rails.cache.fetch(cache_key, { raw: true }.merge(options)) do
yield.to_json
end
expires_in options[:expires_in], public: true
render json: data
expires_in options[:expires_in], public: options[:public]
render json: data, content_type: content_type
end
def set_cache_headers
response.headers['Vary'] = 'Accept'
end
def skip_session!
request.session_options[:skip] = true
end
end