codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-12-18 03:25:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

correct emergency regeneration in the controller

Browse source
This commit is contained in:
Sam 2015-05-06 07:33:32 +10:00
parent 2625c3bb9a
commit 0f53fc8328
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/stylesheets_controller.rb
View file

@ -5,6 +5,7 @@ class StylesheetsController < ApplicationController
target,digest = params[:name].split("_") target,digest = params[:name].split("_")
digest_orig = digest
digest = "_" + digest if digest digest = "_" + digest if digest
# Security note, safe due to route constraint # Security note, safe due to route constraint
@ -13,7 +14,7 @@ class StylesheetsController < ApplicationController
unless File.exist?(location) unless File.exist?(location)
query = StylesheetCache.where(target: target) query = StylesheetCache.where(target: target)
if digest if digest
query = query.where(digest: digest) query = query.where(digest: digest_orig)
else else
query = query.order('id desc') query = query.order('id desc')
end end

4
app/models/stylesheet_cache.rb
View file

@ -12,7 +12,9 @@ class StylesheetCache < ActiveRecord::Base
count = StylesheetCache.count count = StylesheetCache.count
if count > MAX_TO_KEEP if count > MAX_TO_KEEP
remove_lower = StylesheetCache.limit(MAX_TO_KEEP) remove_lower = StylesheetCache
.where(target: target)
.limit(MAX_TO_KEEP)
.order('id desc') .order('id desc')
.pluck(:id) .pluck(:id)
.last .last

2
spec/models/stylesheet_cache_spec.rb
View file

@ -5,7 +5,7 @@ describe StylesheetCache do
describe "add" do describe "add" do
it "correctly cycles once MAX_TO_KEEP is hit" do it "correctly cycles once MAX_TO_KEEP is hit" do
(StylesheetCache::MAX_TO_KEEP + 1).times do |i| (StylesheetCache::MAX_TO_KEEP + 1).times do |i|
StylesheetCache.add(i.to_s, "d" + i.to_s, "c" + i.to_s) StylesheetCache.add("a", "d" + i.to_s, "c" + i.to_s)
end end
expect(StylesheetCache.count).to eq StylesheetCache::MAX_TO_KEEP expect(StylesheetCache.count).to eq StylesheetCache::MAX_TO_KEEP