Description:
update models to satisfy rails 4
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r618:45e8321629ae - - 7 files changed: 12 inserted, 16 deleted
| @@ -1,8 +1,8 | |||
|
|
1 | 1 | class Contest < ActiveRecord::Base |
|
|
2 | 2 | |
|
|
3 | 3 | has_and_belongs_to_many :users |
|
|
4 | 4 | has_and_belongs_to_many :problems |
|
|
5 | 5 | |
|
|
6 |
- scope :enabled, |
|
|
|
6 | + scope :enabled, -> { where(enabled: true) } | |
|
|
7 | 7 | |
|
|
8 | 8 | end |
| @@ -1,5 +1,4 | |||
|
|
1 | 1 | class Login < ActiveRecord::Base |
|
|
2 | 2 | belongs_to :user |
|
|
3 | 3 | |
|
|
4 | - attr_accessible :ip_address, :logged_in_at, :user_id | |
|
|
5 | 4 | end |
| @@ -1,57 +1,57 | |||
|
|
1 | 1 | class Problem < ActiveRecord::Base |
|
|
2 | 2 | |
|
|
3 | 3 | belongs_to :description |
|
|
4 | 4 | has_and_belongs_to_many :contests, :uniq => true |
|
|
5 | 5 | has_many :test_pairs, :dependent => :delete_all |
|
|
6 | 6 | has_many :testcases, :dependent => :destroy |
|
|
7 | 7 | |
|
|
8 | 8 | validates_presence_of :name |
|
|
9 |
- validates_format_of :name, :with => / |
|
|
|
9 | + validates_format_of :name, :with => /\A\w+\z/ | |
|
|
10 | 10 | validates_presence_of :full_name |
|
|
11 | 11 | |
|
|
12 | 12 | scope :available, :conditions => {:available => true} |
|
|
13 | 13 | |
|
|
14 | 14 | DEFAULT_TIME_LIMIT = 1 |
|
|
15 | 15 | DEFAULT_MEMORY_LIMIT = 32 |
|
|
16 | 16 | |
|
|
17 | 17 | def self.find_available_problems |
|
|
18 | 18 | Problem.available.all(:order => "date_added DESC, name ASC") |
|
|
19 | 19 | end |
|
|
20 | 20 | |
|
|
21 | 21 | def self.create_from_import_form_params(params, old_problem=nil) |
|
|
22 | 22 | org_problem = old_problem || Problem.new |
|
|
23 | 23 | import_params, problem = Problem.extract_params_and_check(params, |
|
|
24 | 24 | org_problem) |
|
|
25 | 25 | |
|
|
26 | 26 | if !problem.errors.empty? |
|
|
27 | 27 | return problem, 'Error importing' |
|
|
28 | 28 | end |
|
|
29 | 29 | |
|
|
30 | 30 | problem.full_score = 100 |
|
|
31 | 31 | problem.date_added = Time.new |
|
|
32 | 32 | problem.test_allowed = true |
|
|
33 | 33 | problem.output_only = false |
|
|
34 | 34 | problem.available = false |
|
|
35 | 35 | |
|
|
36 | 36 | if not problem.save |
|
|
37 | 37 | return problem, 'Error importing' |
|
|
38 | 38 | end |
|
|
39 | 39 | |
|
|
40 | 40 | import_to_db = params.has_key? :import_to_db |
|
|
41 | 41 | |
|
|
42 | 42 | importer = TestdataImporter.new(problem) |
|
|
43 | 43 | |
|
|
44 | 44 | if not importer.import_from_file(import_params[:file], |
|
|
45 | 45 | import_params[:time_limit], |
|
|
46 | 46 | import_params[:memory_limit], |
|
|
47 | 47 | import_params[:checker_name], |
|
|
48 | 48 | import_to_db) |
|
|
49 | 49 | problem.errors.add(:base,'Import error.') |
|
|
50 | 50 | end |
|
|
51 | 51 | |
|
|
52 | 52 | return problem, importer.log_msg |
|
|
53 | 53 | end |
|
|
54 | 54 | |
|
|
55 | 55 | def self.download_file_basedir |
|
|
56 | 56 | return "#{Rails.root}/data/tasks" |
|
|
57 | 57 | end |
| @@ -1,3 +1,3 | |||
|
|
1 | 1 | class SubmissionViewLog < ActiveRecord::Base |
|
|
2 | - attr_accessible :submission_id, :user_id | |
|
|
2 | + #attr_accessible :submission_id, :user_id | |
|
|
3 | 3 | end |
| @@ -1,68 +1,67 | |||
|
|
1 | 1 | # |
|
|
2 | 2 | # A TestRequest is a composition of submission with user's testdata. |
|
|
3 | 3 | # |
|
|
4 | 4 | # Note about TestRequest#problem: Usually, A TestRequest has to be |
|
|
5 | 5 | # associated with a problem, so that execution environment can be |
|
|
6 | 6 | # determined. However, to be more flexible, we have to ensure that |
|
|
7 | 7 | # it works as well with problem=nil. In this case, we shall provide |
|
|
8 | 8 | # a "default" execution environment for it. This can be done |
|
|
9 | 9 | # seamlessly by using TestRequest#problem_name or |
|
|
10 | 10 | # TestRequest#name_of(problem) when retrieving the name of the |
|
|
11 | 11 | # problem: #name_of would return problem.name when problem!=nil and |
|
|
12 | 12 | # it would return "default" when problem=nil, #problem_name just |
|
|
13 | 13 | # call #name_of. |
|
|
14 | 14 | # |
|
|
15 | 15 | |
|
|
16 | 16 | require 'fileutils' |
|
|
17 | 17 | |
|
|
18 | 18 | class TestRequest < Task |
|
|
19 | - | |
|
|
20 | - set_table_name "test_requests" | |
|
|
19 | + self.table_name = "test_requests" | |
|
|
21 | 20 | |
|
|
22 | 21 | belongs_to :user |
|
|
23 | 22 | belongs_to :problem |
|
|
24 | 23 | belongs_to :submission |
|
|
25 | 24 | |
|
|
26 | 25 | validates_presence_of :submission |
|
|
27 | 26 | validate :must_have_valid_problem |
|
|
28 | 27 | |
|
|
29 | 28 | def problem_name |
|
|
30 | 29 | TestRequest.name_of(self.problem) |
|
|
31 | 30 | end |
|
|
32 | 31 | |
|
|
33 | 32 | def language |
|
|
34 | 33 | self.submission.language |
|
|
35 | 34 | end |
|
|
36 | 35 | |
|
|
37 | 36 | def self.get_inqueue_and_change_status(status) |
|
|
38 | 37 | # since there will be only one grader grading TestRequest |
|
|
39 | 38 | # we do not need locking (hopefully) |
|
|
40 | 39 | |
|
|
41 | 40 | test_request = TestRequest.find(:first, |
|
|
42 | 41 | :order => "created_at", |
|
|
43 | 42 | :conditions => {:status=> Task::STATUS_INQUEUE}) |
|
|
44 | 43 | if test_request!=nil |
|
|
45 | 44 | test_request.status = status |
|
|
46 | 45 | test_request.save! |
|
|
47 | 46 | end |
|
|
48 | 47 | |
|
|
49 | 48 | test_request |
|
|
50 | 49 | end |
|
|
51 | 50 | |
|
|
52 | 51 | # interfacing with form |
|
|
53 | 52 | def self.new_from_form_params(user,params) |
|
|
54 | 53 | test_request = TestRequest.new |
|
|
55 | 54 | test_request.user = user |
|
|
56 | 55 | begin |
|
|
57 | 56 | problem = Problem.find(params[:problem_id]) |
|
|
58 | 57 | rescue ActiveRecord::RecordNotFound |
|
|
59 | 58 | problem = nil |
|
|
60 | 59 | end |
|
|
61 | 60 | test_request.problem = problem |
|
|
62 | 61 | if problem!=nil |
|
|
63 | 62 | test_request.submission = |
|
|
64 | 63 | Submission.find_by_user_problem_number(user.id, |
|
|
65 | 64 | problem.id, |
|
|
66 | 65 | params[:submission_number]) |
|
|
67 | 66 | else |
|
|
68 | 67 | test_request.submission = nil |
| @@ -1,4 +1,4 | |||
|
|
1 | 1 | class Testcase < ActiveRecord::Base |
|
|
2 | 2 | belongs_to :problem |
|
|
3 | - attr_accessible :group, :input, :num, :score, :sol | |
|
|
3 | + #attr_accessible :group, :input, :num, :score, :sol | |
|
|
4 | 4 | end |
| @@ -1,78 +1,76 | |||
|
|
1 | 1 | require 'digest/sha1' |
|
|
2 | 2 | require 'net/pop' |
|
|
3 | 3 | require 'net/https' |
|
|
4 | 4 | require 'net/http' |
|
|
5 | 5 | require 'json' |
|
|
6 | 6 | |
|
|
7 | 7 | class User < ActiveRecord::Base |
|
|
8 | 8 | |
|
|
9 | 9 | has_and_belongs_to_many :roles |
|
|
10 | 10 | |
|
|
11 |
- has_many :test_requests, |
|
|
|
11 | + has_many :test_requests, -> {order(submitted_at: DESC)} | |
|
|
12 | 12 | |
|
|
13 | - has_many :messages, | |
|
|
13 | + has_many :messages, -> { order(created_at: DESC) }, | |
|
|
14 | 14 | :class_name => "Message", |
|
|
15 |
- :foreign_key => "sender_id" |
|
|
|
16 | - :order => 'created_at DESC' | |
|
|
15 | + :foreign_key => "sender_id" | |
|
|
17 | 16 | |
|
|
18 | - has_many :replied_messages, | |
|
|
17 | + has_many :replied_messages, -> { order(created_at: DESC) }, | |
|
|
19 | 18 | :class_name => "Message", |
|
|
20 |
- :foreign_key => "receiver_id" |
|
|
|
21 | - :order => 'created_at DESC' | |
|
|
19 | + :foreign_key => "receiver_id" | |
|
|
22 | 20 | |
|
|
23 | 21 | has_one :contest_stat, :class_name => "UserContestStat", :dependent => :destroy |
|
|
24 | 22 | |
|
|
25 | 23 | belongs_to :site |
|
|
26 | 24 | belongs_to :country |
|
|
27 | 25 | |
|
|
28 |
- has_and_belongs_to_many :contests, |
|
|
|
26 | + has_and_belongs_to_many :contests, -> { order(:name); uniq} | |
|
|
29 | 27 | |
|
|
30 |
- scope :activated_users, |
|
|
|
28 | + scope :activated_users, -> {where activated: true} | |
|
|
31 | 29 | |
|
|
32 | 30 | validates_presence_of :login |
|
|
33 | 31 | validates_uniqueness_of :login |
|
|
34 | 32 | validates_format_of :login, :with => /\A[\_A-Za-z0-9]+\z/ |
|
|
35 | 33 | validates_length_of :login, :within => 3..30 |
|
|
36 | 34 | |
|
|
37 | 35 | validates_presence_of :full_name |
|
|
38 | 36 | validates_length_of :full_name, :minimum => 1 |
|
|
39 | 37 | |
|
|
40 | 38 | validates_presence_of :password, :if => :password_required? |
|
|
41 | 39 | validates_length_of :password, :within => 4..20, :if => :password_required? |
|
|
42 | 40 | validates_confirmation_of :password, :if => :password_required? |
|
|
43 | 41 | |
|
|
44 | 42 | validates_format_of :email, |
|
|
45 | 43 | :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i, |
|
|
46 | 44 | :if => :email_validation? |
|
|
47 | 45 | validate :uniqueness_of_email_from_activated_users, |
|
|
48 | 46 | :if => :email_validation? |
|
|
49 | 47 | validate :enough_time_interval_between_same_email_registrations, |
|
|
50 | 48 | :if => :email_validation? |
|
|
51 | 49 | |
|
|
52 | 50 | # these are for ytopc |
|
|
53 | 51 | # disable for now |
|
|
54 | 52 | #validates_presence_of :province |
|
|
55 | 53 | |
|
|
56 | 54 | attr_accessor :password |
|
|
57 | 55 | |
|
|
58 | 56 | before_save :encrypt_new_password |
|
|
59 | 57 | before_save :assign_default_site |
|
|
60 | 58 | before_save :assign_default_contest |
|
|
61 | 59 | |
|
|
62 | 60 | # this is for will_paginate |
|
|
63 | 61 | cattr_reader :per_page |
|
|
64 | 62 | @@per_page = 50 |
|
|
65 | 63 | |
|
|
66 | 64 | def self.authenticate(login, password) |
|
|
67 | 65 | user = find_by_login(login) |
|
|
68 | 66 | if user |
|
|
69 | 67 | return user if user.authenticated?(password) |
|
|
70 | 68 | if user.authenticated_by_cucas?(password) or user.authenticated_by_pop3?(password) |
|
|
71 | 69 | user.password = password |
|
|
72 | 70 | user.save |
|
|
73 | 71 | return user |
|
|
74 | 72 | end |
|
|
75 | 73 | end |
|
|
76 | 74 | end |
|
|
77 | 75 | |
|
|
78 | 76 | def authenticated?(password) |
You need to be logged in to leave comments.
Login now