cafe-grader-web Commit - r619:35d86016ce86

cafe-grader-web

Commit `r619:35d86016ce86` public

parent | child

Description:

change find(:xxx) to correct syntax for rails 4

Commit status:

[Not Reviewed]

References:

toRails40

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r619:35d86016ce86 - Tue, 06 Dec 2016 17:01:12 - 26 files changed: 108 inserted, 147 deleted

Gemfile ¶ +1 -1

               source 'https://rubygems.org'
-            - gem 'rails', '~>4.0.0'
+            + gem 'rails', '~>4.1.0'
               gem 'activerecord-session_store'
               gem 'select2-rails'
               # Bundle edge Rails instead:
               # gem 'rails', :git => 'git://github.com/rails/rails.git'
               gem 'mysql2', '~> 0.3.0'
               # Gems used only for assets and not required
               # in production environments by default.
               group :assets do

Gemfile.lock ¶ +48 -42

               GIT
                 remote: https://github.com/sikachu/verification.git
                 revision: e6fe084ce16b7b5a4b1cdfca5374d125fd034a0f
                 specs:
                   verification (1.0.3)
                     actionpack (>= 3.0.0, < 5.0)
                     activesupport (>= 3.0.0, < 5.0)
               GEM
                 remote: https://rubygems.org/
                 specs:
                   ace-rails-ap (4.1.1)
-            -     actionmailer (4.0.13)
+            +     actionmailer (4.1.16)
-            -       actionpack (= 4.0.13)
+            +       actionpack (= 4.1.16)
+            +       actionview (= 4.1.16)
                     mail (~> 2.5, >= 2.5.4)
-            -     actionpack (4.0.13)
+            +     actionpack (4.1.16)
-            -       activesupport (= 4.0.13)
+            +       actionview (= 4.1.16)
-            -       builder (~> 3.1.0)
+            +       activesupport (= 4.1.16)
-            -       erubis (~> 2.7.0)
                     rack (~> 1.5.2)
                     rack-test (~> 0.6.2)
-            -     activemodel (4.0.13)
+            +     actionview (4.1.16)
-            -       activesupport (= 4.0.13)
+            +       activesupport (= 4.1.16)
-            -       builder (~> 3.1.0)
+            +       builder (~> 3.1)
-            -     activerecord (4.0.13)
+            +       erubis (~> 2.7.0)
-            -       activemodel (= 4.0.13)
+            +     activemodel (4.1.16)
-            -       activerecord-deprecated_finders (~> 1.0.2)
+            +       activesupport (= 4.1.16)
-            -       activesupport (= 4.0.13)
+            +       builder (~> 3.1)
-            -       arel (~> 4.0.0)
+            +     activerecord (4.1.16)
-            -     activerecord-deprecated_finders (1.0.4)
+            +       activemodel (= 4.1.16)
+            +       activesupport (= 4.1.16)
+            +       arel (~> 5.0.0)
                   activerecord-session_store (1.0.0)
                     actionpack (>= 4.0, < 5.1)
                     activerecord (>= 4.0, < 5.1)
                     multi_json (~> 1.11, >= 1.11.2)
                     rack (>= 1.5.2, < 3)
                     railties (>= 4.0, < 5.1)
-            -     activesupport (4.0.13)
+            +     activesupport (4.1.16)
                     i18n (~> 0.6, >= 0.6.9)
-            -       minitest (~> 4.2)
+            +       json (~> 1.7, >= 1.7.7)
-            -       multi_json (~> 1.3)
+            +       minitest (~> 5.1)
                     thread_safe (~> 0.1)
-            -       tzinfo (~> 0.3.37)
+            +       tzinfo (~> 1.1)
-            -     arel (4.0.2)
+            +     arel (5.0.1.20140414130214)
-            -     autoprefixer-rails (6.5.2)
+            +     autoprefixer-rails (6.5.3.1)
                     execjs
                   best_in_place (3.0.3)
                     actionpack (>= 3.2)
                     railties (>= 3.2)
                   bootstrap-sass (3.2.0.2)
                     sass (~> 3.2)
                   bootstrap-switch-rails (3.3.3)
                   bootstrap-toggle-rails (2.2.1.0)
-            -     builder (3.1.4)
+            +     builder (3.2.2)
                   coffee-rails (4.2.1)
                     coffee-script (>= 2.2.0)
                     railties (>= 4.0.0, < 5.2.x)
                   coffee-script (2.4.1)
                     coffee-script-source
                     execjs
-            -     coffee-script-source (1.10.0)
+            +     coffee-script-source (1.11.1)
                   concurrent-ruby (1.0.2)
                   diff-lcs (1.2.5)
                   dynamic_form (1.1.4)
                   erubis (2.7.0)
                   execjs (2.7.0)
                   haml (4.0.7)
                     tilt
                   haml-rails (0.9.0)
                     actionpack (>= 4.0.1)
                     activesupport (>= 4.0.1)
                     haml (>= 4.0.6, < 5.0)
                     html2haml (>= 1.0.1)
                     railties (>= 4.0.1)
                   html2haml (2.0.0)
                     erubis (~> 2.7.0)
                     haml (~> 4.0.0)
                     nokogiri (~> 1.6.0)
                     ruby_parser (~> 3.5)
                   i18n (0.7.0)
                   in_place_editing (1.2.0)
                   jquery-countdown-rails (2.0.2)
                   jquery-rails (3.1.4)
                     railties (>= 3.0, < 5.0)
                     thor (>= 0.14, < 2.0)
