Commit 2d057da1 authored by Tim Zallmann's avatar Tim Zallmann

Turned cache_privately? into cache_publicly?

Also removed unnecessary comment
parent 86cda964
......@@ -29,12 +29,12 @@ def create
def show
return render_404 unless uploader&.exists?
if cache_privately?
expires_in 0.seconds, must_revalidate: true, private: true
else
if cache_publicly?
# We need to reset caching from the applications controller to get rid of the no-store value
headers['Cache-Control'] = ''
expires_in 5.minutes, public: true, must_revalidate: false
else
expires_in 0.seconds, must_revalidate: true, private: true
end
disposition = uploader.image_or_video? ? 'inline' : 'attachment'
......@@ -120,8 +120,8 @@ def find_model
nil
end
def cache_privately?
true
def cache_publicly?
false
end
def model
......
......@@ -70,8 +70,8 @@ def render_unauthorized
end
end
def cache_privately?
true unless User === model || Appearance === model
def cache_publicly?
User === model || Appearance === model
end
def upload_model_class
......
......@@ -14,7 +14,6 @@
shared_examples 'content publicly cached' do
it 'ensures content is publicly cached' do
# Fixed in newer versions of ActivePack, it will only output a single `private`.
expect(subject['Cache-Control']).to eq('max-age=300, public')
end
end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment