From 3c4554f5dce32c966a2bc375b5779e6a9d1bbd01 Mon Sep 17 00:00:00 2001 From: Daniela Soares Feitosa Date: Sat, 21 Apr 2012 02:49:46 -0300 Subject: [PATCH] Replacing Regexp by string on expiring blocks caches --- app/models/recent_documents_block.rb | 4 ---- app/sweepers/block_sweeper.rb | 11 +++++------ 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/app/models/recent_documents_block.rb b/app/models/recent_documents_block.rb index 7b3fc7f..6173fac 100644 --- a/app/models/recent_documents_block.rb +++ b/app/models/recent_documents_block.rb @@ -32,8 +32,4 @@ class RecentDocumentsBlock < Block end end - def timeout - 2.months - end - end diff --git a/app/sweepers/block_sweeper.rb b/app/sweepers/block_sweeper.rb index fc8f0c0..41ae8a4 100644 --- a/app/sweepers/block_sweeper.rb +++ b/app/sweepers/block_sweeper.rb @@ -5,15 +5,14 @@ class BlockSweeper < ActiveRecord::Observer class << self include SweeperHelper - def cache_key_regex(block) + # Expire block's all languages cache + def expire_block(block) regex = '-[a-z]*$' clean_ck = block.cache_key.gsub(/#{regex}/,'') - %r{#{clean_ck+regex}} - end - # Expire block's all languages cache - def expire_block(block) - expire_timeout_fragment(cache_key_regex(block)) + Noosfero.locales.keys.each do |locale| + expire_timeout_fragment("#{clean_ck}-#{locale}") + end end def expire_blocks(blocks) -- libgit2 0.21.2