cafe-grader-web Commit - r295:4f81b9ab5d77

r295:4f81b9ab5d77 - Sun, 28 Mar 2010 14:31:57 - 11 files changed: 170 inserted, 18 deleted

db/migrate/20100328123325_add_forced_logout_to_user_contest_stat.rb created 644 ¶ +9

			@@ -0,0 +1,9
		1	+ class AddForcedLogoutToUserContestStat < ActiveRecord::Migration
		2	+ def self.up
		3	+ add_column :user_contest_stats, :forced_logout, :boolean
		4	+ end
		5	+
		6	+ def self.down
		7	+ remove_column :user_contest_stats, :forced_logout, :boolean
		8	+ end
		9	+ end

spec/controllers/user_admin_controller_spec.rb created 644 ¶ +73

			@@ -0,0 +1,73
		1	+ require 'delorean'
		2	+
		3	+ require File.dirname(__FILE__) + '/../spec_helper'
		4	+ require File.dirname(__FILE__) + '/../config_spec_helper'
		5	+
		6	+ describe UserAdminController, "when manage contest" do
		7	+
		8	+ include ConfigSpecHelperMethods
		9	+
		10	+ fixtures :users
		11	+ fixtures :problems
		12	+ fixtures :contests
		13	+ fixtures :roles
		14	+
		15	+ def change_users_contest_to(user_login_list, contest, reset_timer=false)
		16	+ post_data = {
		17	+ :contest => {:id => contest.id},
		18	+ :operation => 'assign',
		19	+ :login_list => user_login_list
		20	+ }
		21	+ post_data[:reset_timer] = true if reset_timer
		22	+ post 'manage_contest', post_data, {:user_id => @admin_user.id}
		23	+ end
		24	+
		25	+ before(:each) do
		26	+ @admin_user = users(:mary)
		27	+ @contest_b = contests(:contest_b)
		28	+ @james = users(:james)
		29	+ @jack = users(:jack)
		30	+
		31	+ set_contest_time_limit('3:00')
		32	+ set_indv_contest_mode
		33	+ end
		34	+
		35	+ it "should allow admin to see contest management page" do
		36	+ get 'contest_management', {}, {:user_id => @admin_user.id}
		37	+
		38	+ response.should render_template 'user_admin/contest_management'
		39	+ end
		40	+
		41	+ it "should change users' contest" do
		42	+ change_users_contest_to("james\njack", @contest_b)
		43	+ response.should redirect_to :action => 'contest_management'
		44	+
		45	+ @james.contests(true).should include @contest_b
		46	+ @jack.contests(true).should_not include @contest_a
		47	+ end
		48	+
		49	+ it "should reset users' timer when their contests change" do
		50	+ @james.update_start_time
		51	+
		52	+ Delorean.time_travel_to(190.minutes.since) do
		53	+ @james.contest_finished?.should be_true
		54	+
		55	+ change_users_contest_to("james", @contest_b, true)
		56	+
		57	+ @james.contest_finished?.should be_false
		58	+ end
		59	+ end
		60	+
		61	+ it "should set forced_logout flag for users when their contests change" do
		62	+ @james.update_start_time
		63	+
		64	+ Delorean.time_travel_to(190.minutes.since) do
		65	+ @james.contest_finished?.should be_true
		66	+
		67	+ change_users_contest_to("james", @contest_b, true)
		68	+
		69	+ @james.contest_stat(true).forced_logout.should be_true
		70	+ end
		71	+ end
		72	+
		73	+ end

app/controllers/application_controller.rb ¶ +12 -2

                     return false
                   end
-            -     #Configuration.reload
                   # check if run in single user mode
-            -     if (Configuration[SINGLE_USER_MODE_CONF_KEY])
+            +     if Configuration[SINGLE_USER_MODE_CONF_KEY]
                     user = User.find(session[:user_id])
                     if user==nil or (not user.admin?)
                       redirect_to :controller => 'main', :action => 'login'
                       return false
                     end
+            +       return true
                   end
+            +     if Configuration.multicontests?
+            +       user = User.find(session[:user_id])
+            +       begin
+            +         if user.contest_stat(true).forced_logout
+            +           flash[:notice] = 'You have been automatically logged out.'
+            +           redirect_to :controller => 'main', :action => 'index'
+            +         end
+            +       rescue
+            +       end
+            +     end
                   return true
                 end

app/controllers/login_controller.rb ¶ +12

                   if user = User.authenticate(params[:login], params[:password])
                     session[:user_id] = user.id
                     session[:admin] = user.admin?
+            +
+            +       # clear forced logout flag for multicontests contest change
+            +       if Configuration.multicontests?
+            +         contest_stat = user.contest_stat
+            +         if contest_stat.respond_to? :forced_logout
+            +           if contest_stat.forced_logout
+            +             contest_stat.forced_logout = false
+            +             contest_stat.save
+            +           end
+            +         end
+            +       end
+            +
                     redirect_to :controller => 'main', :action => 'list'
                   else
                     flash[:notice] = 'Wrong password'

app/controllers/main_controller.rb ¶ +7

                   if not session[:user_id]
                     render :text => 'Access forbidden', :status => 403
                   end
+            +
+            +     if Configuration.multicontests?
+            +       user = User.find(session[:user_id])
+            +       if user.contest_stat.forced_logout
+            +         render :text => 'Access forbidden', :status => 403
+            +       end
+            +     end
                 end
               end

app/controllers/user_admin_controller.rb ¶ +13 -9

                   end
                   note = []
