cafe-grader-web Commit - r31:07d90e75a295

cafe-grader-web

Commit `r31:07d90e75a295` public

parent | child

Description:

moved submission validation to model git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@56 6386c4cd-e34a-4fa8-8920-d93eb39b512e

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r31:07d90e75a295 - Tue, 19 Feb 2008 05:37:01 - 3 files changed: 59 inserted, 29 deleted

app/controllers/main_controller.rb ¶ +26 -29

@@ -13,48 +13,32
13	def login	13	def login
14	reset_session	14	reset_session
15	render :action => 'login', :layout => 'empty'	15	render :action => 'login', :layout => 'empty'
16	end	16	end
17		17
18	def list	18	def list
19	- @problems = Problem.find_available_problems	19	+ prepare_list_information
20	- @prob_submissions = Array.new
21	- @user = User.find(session[:user_id])
22	- @problems.each do \|p\|
23	- c, sub = Submission.find_by_user_and_problem(@user.id,p.id)
24	- @prob_submissions << [c,sub]
25	- end
26	end	20	end
27		21
28	def submit	22	def submit
29	- submission = Submission.new(params[:submission])	23	+ @submission = Submission.new(params[:submission])
30	- submission.user_id = session[:user_id]	24	+ @submission.user_id = session[:user_id]
31	- submission.language_id = 0	25	+ @submission.language_id = 0
32	- source = params['file'].read	26	+ @submission.source = params['file'].read if params['file']!=''
33	- if source.length > 100_000	27	+ @submission.submitted_at = Time.new
34	- flash[:notice] = 'Error: file too long'	28	+ if @submission.valid?
35	- elsif (lang = Submission.find_language_in_source(source))==nil	29	+ if @submission.save == false
36	- flash[:notice] = 'Error: cannot determine language used'
37	- elsif ((submission.problem_id==-1) and
38	- !(problem=Submission.find_problem_in_source(source)))
39	- flash[:notice] = 'Error: cannot determine problem submitted'
40	- elsif ((submission.problem_id==-1) and
41	- (problem.available == false))
42	- flash[:notice] = 'Error: problem is not available'
43	- else
44	- submission.problem_id = problem.id if submission.problem_id == -1
45	- submission.source = source
46	- submission.language_id = lang.id
47	- submission.submitted_at = Time.new
48	- if submission.save == false
49	flash[:notice] = 'Error saving your submission'	30	flash[:notice] = 'Error saving your submission'
50	- elsif Task.create(:submission_id => submission.id) == ~~false~~	31	+ elsif Task.create(:submission_id => @submission.id,
		32	+ :status => Task::STATUS_INQUEUE) == false
51	flash[:notice] = 'Error adding your submission to task queue'	33	flash[:notice] = 'Error adding your submission to task queue'
52	end	34	end
53	end	35	end
54	- redirect_to :action => 'list'	36	+
		37	+ prepare_list_information
		38	+ render :action => 'list'
55	end	39	end
56		40
57	def get_source	41	def get_source
58	submission = Submission.find(params[:id])	42	submission = Submission.find(params[:id])
59	if submission.user_id == session[:user_id]	43	if submission.user_id == session[:user_id]
60	fname = submission.problem.name + '.' + submission.language.ext	44	fname = submission.problem.name + '.' + submission.language.ext
@@ -62,7 +46,20
62	{:filename => fname,	46	{:filename => fname,
63	:type => 'text/plain'})	47	:type => 'text/plain'})
64	else	48	else
65	flash[:notice] = 'Error viewing source'	49	flash[:notice] = 'Error viewing source'
66	end	50	end
67	end	51	end
		52	+
		53	+ protected
		54	+ def prepare_list_information
		55	+ @problems = Problem.find_available_problems
		56	+ @prob_submissions = Array.new
		57	+ @user = User.find(session[:user_id])
		58	+ @problems.each do \|p\|
		59	+ c, sub = Submission.find_by_user_and_problem(@user.id,p.id)
		60	+ @prob_submissions << [c,sub]
68	end	61	end
		62	+ end
		63	+
		64	+ end
		65	+

app/models/submission.rb ¶ +30

               class Submission < ActiveRecord::Base
                 belongs_to :language
                 belongs_to :problem
                 belongs_to :user
+            +   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_specify_language
+            +   validate :must_have_valid_problem
+            +
                 def self.find_by_user_and_problem(user_id, problem_id)
                   subcount = count(:conditions => "user_id = #{user_id} AND problem_id = #{problem_id}")
                   if subcount != 0
                     last_sub = find(:first,
               		      :conditions => {:user_id => user_id,
               			:problem_id => problem_id},
               			   "WHERE subs.user_id = submissions.user_id AND " +
                                          "problem_id = " + problem_id.to_s + " " +
               			   "GROUP BY user_id)")
                 end
                 def self.find_option_in_source(option, source)
+            +     if source==nil
+            +       return nil
+            +     end
                   i = 0
                   source.each_line do |s|
                     if s =~ option
               	words = s.split
               	return words[1]
                     end
                     return problem
                   else
                     return nil
                   end
                 end
+            +   # validation codes
+            +   def must_specify_language
+            +     return if self.source==nil
+            +     self.language = Submission.find_language_in_source(self.source)
+            +     errors.add_to_base("must specify programming language") unless self.language!=nil
                 end
+            +
+            +   def must_have_valid_problem
+            +     return if self.source==nil
+            +     if self.problem_id!=-1
+            +       problem = Problem.find(self.problem_id)
+            +     else
+            +       problem = Submission.find_problem_in_source(self.source)
+            +     end
+            +     if problem==nil
+            +       errors.add_to_base("must specify problem")
+            +     elsif !problem.available
+            +       errors.add_to_base("must specify valid problem")
+            +     end
+            +   end
+            +
+            + end

app/views/main/list.rhtml ¶ +3

               <div class="title">Hello <%=h @user.full_name %></div>
               Current time is <%= format_short_time(Time.new) %>.
               <div class="submitbox">
+            +
+            + <%= error_messages_for 'submission' %>
+            +
               <% form_tag({:action => 'submit'}, :multipart => true) do %>
               Problem: <%= select 'submission', 'problem_id',
                            	[['Specified in header','-1']] +
               		@problems.collect {|p| [p.full_name, p.id]},
               		:selected => '-1' %>
               File: <%= file_field_tag 'file' %>

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

r31:07d90e75a295 - Tue, 19 Feb 2008 05:37:01 - 3 files changed: 59 inserted, 29 deleted

Sign in to your account

Commit r31:07d90e75a295 public

Author

r31:07d90e75a295 - Tue, 19 Feb 2008 05:37:01 - 3 files changed: 59 inserted, 29 deleted

Commit `r31:07d90e75a295` public