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'

Gemfile.lock ¶ +48 -42

                 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)
                     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)
                   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-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)
                     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)
                 mail
                 momentjs-rails
                 mysql2 (~> 0.3.0)
-            -   rails (~> 4.0.0)
+            +   rails (~> 4.1.0)
                 rails_bootstrap_sortable
                 rdiscount
                 rouge

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

                 # 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

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

                 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

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

                 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

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

                     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

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

                   @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
                 end
                 def clear_all
-            -     GraderProcess.find(:all).each do |p|
+            +     GraderProcess.all.each do |p|
                     p.destroy
                   end
                   redirect_to :action => 'list'

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

                   #   @hidelogin = true
                   # end
-            -     @announcements = Announcement.find_for_frontpage
+            +     @announcements = Announcement.frontpage
                   render :action => 'login', :layout => 'empty'
                 end
                 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

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

                 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)
                 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
                 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
                 end
                 def manage
-            -     @problems = Problem.find(:all, :order => 'date_added DESC')
+            +     @problems = Problem.order(date_added: :desc)
                 end
                 def do_manage

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

                 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)
                   #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
                   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

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

                 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]]

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

                 # 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

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

                 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]
                   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
                   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
                 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
                 # 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

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

                 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)

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)
                 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)

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

                 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

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

                 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)

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

                 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)

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

                 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)
                 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
                 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

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

                   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!

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

                   # 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!

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

                 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 available_problems
                   if not GraderConfiguration.multicontests?
-            -       return Problem.find_available_problems
+            +       return Problem.available_problems
                   else
                     contest_problems = []
                     pin = {}

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

                       - 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'

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

               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

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

               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