-            -     jquery-tablesorter (1.22.7)
+            +     jquery-tablesorter (1.23.1)
                     railties (>= 3.2, < 6)
                   jquery-timepicker-addon-rails (1.4.1)
                     railties (>= 3.1)
                   jquery-ui-rails (4.0.3)
                     jquery-rails
                     railties (>= 3.1.0)
                   jquery-ui-sass-rails (4.0.3.0)
                     jquery-rails
                     jquery-ui-rails (= 4.0.3)
                     railties (>= 3.1.0)
+            +     json (1.8.3)
                   mail (2.6.4)
                     mime-types (>= 1.16, < 4)
                   mime-types (3.1)
                     mime-types-data (~> 3.2015)
                   mime-types-data (3.2016.0521)
                   mini_portile2 (2.1.0)
-            -     minitest (4.7.5)
+            +     minitest (5.10.1)
                   momentjs-rails (2.15.1)
                     railties (>= 3.1)
                   multi_json (1.12.1)
                   mysql2 (0.3.21)
                   nokogiri (1.6.8.1)
                     mini_portile2 (~> 2.1.0)
-            -     power_assert (0.3.1)
+            +     power_assert (0.4.1)
                   rack (1.5.5)
                   rack-test (0.6.3)
                     rack (>= 1.0)
-            -     rails (4.0.13)
+            +     rails (4.1.16)
-            -       actionmailer (= 4.0.13)
+            +       actionmailer (= 4.1.16)
-            -       actionpack (= 4.0.13)
+            +       actionpack (= 4.1.16)
-            -       activerecord (= 4.0.13)
+            +       actionview (= 4.1.16)
-            -       activesupport (= 4.0.13)
+            +       activemodel (= 4.1.16)
+            +       activerecord (= 4.1.16)
+            +       activesupport (= 4.1.16)
                     bundler (>= 1.3.0, < 2.0)
-            -       railties (= 4.0.13)
+            +       railties (= 4.1.16)
                     sprockets-rails (~> 2.0)
                   rails_bootstrap_sortable (2.0.1)
                     momentjs-rails (>= 2.8.3)
-            -     railties (4.0.13)
+            +     railties (4.1.16)
-            -       actionpack (= 4.0.13)
+            +       actionpack (= 4.1.16)
-            -       activesupport (= 4.0.13)
+            +       activesupport (= 4.1.16)
                     rake (>= 0.8.7)
                     thor (>= 0.18.1, < 2.0)
-            -     rake (11.3.0)
+            +     rake (12.0.0)
                   rdiscount (2.2.0.1)
-            -     rouge (2.0.6)
+            +     rouge (2.0.7)
                   rspec-collection_matchers (1.1.2)
                     rspec-expectations (>= 2.99.0.beta1)
                   rspec-core (2.99.2)
                   rspec-expectations (2.99.2)
                     diff-lcs (>= 1.1.3, < 2.0)
                   rspec-mocks (2.99.4)
                   rspec-rails (2.99.0)
                     actionpack (>= 3.0)
                     activemodel (>= 3.0)
                     activesupport (>= 3.0)
                     railties (>= 3.0)
                     rspec-collection_matchers
                     sprockets-rails (>= 2.0, < 4.0)
                     tilt (>= 1.1, < 3)
                   select2-rails (4.0.3)
                     thor (~> 0.14)
                   sexp_processor (4.7.0)
                   sprockets (3.7.0)
                     concurrent-ruby (~> 1.0)
                     rack (> 1, < 3)
                   sprockets-rails (2.3.3)
                     actionpack (>= 3.0)
                     activesupport (>= 3.0)
                     sprockets (>= 2.8, < 4.0)
-            -     test-unit (3.2.2)
+            +     test-unit (3.2.3)
                     power_assert
-            -     thor (0.19.1)
+            +     thor (0.19.4)
                   thread_safe (0.3.5)
                   tilt (2.0.5)
-            -     tzinfo (0.3.52)
+            +     tzinfo (1.2.2)
-            -     uglifier (3.0.3)
+            +       thread_safe (~> 0.1)
+            +     uglifier (3.0.4)
                     execjs (>= 0.3.0, < 3)
                   will_paginate (3.0.12)
               PLATFORMS
                 ruby
               DEPENDENCIES
                 ace-rails-ap
                 activerecord-session_store
                 autoprefixer-rails
                 best_in_place (~> 3.0.1)
                 bootstrap-sass (~> 3.2.0)
                 dynamic_form
                 haml
                 haml-rails
                 in_place_editing
                 jquery-countdown-rails
                 jquery-rails
                 jquery-tablesorter
                 jquery-timepicker-addon-rails
                 jquery-ui-sass-rails
                 mail
                 momentjs-rails
                 mysql2 (~> 0.3.0)
-            -   rails (~> 4.0.0)
+            +   rails (~> 4.1.0)
                 rails_bootstrap_sortable
                 rdiscount
                 rouge
                 rspec-rails (~> 2.99.0)
                 sass-rails
                 select2-rails
                 test-unit
                 uglifier
                 verification!
                 will_paginate (~> 3.0.7)
               BUNDLED WITH

app/controllers/announcements_controller.rb ¶ +1 -2

               class AnnouncementsController < ApplicationController
                 before_filter :admin_authorization
                 in_place_edit_for :announcement, :published
                 # GET /announcements
                 # GET /announcements.xml
                 def index
