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

                 def index
                   redirect_to :action => 'login'
                 end
                 def login
                   reset_session
                   render :action => 'login', :layout => 'empty'
                 end
                 def list
-            -     @problems = Problem.find_available_problems
+            +     prepare_list_information
-            -     @prob_submissions = Array.new
-            -     @user = User.find(session[:user_id])
-            -     @problems.each do |p|
-            -       c, sub = Submission.find_by_user_and_problem(@user.id,p.id)
-            -       @prob_submissions << [c,sub]
-            -     end
                 end
                 def submit
-            -     submission = Submission.new(params[:submission])
+            +     @submission = Submission.new(params[:submission])
-            -     submission.user_id = session[:user_id]
+            +     @submission.user_id = session[:user_id]
-            -     submission.language_id = 0
+            +     @submission.language_id = 0
-            -     source = params['file'].read
+            +     @submission.source = params['file'].read if params['file']!=''
-            -     if source.length > 100_000
+            +     @submission.submitted_at = Time.new
-            -       flash[:notice] = 'Error: file too long'
+            +     if @submission.valid?
-            -     elsif (lang = Submission.find_language_in_source(source))==nil
+            +       if @submission.save == false
-            -       flash[:notice] = 'Error: cannot determine language used'
-            -     elsif ((submission.problem_id==-1) and
-            - 	   !(problem=Submission.find_problem_in_source(source)))
-            -       flash[:notice] = 'Error: cannot determine problem submitted'
-            -     elsif ((submission.problem_id==-1) and
-            - 	   (problem.available == false))
-            -       flash[:notice] = 'Error: problem is not available'
-            -     else
-            -       submission.problem_id = problem.id if submission.problem_id == -1
-            -       submission.source = source
-            -       submission.language_id = lang.id
-            -       submission.submitted_at = Time.new
-            -       if submission.save == false
               	flash[:notice] = 'Error saving your submission'
-            -       elsif Task.create(:submission_id => submission.id) == false
+            +       elsif Task.create(:submission_id => @submission.id,
+            +                         :status => Task::STATUS_INQUEUE) == false
               	flash[:notice] = 'Error adding your submission to task queue'
                     end
                   end
-            -     redirect_to :action => 'list'
+            +     prepare_list_information
+            +     render :action => 'list'
                 end
                 def get_source
                   submission = Submission.find(params[:id])
                   if submission.user_id == session[:user_id]
                     fname = submission.problem.name + '.' + submission.language.ext
                     send_data(submission.source,
               		{:filename => fname,
                                 :type => 'text/plain'})
                   else
                     flash[:notice] = 'Error viewing source'
                   end
                 end
+            +
+            +   protected
+            +   def prepare_list_information
+            +     @problems = Problem.find_available_problems
+            +     @prob_submissions = Array.new
+            +     @user = User.find(session[:user_id])
+            +     @problems.each do |p|
+            +       c, sub = Submission.find_by_user_and_problem(@user.id,p.id)
+            +       @prob_submissions << [c,sub]
+            +     end
+            +   end
+            +
               end
+            +

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},
               		      :order => 'submitted_at DESC')
                   else
                     last_sub = nil
                   end
                   return subcount, last_sub
                 end
                 def self.find_last_by_problem(problem_id)
                   # need to put in SQL command, maybe there's a better way
                   Submission.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)")
                 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
                     i = i + 1
                     if i==10
               	return nil
                     end
                   end
                   return nil
                   end
                 end
                 def self.find_problem_in_source(source)
                   prob_opt = find_option_in_source(/^TASK:/,source)
                   if problem = Problem.find_by_name(prob_opt)
                     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' %>
               <%= submit_tag 'Submit' %>
               <% end %>
               </div>
               <hr/>

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