FIX: actually compute top score for 'older' periods

app/models/top_topic.rb

@@ -2,37 +2,23 @@ class TopTopic < ActiveRecord::Base
 
   belongs_to :topic
 
-  def self.periods
-    @periods ||= [:yearly, :monthly, :weekly, :daily]
-  end
-
-  def self.sort_orders
-    @sort_orders ||= [:posts, :views, :likes]
-  end
-
   # The top topics we want to refresh often
   def self.refresh_daily!
     transaction do
       remove_invisible_topics
       add_new_visible_topics
 
-      TopTopic.sort_orders.each do |sort|
+      update_counts_and_compute_scores_for(:daily)
-        TopTopic.send("update_#{sort}_count_for", :daily)
-      end
-      TopTopic.compute_top_score_for(:daily)
     end
   end
 
   # We don't have to refresh these as often
   def self.refresh_older!
-    older = TopTopic.periods - [:daily]
+    older_periods = TopTopic.periods - [:daily]
 
     transaction do
-      older.each do |period|
+      older_periods.each do |period|
-        TopTopic.sort_orders.each do |sort|
+        update_counts_and_compute_scores_for(period)
-          TopTopic.send("update_#{sort}_count_for", :daily)
-        end
-        TopTopic.compute_top_score_for(:daily)
       end
     end
   end
@@ -42,6 +28,23 @@ class TopTopic < ActiveRecord::Base
     TopTopic.refresh_older!
   end
 
+  private
+
+    def self.periods
+      @@periods ||= [:yearly, :monthly, :weekly, :daily].freeze
+    end
+
+    def self.sort_orders
+      @@sort_orders ||= [:posts, :views, :likes].freeze
+    end
+
+    def self.update_counts_and_compute_scores_for(period)
+      TopTopic.sort_orders.each do |sort|
+        TopTopic.send("update_#{sort}_count_for", period)
+      end
+      TopTopic.compute_top_score_for(period)
+    end
+
     def self.remove_invisible_topics
       exec_sql("WITH category_definition_topic_ids AS (
                   SELECT COALESCE(topic_id, 0) AS id FROM categories