-            -     @announcements = Announcement.find(:all,
+            +     @announcements = Announcement.order(created_at: :desc)
-            -                                        :order => "created_at DESC")
                   respond_to do |format|
                     format.html # index.html.erb
                     format.xml  { render :xml => @announcements }
                   end
                 end
                 # GET /announcements/1
                 # GET /announcements/1.xml
                 def show
                   @announcement = Announcement.find(params[:id])

app/controllers/application_controller.rb ¶ +1 -1

                   flash[:notice] = 'You are not authorized to view the page you requested'
                   redirect_to :controller => 'main', :action => 'login'
                 end
                 # Returns the current logged-in user (if any).
                 def current_user
                   return nil unless session[:user_id]
                   @current_user ||= User.find(session[:user_id])
                 end
                 def admin_authorization
                   return false unless authenticate
-            -     user = User.find(session[:user_id], :include => ['roles'])
+            +     user = User.includes(:roles).find(session[:user_id])
                   unless user.admin?
                     unauthorized_redirect
                     return false
                   end
                   return true
                 end
                 def authorization_by_roles(allowed_roles)
                   return false unless authenticate
                   user = User.find(session[:user_id])
                   unless user.roles.detect { |role| allowed_roles.member?(role.name) }
                     unauthorized_redirect

app/controllers/configurations_controller.rb ¶ +1 -2

               class ConfigurationsController < ApplicationController
                 before_filter :authenticate
                 before_filter { |controller| controller.authorization_by_roles(['admin'])}
                 def index
-            -     @configurations = GraderConfiguration.find(:all,
+            +     @configurations = GraderConfiguration.order(:key)
-            -                                          :order => '`key`')
                   @group = GraderConfiguration.pluck("grader_configurations.key").map{ |x| x[0...(x.index('.'))] }.uniq.sort
                 end
                 def reload
                   GraderConfiguration.reload
                   redirect_to :action => 'index'
                 end
                 def update
                   @config = GraderConfiguration.find(params[:id])
                   User.clear_last_login if @config.key == GraderConfiguration::MULTIPLE_IP_LOGIN_KEY and @config.value == 'true' and params[:grader_configuration][:value] == 'false'
                   respond_to do |format|

app/controllers/contest_management_controller.rb ¶ +2 -2

                 before_filter :admin_authorization
                 def index
                   @num_contests = Contest.count()
                 end
                 def user_stat
                   if not GraderConfiguration.indv_contest_mode?
                     redirect_to :action => 'index' and return
                   end
-            -     @users = User.find(:all)
+            +     @users = User.all
                   @start_times = {}
-            -     UserContestStat.find(:all).each do |stat|
+            +     UserContestStat.all.each do |stat|
                     @start_times[stat.user_id] = stat.started_at
                   end
                 end
                 def clear_stat
                   user = User.find(params[:id])
                   if user.contest_stat!=nil
                     user.contest_stat.destroy
                   end
                   redirect_to :action => 'user_stat'
                 end

app/controllers/graders_controller.rb ¶ +3 -5

                        :redirect_to => {:action => 'index'}
                 def index
                   redirect_to :action => 'list'
                 end
                 def list
                   @grader_processes = GraderProcess.find_running_graders
                   @stalled_processes = GraderProcess.find_stalled_process
                   @terminated_processes = GraderProcess.find_terminated_graders
-            -     @last_task = Task.find(:first,
+            +     @last_task = Task.last
-            -                            :order => 'created_at DESC')
+            +     @last_test_request = TestRequest.last
-            -     @last_test_request = TestRequest.find(:first,
-            -                                           :order => 'created_at DESC')
                   @submission = Submission.order("id desc").limit(20)
                   @backlog_submission = Submission.where('graded_at is null')
                 end
                 def clear
                   grader_proc = GraderProcess.find(params[:id])
                   grader_proc.destroy if grader_proc!=nil
                   redirect_to :action => 'list'
                 end
                 def clear_terminated
                   GraderProcess.find_terminated_graders.each do |p|
                     p.destroy
                   end
                   redirect_to :action => 'list'
                 end
                 def clear_all
-            -     GraderProcess.find(:all).each do |p|
+            +     GraderProcess.all.each do |p|
                     p.destroy
                   end
                   redirect_to :action => 'list'
                 end
                 def view
                   if params[:type]=='Task'
                     redirect_to :action => 'task', :id => params[:id]
                   else
                     redirect_to :action => 'test_request', :id => params[:id]
                   end
                 end

app/controllers/main_controller.rb ¶ +3 -3

                   flash.now[:notice] = saved_notice
                   # EXPERIMENT:
                   # Hide login if in single user mode and the url does not
                   # explicitly specify /login
                   #
                   # logger.info "PATH: #{request.path}"
                   # if GraderConfiguration['system.single_user_mode'] and
                   #     request.path!='/main/login'
                   #   @hidelogin = true
                   # end
-            -     @announcements = Announcement.find_for_frontpage
+            +     @announcements = Announcement.frontpage
                   render :action => 'login', :layout => 'empty'
                 end
                 def list
                   prepare_list_information
                 end
                 def help
                   @user = User.find(session[:user_id])
                 end
                 def submit
                     user.update_start_time
                     redirect_to :action => 'list'
                   else
                     @contests = user.contests
                     @user = user
                   end
                 end
                 protected
                 def prepare_announcements(recent=nil)
                   if GraderConfiguration.show_tasks_to?(@user)