-            -     user_ids = {}
+            +     users = []
                   lines.split("\n").each do |line|
                     user = User.find_by_login(line.chomp)
                     if user
                         user.contests = [contest]
                       end
-            -         user.contest_stat.destroy if params[:reset_timer]
+            +         if params[:reset_timer]
+            +           user.contest_stat.forced_logout = true
+            +           user.contest_stat.reset_timer_and_save
+            +         end
                       note << user.login
-            -         user_ids[user.id] = true
+            +         users << user
                     end
                   end
                   if params[:reset_timer]
-            -       logout_users(user_ids)
+            +       logout_users(users)
                   end
                   flash[:notice] = 'User(s) ' + note.join(', ') +
                 end
-            -   def logout_users(user_ids)
-            -     sessions = ActiveRecord::SessionStore::Session.find(:all, :conditions => ["updated_at >= ?", 60.minutes.ago])
-            -     sessions.each do |session|
-            -       if user_ids.has_key? session.data[:user_id]
-            -         session.destroy
+            +   def logout_users(users)
+            +     users.each do |user|
+            +       contest_stat = user.contest_stat(true)
+            +       if contest_stat and !contest_stat.forced_logout
+            +         contest_stat.forced_logout = true
+            +         contest_stat.save
                     end
                   end
                 end

app/models/user.rb ¶ +4 -4

                     if time_limit == nil
                       return nil
                     end
-            -       if contest_stat==nil
+            +       if contest_stat==nil or contest_stat.started_at==nil
                       return (Time.now.gmtime + time_limit) - Time.now.gmtime
                     else
                       finish_time = contest_stat.started_at + time_limit
                 def update_start_time
                   stat = self.contest_stat
-            -     if stat == nil
-            -       stat = UserContestStat.new(:user => self,
-            -                                  :started_at => Time.now.gmtime)
+            +     if stat == nil or stat.started_at == nil
+            +       stat ||= UserContestStat.new(:user => self)
+            +       stat.started_at = Time.now.gmtime
                     stat.save
                   end
                 end

app/models/user_contest_stat.rb ¶ +5

                 belongs_to :user
+            +   def reset_timer_and_save
+            +     self.started_at = nil
+            +     save
               end
+            +
+            + end

db/schema.rb ¶ +2 -1

               #
               # It's strongly recommended to check this file into your version control system.
-            - ActiveRecord::Schema.define(:version => 20100303095700) do
+            + ActiveRecord::Schema.define(:version => 20100328123325) do
                 create_table "announcements", :force => true do |t|
                   t.string   "author"
                   t.datetime "started_at"
                   t.datetime "created_at"
                   t.datetime "updated_at"
+            +     t.boolean  "forced_logout"
                 end
                 create_table "users", :force => true do |t|

public/javascripts/announcement_refresh.js ¶ +3 -2

               	    method: 'get',
               	    parameters: { recent: Announcement.mostRecentId },
               	    onSuccess: function(transport) {
-            - 		if(transport.responseText.match(/\S/)!=null) {
+            + 		if((transport.status == 200) &&
+            + 		   (transport.responseText.match(/\S/)!=null)) {
                		    var announcementBody = $("announcementbox-body");
               		    announcementBody.insert({ top: transport.responseText });
               		    var announcementBoxes = $$(".announcementbox");
               		    if(announcementBoxes.length!=0)
               			announcementBoxes[0].show();
+            + 		    Announcement.registerRefreshEventTimer();
               		}
               	    }
               	});
-            - 	Announcement.registerRefreshEventTimer();
                   },
                   registerRefreshEventTimer: function() {

spec/integration/contest_managements_spec.rb ¶ +30

                   set_contest_time_limit('3:00')
                   set_indv_contest_mode
+            +     enable_multicontest
                 end
                 it "should reset users' timer when their contests change" do
                   end
                 end
+            +   it "should force users to log out when their contests change" do
+            +     james_session = open_session
+            +     james_session.extend(MainSessionMethods)
+            +
+            +     james_login_and_get_main_list(james_session)
+            +     james_session.response.should_not have_text(/OVER/)
+            +
+            +     Delorean.time_travel_to(190.minutes.since) do
+            +       james_session.get_main_list
+            +       james_session.response.should have_text(/OVER/)
+            +
+            +       admin_change_users_contest_to("james", @contest_b, true)
+            +
+            +       james_session.get '/main/list'
+            +       james_session.response.should_not render_template 'main/list'
+            +       james_session.should be_redirect
+            +
+            +       Delorean.time_travel_to(200.minutes.since) do
+            +         james_login_and_get_main_list(james_session)
+            +         james_session.response.should_not have_text(/OVER/)
+            +       end
+            +     end
+            +   end
+            +
                 private
                 module MainSessionMethods
                     get '/main/list'
                     assert_template 'main/list'
                   end
+            +
+            +     def get_main_list_and_assert_logout
+            +       get '/main/list'
+            +       assert_redirected_to '/main'
+            +     end
                 end
                 module ContestManagementSessionMethods

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r295:4f81b9ab5d77 - Sun, 28 Mar 2010 14:31:57 - 11 files changed: 170 inserted, 18 deleted

Sign in to your account

Commit r295:4f81b9ab5d77 public

Author

r295:4f81b9ab5d77 - Sun, 28 Mar 2010 14:31:57 - 11 files changed: 170 inserted, 18 deleted

Commit `r295:4f81b9ab5d77` public