@@ -7,7 +7,7 @@ class PeopleController < ApplicationController before_filter :setup def index - @people = Person.active(params[:page]) + @people = Person.mostly_active(params[:page]) respond_to do |format| format.html app/controllers/people_controller.rb @@ -50,6 +50,7 @@ class Person < ActiveRecord::Base NUM_WALL_COMMENTS = 10 NUM_RECENT = 8 FEED_SIZE = 10 + TIME_AGO_FOR_MOSTLY_ACTIVE = 1.month.ago ACCEPTED_AND_ACTIVE = [%(status = #{Connection::ACCEPTED} AND deactivated = ? AND (email_verified IS NULL OR email_verified = ?)), @@ -110,6 +111,14 @@ class Person < ActiveRecord::Base :conditions => conditions_for_active) end + # Return the people who are 'mostly' active. + # People are mostly active if they have logged in recently enough. + def mostly_active(page = 1) + paginate(:all, :page => page, + :per_page => RASTER_PER_PAGE, + :conditions => conditions_for_mostly_active) + end + # Return *all* the active users. def all_active find(:all, :conditions => conditions_for_active) @@ -397,10 +406,22 @@ class Person < ActiveRecord::Base crypted_password.blank? || !password.blank? || !verify_password.nil? end - # Return the conditions for a user to be active. - def self.conditions_for_active - [%(deactivated = ? AND - (email_verified IS NULL OR email_verified = ?)), - false, true] + class << self + + # Return the conditions for a user to be active. + def conditions_for_active + [%(deactivated = ? AND + (email_verified IS NULL OR email_verified = ?)), + false, true] + end + + # Return the conditions for a user to be 'mostly' active. + def conditions_for_mostly_active + [%(deactivated = ? AND + (email_verified IS NULL OR email_verified = ?) AND + (last_logged_in_at IS NOT NULL AND + last_logged_in_at >= ?)), + false, true, TIME_AGO_FOR_MOSTLY_ACTIVE] + end end end app/models/person.rb @@ -337,6 +337,34 @@ describe Person do @person.should be_active end end + + describe "mostly active" do + it "should include a recently logged-in person" do + Person.mostly_active.should contain(@person) + end + + it "should not include a deactivated person" do + @person.toggle!(:deactivated) + Person.mostly_active.should_not contain(@person) + end + + it "should not include an email unverified person" do + enable_email_notifications + @person.email_verified = false; @person.save! + Person.mostly_active.should_not contain(@person) + end + + it "should not include a person who has never logged in" do + @person.last_logged_in_at = nil; @person.save + Person.mostly_active.should_not contain(@person) + end + + it "should not include a person who logged in too long ago" do + @person.last_logged_in_at = Person::TIME_AGO_FOR_MOSTLY_ACTIVE - 1 + @person.save + Person.mostly_active.should_not contain(@person) + end + end describe "admin" do spec/models/person_spec.rb f65d99d95a4150b00b12d0d5109452712533df93 Michael Hartl michael@michaelhartl.com http://github.com/piotrj/insoshi/commit/779e5a266ed875e2d447a9a6ca73947c15b5471a 779e5a266ed875e2d447a9a6ca73947c15b5471a 2008-05-22T13:56:35-07:00 2008-05-22T13:56:35-07:00 Added mostly_active category on Steve Bristol's recommendation 1bc6e19ec4f6539b0c9ff720866e97314e90971c Michael Hartl michael@michaelhartl.com