-            -       @announcements = Announcement.find_published(true)
+            +       @announcements = Announcement.published(true)
                   else
-            -       @announcements = Announcement.find_published
+            +       @announcements = Announcement.published
                   end
                   if recent!=nil
                     recent_id = recent.to_i
                     @announcements = @announcements.find_all { |a| a.id > recent_id }
                   end
                 end
                 def prepare_list_information
                   @user = User.find(session[:user_id])
                   if not GraderConfiguration.multicontests?
                     @problems = @user.available_problems
                   else

app/controllers/problems_controller.rb ¶ +4 -6

               class ProblemsController < ApplicationController
                 before_filter :authenticate, :authorization
                 in_place_edit_for :problem, :name
                 in_place_edit_for :problem, :full_name
                 in_place_edit_for :problem, :full_score
                 def index
-            -     @problems = Problem.find(:all, :order => 'date_added DESC')
+            +     @problems = Problem.order(date_added: :desc)
                 end
                 # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
                 verify :method => :post, :only => [ :create, :quick_create,
                                                     :do_manage,
                                                     :do_import,
                                                   ],
                        :redirect_to => { :action => :index }
                 def show
                   @problem = Problem.find(params[:id])
                 end
                   end
                 end
                 def toggle_test
                   @problem = Problem.find(params[:id])
                   @problem.update_attributes(test_allowed: !(@problem.test_allowed?) )
                   respond_to do |format|
                     format.js { }
                   end
                 end
                 def turn_all_off
-            -     Problem.find(:all,
+            +     Problem.available.all.each do |problem|
-            -                  :conditions => "available = 1").each do |problem|
                     problem.available = false
                     problem.save
                   end
                   redirect_to action: :index
                 end
                 def turn_all_on
-            -     Problem.find(:all,
+            +     Problem.where.not(available: true).each do |problem|
-            -                  :conditions => "available = 0").each do |problem|
                     problem.available = true
                     problem.save
                   end
                   redirect_to action: :index
                 end
                 def stat
                   @problem = Problem.find(params[:id])
                   unless @problem.available or session[:admin]
                     redirect_to :controller => 'main', :action => 'list'
                     return
                   end
                   @submissions.find_each do |sub|
                     d = (DateTime.now.in_time_zone - sub.submitted_at) / 24 / 60 / 60
                     @histogram[:data][d.to_i] += 1 if d < range
                     user[sub.user_id] = [user[sub.user_id], ((sub.try(:points) || 0) >= @problem.full_score) ? 1 : 0].max
                   end
                   @histogram[:summary][:max] = [@histogram[:data].max,1].max
                   @summary = { attempt: user.count, solve: 0 }
                   user.each_value { |v| @summary[:solve] += 1 if v == 1 }
                 end
                 def manage
-            -     @problems = Problem.find(:all, :order => 'date_added DESC')
+            +     @problems = Problem.order(date_added: :desc)
                 end
                 def do_manage
                   if params.has_key? 'change_date_added'
                     change_date_added
                   elsif params.has_key? 'add_to_contest'
                     add_to_contest
                   elsif params.has_key? 'enable_problem'
                     set_available(true)
                   elsif params.has_key? 'disable_problem'
                     set_available(false)
                   end

app/controllers/report_controller.rb ¶ +5 -9

               require 'csv'
               class ReportController < ApplicationController
                 before_filter :authenticate
                 before_filter :admin_authorization, only: [:login_stat,:submission_stat, :stuck, :cheat_report, :cheat_scruntinize, :show_max_score]
                 before_filter(only: [:problem_hof]) { |c|
                   return false unless authenticate
-            -     if GraderConfiguration["right.user_view_submission"]
+            +     admin_authorization unless GraderConfiguration["right.user_view_submission"]
-            -       return true;
-            -     end
-            -     admin_authorization
                 }
                 def max_score
                 end
                 def current_score
-            -     @problems = Problem.find_available_problems
+            +     @problems = Problem.available_problems
                   @users = User.includes(:contests).includes(:contest_stat).where(enabled: true)
                   @scorearray = calculate_max_score(@problems, @users,0,0,true)
                   #rencer accordingly
                   if params[:button] == 'download' then
                     csv = gen_csv_from_scorearray(@scorearray,@problems)
                     send_data csv, filename: 'max_score.csv'
                   else
                     #render template: 'user_admin/user_stat'
                     render 'current_score'
                   end
                 end
                 def show_max_score
                   #process parameters
                   #problems
                   @problems = []
                   params[:problem_id].each do |id|
                     next unless id.strip != ""
                     pid = Problem.find_by_id(id.to_i)
                     @problems << pid if pid
                   end
                   #users
                   @users = if params[:user] == "all" then
-            -                User.find(:all, :include => [:contests, :contest_stat])
+            +                User.includes(:contests).includes(:contest_stat)
                            else
                              User.includes(:contests).includes(:contest_stat).where(enabled: true)
                            end
                   #set up range from param
                   since_id = params.fetch(:from_id, 0).to_i
                   until_id = params.fetch(:to_id, 0).to_i
                   #calculate the routine
                   @scorearray = calculate_max_score(@problems, @users,since_id,until_id)
                   #rencer accordingly
                     send_data csv, filename: 'max_score.csv'
                   else
                     #render template: 'user_admin/user_stat'
                     render 'max_score'
                   end
                 end
                 def score
                   if params[:commit] == 'download csv'
                     @problems = Problem.all
                   else
