cafe-grader-web Commit - r618:45e8321629ae

cafe-grader-web

Commit `r618:45e8321629ae` public

parent | child

Description:

update models to satisfy 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

r618:45e8321629ae - Wed, 30 Nov 2016 08:25:17 - 7 files changed: 12 inserted, 16 deleted

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

               class Contest < ActiveRecord::Base
                 has_and_belongs_to_many :users
                 has_and_belongs_to_many :problems
-            -   scope :enabled, :conditions => {:enabled => true}
+            +   scope :enabled, -> { where(enabled: true) }
               end

app/models/login.rb ¶ -1

               class Login < ActiveRecord::Base
                 belongs_to :user
-            -   attr_accessible :ip_address, :logged_in_at, :user_id
               end

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

               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 => /^\w+$/
+            +   validates_format_of :name, :with => /\A\w+\z/
                 validates_presence_of :full_name
                 scope :available, :conditions => {:available => true}
                 DEFAULT_TIME_LIMIT = 1
                 DEFAULT_MEMORY_LIMIT = 32
                 def self.find_available_problems
                   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
                   problem.date_added = Time.new
                   problem.test_allowed = true
                   problem.output_only = false

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

               class SubmissionViewLog < ActiveRecord::Base
-            -   attr_accessible :submission_id, :user_id
+            +   #attr_accessible :submission_id, :user_id
               end

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

               #
               # A TestRequest is a composition of submission with user's testdata.
               #
               # Note about TestRequest#problem: Usually, A TestRequest has to be
               #   associated with a problem, so that execution environment can be
               #   determined.  However, to be more flexible, we have to ensure that
               #   it works as well with problem=nil.  In this case, we shall provide
               #   a "default" execution environment for it.  This can be done
               #   seamlessly by using TestRequest#problem_name or
               #   TestRequest#name_of(problem) when retrieving the name of the
               #   problem: #name_of would return problem.name when problem!=nil and
               #   it would return "default" when problem=nil, #problem_name just
               #   call #name_of.
               #
               require 'fileutils'
               class TestRequest < Task
+            +   self.table_name = "test_requests"
-            -   set_table_name "test_requests"
                 belongs_to :user
                 belongs_to :problem
                 belongs_to :submission
                 validates_presence_of :submission
                 validate :must_have_valid_problem
                 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,
                                                   :order => "created_at",
                                                   :conditions => {:status=> Task::STATUS_INQUEUE})
                   if test_request!=nil

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

               class Testcase < ActiveRecord::Base
                 belongs_to :problem
-            -   attr_accessible :group, :input, :num, :score, :sol
+            +   #attr_accessible :group, :input, :num, :score, :sol
               end

app/models/user.rb ¶ +7 -9

               require 'digest/sha1'
               require 'net/pop'
               require 'net/https'
               require 'net/http'
               require 'json'
               class User < ActiveRecord::Base
                 has_and_belongs_to_many :roles
-            -   has_many :test_requests, :order => "submitted_at DESC"
+            +   has_many :test_requests, -> {order(submitted_at: DESC)}
-            -   has_many :messages,
+            +   has_many :messages, -> { order(created_at: DESC) },
                          :class_name => "Message",
-            -            :foreign_key => "sender_id",
+            +            :foreign_key => "sender_id"
-            -            :order => 'created_at DESC'
-            -   has_many :replied_messages,
+            +   has_many :replied_messages, -> { order(created_at: DESC) },
                          :class_name => "Message",
-            -            :foreign_key => "receiver_id",
+            +            :foreign_key => "receiver_id"
-            -            :order => 'created_at DESC'
                 has_one :contest_stat, :class_name => "UserContestStat", :dependent => :destroy
                 belongs_to :site
                 belongs_to :country
-            -   has_and_belongs_to_many :contests, :uniq => true, :order => 'name'
+            +   has_and_belongs_to_many :contests, -> { order(:name); uniq}
-            -   scope :activated_users, :conditions => {:activated => true}
+            +   scope :activated_users, -> {where activated: true}
                 validates_presence_of :login
                 validates_uniqueness_of :login
                 validates_format_of :login, :with => /\A[\_A-Za-z0-9]+\z/
                 validates_length_of :login, :within => 3..30
                 validates_presence_of :full_name
                 validates_length_of :full_name, :minimum => 1
                 validates_presence_of :password, :if => :password_required?
                 validates_length_of :password, :within => 4..20, :if => :password_required?
                 validates_confirmation_of :password, :if => :password_required?
                 validates_format_of :email,
                                     :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i,
                                     :if => :email_validation?
                 validate :uniqueness_of_email_from_activated_users,
                          :if => :email_validation?
                 validate :enough_time_interval_between_same_email_registrations,
                          :if => :email_validation?
                 # these are for ytopc
                 # disable for now
                 #validates_presence_of :province

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

r618:45e8321629ae - Wed, 30 Nov 2016 08:25:17 - 7 files changed: 12 inserted, 16 deleted

Sign in to your account

Commit r618:45e8321629ae public

Author

r618:45e8321629ae - Wed, 30 Nov 2016 08:25:17 - 7 files changed: 12 inserted, 16 deleted

Commit `r618:45e8321629ae` public