@@ -50,10 +50,11 @@ class Person < ActiveRecord::Base NUM_WALL_COMMENTS = 10 NUM_RECENT = 8 FEED_SIZE = 10 - ACCEPTED_AND_ACTIVE = [%(status = #{Connection::ACCEPTED} AND + TIME_AGO_FOR_MOSTLY_ACTIVE = 1.month.ago + ACCEPTED_AND_ACTIVE = [%(status = ? AND deactivated = ? AND (email_verified IS NULL OR email_verified = ?)), - false, true] + Connection::ACCEPTED, false, true] has_one :blog has_many :email_verifications @@ -68,7 +69,7 @@ class Person < ActiveRecord::Base has_many :photos, :dependent => :destroy, :order => 'created_at' has_many :requested_contacts, :through => :connections, :source => :contact, - :conditions => "status = #{Connection::REQUESTED}" + :conditions => ["status = ?", Connection::REQUESTED] with_options :class_name => "Message", :dependent => :destroy, :order => 'created_at DESC' do |person| person.has_many :_sent_messages, :foreign_key => "sender_id", @@ -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) @@ -376,7 +385,7 @@ class Person < ActiveRecord::Base end def log_activity_description_changed - unless @old_description == description + unless @old_description == description or description.blank? add_activities(:item => self, :person => self) end end @@ -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 @@ -1,5 +1,14 @@ <%- unless @person.recent_activity.empty? -%> <h2>Recent Activity</h2> + + + <%- unless @person.last_logged_in_at.nil? or current_person?(@person) -%> + <p class="meta"> + <%= @person.name %> last logged in + <%= time_ago_in_words(@person.last_logged_in_at) %> ago + </p> + <%- end -%> + <ul class="list activity full"> <%= render :partial => 'shared/activity', :collection => @person.recent_activity, app/views/people/_recent_activity.html.erb @@ -1,5 +1,9 @@ <%- column_div :type => :primary do -%> + <%- if global_prefs.app_name.blank? -%> <h2>Sign up</h2> + <%- else -%> + <h2>Sign up for <%= global_prefs.app_name %></h2> + <%- end -%> <%= error_messages_for :person %> app/views/people/new.html.erb @@ -1,6 +1,9 @@ <%- column_div :type => :primary do -%> <div class="profile vcard"> <h2>Profile: <span class="fn n"><%= h @person.name %></span></h2> + <%- if admin? and not @person.active? -%> + <p class="error">This person is not active</p> + <%- end -%> <%- if current_person?(@person) -%> <%- if current_person.description.blank? -%> <div class="error"> app/views/people/show.html.erb @@ -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 0e29f505c4c978efa533d91fb16c79c96cb1f74f f4b426917037f93bdf9b93e6a0b84c436fa90865 Pavel Valodzka pavel@valodzka.name http://github.com/valodzka/insoshi/commit/251c0b16712342f4c95cbb2bd9be21d9fa993042 251c0b16712342f4c95cbb2bd9be21d9fa993042 2008-05-23T15:34:09-07:00 2008-05-23T15:34:09-07:00 Merge branch 'master' into valodzka 9d1226c5ce88e7f46e5f8261d559621afa067d7a Pavel Valodzka pavel@valodzka.name