-            -       @problems = Problem.find_available_problems
+            +       @problems = Problem.available_problems
                   end
-            -     @users = User.includes(:contests, :contest_stat).where(enabled: true) #find(:all, :include => [:contests, :contest_stat]).where(enabled: true)
+            +     @users = User.includes(:contests, :contest_stat).where(enabled: true)
                   @scorearray = Array.new
                   @users.each do |u|
                     ustat = Array.new
                     ustat[0] = u
                     @problems.each do |p|
                       sub = Submission.find_last_by_user_and_problem(u.id,p.id)
                       if (sub!=nil) and (sub.points!=nil) and p and p.full_score
                         ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)]
                       else
                         ustat << [0,false]
                       end
                     end

app/controllers/site_controller.rb ¶ +1 -1

               class SiteController < ApplicationController
                 before_filter :site_admin_authorization, :except => 'login'
                 def login
                   # Site administrator login
-            -     @countries = Country.find(:all, :include => :sites)
+            +     @countries = Country.includes(:sites).all
                   @country_select = @countries.collect { |c| [c.name, c.id] }
                   @country_select_with_all = [['Any',0]]
                   @countries.each do |country|
                     @country_select_with_all << [country.name, country.id]
                   end
                   @site_select = []
                   @countries.each do |country|
                     country.sites.each do |site|
                       @site_select << ["#{site.name}, #{country.name}", site.id]
                     end

app/controllers/sites_controller.rb ¶ +1 -1

               class SitesController < ApplicationController
                 before_filter :admin_authorization
                 # GET /sites
                 # GET /sites.xml
                 def index
-            -     @sites = Site.find(:all, :order => 'country_id')
+            +     @sites = Site.order(:country_id)
                   respond_to do |format|
                     format.html # index.html.erb
                     format.xml  { render :xml => @sites }
                   end
                 end
                 # GET /sites/1
                 # GET /sites/1.xml
                 def show
                   @site = Site.find(params[:id])

app/controllers/user_admin_controller.rb ¶ +7 -7

                   if params[:page] == 'all'
                     @users = User.all
                     @paginated = false
                   else
                     @users = User.paginate :page => params[:page]
                     @paginated = true
                   end
                   @hidden_columns = ['hashed_password', 'salt', 'created_at', 'updated_at']
                   @contests = Contest.enabled
                 end
                 def active
-            -     sessions = ActiveRecord::SessionStore::Session.find(:all, :conditions => ["updated_at >= ?", 60.minutes.ago])
+            +     sessions = ActiveRecord::SessionStore::Session.where("updated_at >= ?", 60.minutes.ago)
                   @users = []
                   sessions.each do |session|
                     if session.data[:user_id]
                       @users << User.find(session.data[:user_id])
                     end
                   end
                 end
                 def show
                   @user = User.find(params[:id])
                 end
                   end
                 end
                 def destroy
                   User.find(params[:id]).destroy
                   redirect_to :action => 'index'
                 end
                 def user_stat
                   if params[:commit] == 'download csv'
                     @problems = Problem.all
                   else
-            -       @problems = Problem.find_available_problems
+            +       @problems = Problem.available_problems
                   end
-            -     @users = User.includes(:contests, :contest_stat).where(enabled: true) #find(:all, :include => [:contests, :contest_stat]).where(enabled: true)
+            +     @users = User.includes(:contests, :contest_stat).where(enabled: true)
                   @scorearray = Array.new
                   @users.each do |u|
                     ustat = Array.new
                     ustat[0] = u
                     @problems.each do |p|
                       sub = Submission.find_last_by_user_and_problem(u.id,p.id)
                       if (sub!=nil) and (sub.points!=nil) and p and p.full_score
                         ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)]
                       else
                         ustat << [0,false]
                       end
                     end
                   if params[:commit] == 'download csv' then
                     csv = gen_csv_from_scorearray(@scorearray,@problems)
                     send_data csv, filename: 'last_score.csv'
                   else
                     render template: 'user_admin/user_stat'
                   end
                 end
                 def user_stat_max
                   if params[:commit] == 'download csv'
                     @problems = Problem.all
                   else
-            -       @problems = Problem.find_available_problems
+            +       @problems = Problem.available_problems
                   end
-            -     @users = User.find(:all, :include => [:contests, :contest_stat])
+            +     @users = User.includes(:contests).includes(:contest_stat).all
                   @scorearray = Array.new
                   #set up range from param
                   since_id = params.fetch(:since_id, 0).to_i
                   until_id = params.fetch(:until_id, 0).to_i
                   @users.each do |u|
                     ustat = Array.new
                     ustat[0] = u
                     @problems.each do |p|
                       max_points = 0
                       Submission.find_in_range_by_user_and_problem(u.id,p.id,since_id,until_id).each do |sub|
                         max_points = sub.points if sub and sub.points and (sub.points > max_points)
                       end
                   end
                 end
                 def import
                   if params[:file]==''
                     flash[:notice] = 'Error importing no file'
                     redirect_to :action => 'index' and return
                   end
                   import_from_file(params[:file])
                 end
                 def random_all_passwords
-            -     users = User.find(:all)
+            +     users = User.all
                   @prefix = params[:prefix] || ''
                   @non_admin_users = User.find_non_admin_with_prefix(@prefix)
                   @changed = false
                   if request.request_method == 'POST'
                     @non_admin_users.each do |user|
                       password = random_password
                       user.password = password
                       user.password_confirmation = password
                       user.save
                     end
                     @changed = true
                   end
                   if params[:reset_timer]
                     logout_users(users)
                   end
                   flash[:notice] = 'User(s) ' + note.join(', ') +
                     ' were successfully modified.  '
                   redirect_to :action => 'contest_management'
                 end
                 # admin management
                 def admin
-            -     @admins = User.find(:all).find_all {|user| user.admin? }
+            +     @admins = User.all.find_all {|user| user.admin? }
                 end
                 def grant_admin
                   login = params[:login]
                   user = User.find_by_login(login)
                   if user!=nil
                     admin_role = Role.find_by_name('admin')
                     user.roles << admin_role
                   else
                     flash[:notice] = 'Unknown user'
                   end
                   flash[:notice] = 'User added as admins'

app/models/announcement.rb ¶ +5 -11

               class Announcement < ActiveRecord::Base
-            -   def self.find_published(contest_started=false)
+            +   def self.published(contest_started=false)
                   if contest_started
-            -       Announcement.find(:all,
+            +       where(published: true).where(frontpage: false).order(created_at: :desc)
-            -                         :conditions => "(published = 1) AND (frontpage = 0)",
-            -                         :order => "created_at DESC")
                   else
-            -       Announcement.find(:all,
+            +       where(published: true).where(frontpage: false).where(contest_only: false).order(created_at: :desc)
-            -                         :conditions => "(published = 1) AND (frontpage = 0) AND (contest_only = 0)",
-            -                         :order => "created_at DESC")
                   end
                 end
-            -   def self.find_for_frontpage
+            +   def self.frontpage
-            -     Announcement.find(:all,
+            +     where(published: 1).where(frontpage: 1).order(created_at: :desc)
-            -                       :conditions => "(published = 1) AND (frontpage = 1)",
-            -                       :order => "created_at DESC")
                 end
               end

app/models/grader_configuration.rb ¶ +1 -1

                     return val
                   when 'integer'
                     return val.to_i
                   when 'boolean'
                     return (val=='true')
                   end
                 end
                 def self.read_config
                   GraderConfiguration.config_cache = {}
-            -     GraderConfiguration.find(:all).each do |conf|
+            +     GraderConfiguration.all.each do |conf|
                     key = conf.key
                     val = conf.value
                     GraderConfiguration.config_cache[key] = GraderConfiguration.convert_type(val,conf.value_type)
                   end
                 end
                 def self.read_one_key(key)
                   conf = GraderConfiguration.find_by_key(key)
                   if conf
                     return GraderConfiguration.convert_type(conf.value,conf.value_type)
                   else
                     return nil

app/models/grader_process.rb ¶ +4 -13

               class GraderProcess < ActiveRecord::Base
                 def self.find_by_host_and_pid(host,pid)
-            -     return GraderProcess.find(:first,
+            +     return GraderProcess.where(host:host).where(pid: pid).first
-            -                               :conditions => {
-            -                                 :host => host,
-            -                                 :pid => pid
-            -                               })
                 end
                 def self.register(host,pid,mode)
                   grader = GraderProcess.find_by_host_and_pid(host,pid)
                   if grader
                     grader.mode = mode
                     grader.active = nil
                     grader.task_id = nil
                     grader.task_type = nil
                     grader.terminated = false
                     grader.save
                   else
                     grader = GraderProcess.create(:host => host,
                                                   :pid => pid,
                                                   :mode => mode,
                                                   :terminated => false)
                   end
                   grader
                 end
                 def self.find_running_graders
-            -     GraderProcess.find(:all,
+            +     where(terminated: false)
-            -                        :conditions => {:terminated => 0})
                 end
                 def self.find_terminated_graders
-            -     GraderProcess.find(:all,
+            +     where(terminated: true)
-            -                        :conditions => "`terminated`")
                 end
                 def self.find_stalled_process
-            -     GraderProcess.find(:all,
+            +     where(terminated: false).where(active: true).where("updated_at < ?",Time.now.gmtime - GraderProcess.stalled_time)
-            -                        :conditions => ["(`terminated` = 0) AND active AND " +
-            -                                        "(updated_at < ?)",
-            -                                        Time.now.gmtime - GraderProcess.stalled_time])
                 end
                 def report_active(task=nil)
                   self.active = true
                   if task!=nil
                     self.task_id = task.id
                     self.task_type = task.class.to_s
                   else
                     self.task_id = nil
                     self.task_type = nil
                   end
                   self.save

app/models/language.rb ¶ +1 -1

               class Language < ActiveRecord::Base
                 @@languages_by_ext = {}
                 def self.cache_ext_hash
                   @@languages_by_ext = {}
-            -     Language.find(:all).each do |language|
+            +     Language.all.each do |language|
                     language.common_ext.split(',').each do |ext|
                       @@languages_by_ext[ext] = language
                     end
                   end
                 end
                 def self.find_by_extension(ext)
                   if @@languages_by_ext.length == 0
                     Language.cache_ext_hash
                   end
                   if @@languages_by_ext.has_key? ext
                     return @@languages_by_ext[ext]

app/models/message.rb ¶ +2 -4

                 #
                 attr_accessor :replied_messages
                 def self.find_all_sent_by_user(user)
                   messages = user.messages
                   replied_messages = user.replied_messages
                   Message.build_replying_message_hierarchy messages, replied_messages
                   return messages
                 end
                 def self.find_all_system_unreplied_messages
-            -     self.find(:all,
+            +     where('ISNULL(receiver_id) ' +
-            -               :conditions => 'ISNULL(receiver_id) ' +
+            +           'AND (ISNULL(replied) OR replied=0)')
-            -                              'AND (ISNULL(replied) OR replied=0)',
-            -               :order => 'created_at')
                 end
                 def self.build_replying_message_hierarchy(*args)
                   # manually build replies hierarchy (to improve efficiency)
                   all_messages = {}
                   args.each do |collection|
                     collection.each do |m|
                       all_messages[m.id] = m
                       m.replied_messages = []
                     end
                   end

app/models/problem.rb ¶ +4 -3

               class Problem < ActiveRecord::Base
                 belongs_to :description
                 has_and_belongs_to_many :contests, :uniq => true
                 has_many :test_pairs, :dependent => :delete_all
                 has_many :testcases, :dependent => :destroy
                 validates_presence_of :name
                 validates_format_of :name, :with => /\A\w+\z/
                 validates_presence_of :full_name
-            -   scope :available, :conditions => {:available => true}
+            +   scope :available, -> { where(available: true) }
                 DEFAULT_TIME_LIMIT = 1
                 DEFAULT_MEMORY_LIMIT = 32
-            -   def self.find_available_problems
+            +   def self.available_problems
-            -     Problem.available.all(:order => "date_added DESC, name ASC")
+            +     available.order(date_added: :desc).order(:name)
+            +     #Problem.available.all(:order => "date_added DESC, name ASC")
                 end
                 def self.create_from_import_form_params(params, old_problem=nil)
                   org_problem = old_problem || Problem.new
                   import_params, problem = Problem.extract_params_and_check(params,
                                                                             org_problem)
                   if !problem.errors.empty?
                     return problem, 'Error importing'
                   end
                   problem.full_score = 100

app/models/submission.rb ¶ +4 -17

                 before_validation :assign_problem
                 before_validation :assign_language
                 validates_presence_of :source
                 validates_length_of :source, :maximum => 100_000, :allow_blank => true, :message => 'too long'
                 validates_length_of :source, :minimum => 1, :allow_blank => true, :message => 'too short'
                 validate :must_have_valid_problem
                 validate :must_specify_language
                 before_save :assign_latest_number_if_new_recond
                 def self.find_last_by_user_and_problem(user_id, problem_id)
-            -     last_sub = find(:first,
+            +     where("user_id = ? AND problem_id = ?",user_id,problem_id).last
-            -                     :conditions => {:user_id => user_id,
-            -                       :problem_id => problem_id},
-            -                     :order => 'number DESC')
-            -     return last_sub
                 end
                 def self.find_all_last_by_problem(problem_id)
                   # need to put in SQL command, maybe there's a better way
                   Submission.includes(:user).find_by_sql("SELECT * FROM submissions " +
               			   "WHERE id = " +
               			   "(SELECT MAX(id) FROM submissions AS subs " +
               			   "WHERE subs.user_id = submissions.user_id AND " +
                                          "problem_id = " + problem_id.to_s + " " +
               			   "GROUP BY user_id) " +
                                          "ORDER BY user_id")
                 end
                 def self.find_in_range_by_user_and_problem(user_id, problem_id,since_id,until_id)
                   records = Submission.where(problem_id: problem_id,user_id: user_id)
                   records = records.where('id >= ?',since_id) if since_id > 0
                   records = records.where('id <= ?',until_id) if until_id > 0
                   records.all
                 end
                 def self.find_last_for_all_available_problems(user_id)
                   submissions = Array.new
-            -     problems = Problem.find_available_problems
+            +     problems = Problem.available_problems
                   problems.each do |problem|
                     sub = Submission.find_last_by_user_and_problem(user_id, problem.id)
                     submissions << sub if sub!=nil
                   end
                   submissions
                 end
                 def self.find_by_user_problem_number(user_id, problem_id, number)
-            -     Submission.find(:first,
+            +     where("user_id = ? AND problem_id = ? AND number = ?",user_id,problem_id,number).first
-            -                     :conditions => {
-            -                       :user_id => user_id,
-            -                       :problem_id => problem_id,
-            -                       :number => number
-            -                     })
                 end
                 def self.find_all_by_user_problem(user_id, problem_id)
-            -     Submission.find(:all,
+            +     where("user_id = ? AND problem_id = ?",user_id,problem_id)
-            -                     :conditions => {
-            -                       :user_id => user_id,
-            -                       :problem_id => problem_id,
-            -                     })
                 end
                 def download_filename
                   if self.problem.output_only
                     return self.source_filename
                   else
                     timestamp = self.submitted_at.localtime.strftime("%H%M%S")
                     return "#{self.problem.name}-#{timestamp}.#{self.language.ext}"
                   end
                 end
                 protected

app/models/task.rb ¶ +1 -4

                     "inqueue"
                   when Task::STATUS_GRADING
                     "grading"
                   when Task::STATUS_COMPLETE
                     "complete"
                   end
                 end
                 def self.get_inqueue_and_change_status(status)
                   task = nil
                   begin
                     Task.transaction do
-            -         task = Task.find(:first,
+            +         task = Task.where(status: Task::STATUS_INQUEUE).where(lock: true).first
-            -                          :order => "created_at",
-            -                          :conditions => {:status=> Task::STATUS_INQUEUE},
-            -                          :lock => true)
                       if task!=nil
                         task.status = status
                         task.save!
                       end
                     end
                   rescue
                     task = nil
                   end
                   task
                 end

app/models/test_request.rb ¶ +1 -3

                 def problem_name
                   TestRequest.name_of(self.problem)
                 end
                 def language
                   self.submission.language
                 end
                 def self.get_inqueue_and_change_status(status)
                   # since there will be only one grader grading TestRequest
                   # we do not need locking (hopefully)
-            -     test_request = TestRequest.find(:first,
+            +     test_request = TestRequest.where(status: Task::STATUS_INQUEUE).first
-            -                                     :order => "created_at",
-            -                                     :conditions => {:status=> Task::STATUS_INQUEUE})
                   if test_request!=nil
                     test_request.status = status
                     test_request.save!
                   end
                   test_request
                 end
                 # interfacing with form
                 def self.new_from_form_params(user,params)
                   test_request = TestRequest.new
                   test_request.user = user

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

                 def verify_activation_key(key)
                   key == activation_key
                 end
                 def self.random_password(length=5)
                   chars = 'abcdefghjkmnopqrstuvwxyz'
                   password = ''
                   length.times { password << chars[rand(chars.length - 1)] }
                   password
                 end
                 def self.find_non_admin_with_prefix(prefix='')
-            -     users = User.find(:all)
+            +     users = User.all
                   return users.find_all { |u| !(u.admin?) and u.login.index(prefix)==0 }
                 end
                 # Contest information
                 def self.find_users_with_no_contest()
-            -     users = User.find(:all)
+            +     users = User.all
                   return users.find_all { |u| u.contests.length == 0 }
                 end
                 def contest_time_left
                   if GraderConfiguration.contest_mode?
                     return nil if site==nil
                     return site.time_left
                   elsif GraderConfiguration.indv_contest_mode?
                     time_limit = GraderConfiguration.contest_time_limit
                     if time_limit == nil
                       return nil
                     available_problems.each {|p| pin[p.id] = true}
                   end
                   other_avaiable_problems = Problem.available.find_all {|p| pin[p.id]==nil and p.contests.length==0}
                   contest_problems << {
                     :contest => nil,
                     :problems => other_avaiable_problems
                   }
                   return contest_problems
                 end
                 def available_problems
                   if not GraderConfiguration.multicontests?
-            -       return Problem.find_available_problems
+            +       return Problem.available_problems
                   else
                     contest_problems = []
                     pin = {}
                     contests.enabled.each do |contest|
                       contest.problems.available.each do |problem|
                         if not pin.has_key? problem.id
                           contest_problems << problem
                         end
                         pin[problem.id] = true
                       end
                     end
                     other_avaiable_problems = Problem.available.find_all {|p| pin[p.id]==nil and p.contests.length==0}

app/views/report/_score_table.html.haml ¶ +1 -1

                     / %th Contest(s)
                     %th Remark
                     - @problems.each do |p|
                       %th.text-right= p.name.gsub('_',' ')
                     %th.text-right Total
                     %th.text-right Passed
                 %tbody
                   - @scorearray.each do |sc|
                     %tr
                       - total,num_passed = 0,0
                       - sc.each_index do |i|
                         - if i == 0
-            -             %td= link_to sc[i].login, controller: 'users', action: 'profile', id: sc[i]
+            +             %td= link_to sc[i].login, stat_user_path(sc[i])
                           %td= sc[i].full_name
                           / %td= sc[i].activated
                           / %td= sc[i].try(:contest_stat).try(:started_at) ? 'yes' : 'no'
                           / %td= sc[i].contests.collect {|c| c.name}.join(', ')
                           %td= sc[i].remark
                         - else
                           %td.text-right= sc[i][0]
                           - total += sc[i][0]
                           - num_passed += 1 if sc[i][1]
                       %td.text-right= total
                       %td.text-right= num_passed

test/concurrent/task_test_setup.rb ¶ +1 -1

               ENV["RAILS_ENV"] = "test"
               require File.expand_path(File.dirname(__FILE__) + "/../../config/environment")
               def clear_all_tasks
-            -   Task.find(:all).each do |task|
+            +   Task.all.each do |task|
                   task.destroy
                 end
               end
               clear_all_tasks
               (1..1000).each do |i|
                 Task.create(:id => i,
                             :submission_id => i,
                             :status => Task::STATUS_INQUEUE)
               end

test/concurrent/task_test_teardown.rb ¶ +2 -3

               ENV["RAILS_ENV"] = "test"
               require File.expand_path(File.dirname(__FILE__) + "/../../config/environment")
               def clear_all_tasks
-            -   Task.find(:all).each do |task|
+            +   Task.all.each do |task|
                   task.destroy
                 end
               end
-            - puts Task.find(:all,
+            + puts Task.where(status: Task::STATUS_COMPLETE).length
-            -                :conditions => {:status => Task::STATUS_COMPLETE}).length
               clear_all_tasks

Write
Preview

You need to be logged in to leave comments. Login now

	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

r619:35d86016ce86 - Tue, 06 Dec 2016 17:01:12 - 26 files changed: 108 inserted, 147 deleted

Sign in to your account

Commit r619:35d86016ce86 public

Author

r619:35d86016ce86 - Tue, 06 Dec 2016 17:01:12 - 26 files changed: 108 inserted, 147 deleted

Commit `r619:35d86016ce86` public