cafe-grader-web Commit - r628:3df78cd5515f

cafe-grader-web

Commit `r628:3df78cd5515f` public

parent | child

Description:

merge

Commit status:

[Not Reviewed]

References:

merge java

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r628:3df78cd5515f - Fri, 06 Jan 2017 11:05:50 - 25 files changed: 560 inserted, 168 deleted

app/controllers/testcases_controller.rb created 644 ¶ +24

@@ -0,0 +1,24
	1	+ class TestcasesController < ApplicationController
	2	+ before_action :set_testcase, only: [:download_input,:download_sol]
	3	+ before_action :testcase_authorization
	4	+
	5	+ def download_input
	6	+ send_data @testcase.input, type: 'text/plain', filename: "#{@testcase.problem.name}.#{@testcase.num}.in"
	7	+ end
	8	+
	9	+ def download_sol
	10	+ send_data @testcase.sol, type: 'text/plain', filename: "#{@testcase.problem.name}.#{@testcase.num}.sol"
	11	+ end
	12	+
	13	+
	14	+ private
	15	+ # Use callbacks to share common setup or constraints between actions.
	16	+ def set_testcase
	17	+ @testcase = Testcase.find(params[:id])
	18	+ end
	19	+
	20	+ # Only allow a trusted parameter "white list" through.
	21	+ def testcase_params
	22	+ params[:testcase]
	23	+ end
	24	+ end

app/helpers/testcases_helper.rb created 644 ¶ +2

@@ -0,0 +1,2
	1	+ module TestcasesHelper
	2	+ end

app/views/problems/show_testcase.html.haml created 644 ¶ +25

@@ -0,0 +1,25
	1	+ %h1 Test cases
	2	+ %h2= @problem.long_name
	3	+
	4	+ /navbar
	5	+ %ul.nav.nav-pills{role: :tablist}
	6	+ - @problem.testcases.each.with_index do \|tc,id\|
	7	+ %li{role: :presentation, class: ('active' if id == 0)}
	8	+ %a{href:"#tc#{tc.id}", role: 'tab', data: {toggle: 'tab'}}= tc.num
	9	+
	10	+ /actual data
	11	+ .tab-content
	12	+ - @problem.testcases.each.with_index do \|tc,id\|
	13	+ .tab-pane{id: "tc#{tc.id}",class: ('active' if id == 0)}
	14	+ .row
	15	+ .col-md-6
	16	+ %h3 Input
	17	+ = link_to "Download",download_input_problem_testcase_path(@problem,tc),class: 'btn btn-info btn-sm'
	18	+ .col-md-6
	19	+ %h3 Output
	20	+ = link_to "Download",download_sol_problem_testcase_path(@problem,tc),class: 'btn btn-info btn-sm'
	21	+ .row
	22	+ .col-md-6
	23	+ %textarea{ rows: 25,readonly: true,style: "width:100%;resize=none;overflow-y: scroll;"}= tc.input
	24	+ .col-md-6
	25	+ %textarea{ rows: 25,readonly: true,style: "width:100%;resize=none;overflow-y: scroll;"}= tc.sol

lib/tasks/fixtures.rake created 644 ¶ +41

@@ -0,0 +1,41
	1	+ # Original from http://snippets.dzone.com/posts/show/4468 by MichaelBoutros
	2	+ #
	3	+ # Optimized version which uses to_yaml for content creation and checks
	4	+ # that models are ActiveRecord::Base models before trying to fetch
	5	+ # them from database.
	6	+ namespace :db do
	7	+ namespace :fixtures do
	8	+ desc 'Dumps all models into fixtures.'
	9	+ task :dump => :environment do
	10	+ puts "rails root = #{Rails.root}"
	11	+ models = Dir.glob(Rails.root.to_s + '/app/models/**.rb').map do \|s\|
	12	+ Pathname.new(s).basename.to_s.gsub(/\.rb$/,'').camelize
	13	+ end
	14	+
	15	+ puts "Found models: " + models.join(', ')
	16	+
	17	+ models.each do \|m\|
	18	+ model = m.constantize
	19	+ next unless model.ancestors.include?(ActiveRecord::Base)
	20	+
	21	+ puts "Dumping model: " + m
	22	+ entries = model.all.order(id: :asc)
	23	+
	24	+ increment = 1
	25	+
	26	+ model_file = Rails.root.to_s + '/test/fixtures2/' + m.underscore.pluralize + '.yml'
	27	+ File.open(model_file, 'w') do \|f\|
	28	+ entries.each do \|a\|
	29	+ attrs = a.attributes
	30	+ attrs.delete_if{\|k,v\| v.blank?}
	31	+
	32	+ output = {m + '_' + increment.to_s => attrs}
	33	+ f << output.to_yaml.gsub(/^--- \n/,'') + "\n"
	34	+
	35	+ increment += 1
	36	+ end
	37	+ end
	38	+ end
	39	+ end
	40	+ end
	41	+ end

test/controllers/testcases_controller_test.rb created 644 ¶ +7

@@ -0,0 +1,7
	1	+ require 'test_helper'
	2	+
	3	+ class TestcasesControllerTest < ActionController::TestCase
	4	+ setup do
	5	+ @testcase = testcases(:one)
	6	+ end
	7	+ end

test/fixtures/grader_configurations.yml created 644 ¶ +144

@@ -0,0 +1,144
	1	+ GraderConfiguration_1:
	2	+ key: system.single_user_mode
	3	+ value_type: boolean
	4	+ value: 'false'
	5	+ description: Only admins can log in to the system when running under single user mode.
	6	+
	7	+ GraderConfiguration_2:
	8	+ key: ui.front.title
	9	+ value_type: string
	10	+ value: Grader
	11	+
	12	+ GraderConfiguration_3:
	13	+ key: ui.front.welcome_message
	14	+ value_type: string
	15	+ value: Welcome!
	16	+
	17	+ GraderConfiguration_4:
	18	+ key: ui.show_score
	19	+ value_type: boolean
	20	+ value: 'true'
	21	+
	22	+ GraderConfiguration_5:
	23	+ key: contest.time_limit
	24	+ value_type: string
	25	+ value: unlimited
	26	+ description: Time limit in format hh:mm, or "unlimited" for contests with no time
	27	+ limits. This config is CACHED. Restart the server before the change can take
	28	+ effect.
	29	+
	30	+ GraderConfiguration_6:
	31	+ key: system.mode
	32	+ value_type: string
	33	+ value: standard
	34	+ description: Current modes are "standard", "contest", "indv-contest", and "analysis".
	35	+
	36	+
	37	+ GraderConfiguration_7:
	38	+ key: contest.name
	39	+ value_type: string
	40	+ value: Grader
	41	+ description: This name will be shown on the user header bar.
	42	+
	43	+
	44	+ GraderConfiguration_8:
	45	+ key: contest.multisites
	46	+ value_type: boolean
	47	+ value: 'false'
	48	+ description: If the server is in contest mode and this option is true, on the log
	49	+ in of the admin a menu for site selections is shown.
	50	+
	51	+
	52	+ GraderConfiguration_9:
	53	+ key: right.user_hall_of_fame
	54	+ value_type: boolean
	55	+ value: 'false'
	56	+ description: If true, any user can access hall of fame page.
	57	+
	58	+
	59	+ GraderConfiguration_10:
	60	+ key: right.multiple_ip_login
	61	+ value_type: boolean
	62	+ value: 'true'
	63	+ description: When change from true to false, a user can login from the first IP
	64	+ they logged into afterward.
	65	+
	66	+
	67	+ GraderConfiguration_11:
	68	+ key: right.user_view_submission
	69	+ value_type: boolean
	70	+ value: 'false'
	71	+ description: If true, any user can view submissions of every one.
	72	+
	73	+
	74	+ GraderConfiguration_12:
	75	+ key: right.bypass_agreement
	76	+ value_type: boolean
	77	+ value: 'true'
	78	+ description: When false, a user must accept usage agreement before login
	79	+
	80	+
	81	+ GraderConfiguration_13:
	82	+ key: right.heartbeat_response
	83	+ value_type: string
	84	+ value: OK
	85	+ description: Heart beat response text
	86	+
	87	+
	88	+ GraderConfiguration_14:
	89	+ key: right.view_testcase
	90	+ value_type: boolean
	91	+ value: 'false'
	92	+ description: When true, any user can view/download test data
	93	+
	94	+
	95	+ GraderConfiguration_15:
	96	+ key: system.online_registration.smtp
	97	+ value_type: string
	98	+ value: smtp.somehost.com
	99	+
	100	+
	101	+ GraderConfiguration_16:
	102	+ key: system.online_registration.from
	103	+ value_type: string
	104	+ value: your.email@address
	105	+
	106	+
	107	+ GraderConfiguration_17:
	108	+ key: system.admin_email
	109	+ value_type: string
	110	+ value: admin@admin.email
	111	+
	112	+
	113	+ GraderConfiguration_18:
	114	+ key: system.user_setting_enabled
	115	+ value_type: boolean
	116	+ value: 'true'
	117	+ description: If this option is true, users can change their settings
	118	+
	119	+
	120	+ GraderConfiguration_19:
	121	+ key: contest.test_request.early_timeout
	122	+ value_type: boolean
	123	+ value: 'false'
	124	+
	125	+
	126	+ GraderConfiguration_20:
	127	+ key: system.multicontests
	128	+ value_type: boolean
	129	+ value: 'false'
	130	+
	131	+
	132	+ GraderConfiguration_21:
	133	+ key: contest.confirm_indv_contest_start
	134	+ value_type: boolean
	135	+ value: 'false'
	136	+
	137	+
	138	+ GraderConfiguration_22:
	139	+ key: contest.default_contest_name
	140	+ value_type: string
	141	+ value: none
	142	+ description: New user will be assigned to this contest automatically, if it exists. Set
	143	+ to 'none' if there is no default contest.
	144	+

Gemfile ¶ +16 -6

               source 'https://rubygems.org'
+            + #rails
               gem 'rails', '~>4.2.0'
               gem 'activerecord-session_store'
-            - gem 'select2-rails'
               # Bundle edge Rails instead:
               # gem 'rails', :git => 'git://github.com/rails/rails.git'
+            + #---------------- database ---------------------
+            + #the database
               gem 'mysql2'
+            + #for testing
               gem 'sqlite3'
+            + #for dumping database into yaml
+            + gem 'yaml_db'
               # Gems used only for assets and not required
               # in production environments by default.
               gem 'uglifier'
+            + gem 'haml'
+            + gem 'haml-rails'
               # gem 'prototype-rails'
               # To use ActiveModel has_secure_password
               gem 'momentjs-rails'
               gem 'rails_bootstrap_sortable'
+            + #----------- user interface -----------------
+            + #select 2
+            + gem 'select2-rails'
               #ace editor
               gem 'ace-rails-ap'
+            + #paginator
+            + gem 'will_paginate', '~> 3.0.7'
-            - gem 'haml'
-            - gem 'haml-rails'
               gem 'mail'
               gem 'rdiscount'
-            - gem 'test-unit'
-            - gem 'will_paginate', '~> 3.0.7'
               gem 'dynamic_form'
               gem 'in_place_editing'
               gem 'verification', :git => 'https://github.com/sikachu/verification.git'
+            +
+            + #---------------- testiing -----------------------
+            + gem 'minitest-reporters'

Gemfile.lock ¶ +12 -4

                     minitest (~> 5.1)
                     thread_safe (~> 0.3, >= 0.3.4)
                     tzinfo (~> 1.1)
+            +     ansi (1.5.0)
                   arel (6.0.4)
                   autoprefixer-rails (6.6.0)
                     execjs
                   mime-types-data (3.2016.0521)
                   mini_portile2 (2.1.0)
                   minitest (5.10.1)
+            +     minitest-reporters (1.1.13)
+            +       ansi
+            +       builder
+            +       minitest (>= 5.0)
+            +       ruby-progressbar
                   momentjs-rails (2.15.1)
                     railties (>= 3.1)
                   multi_json (1.12.1)
                   mysql2 (0.4.5)
                   nokogiri (1.6.8.1)
                     mini_portile2 (~> 2.1.0)
-            -     power_assert (0.4.1)
                   rack (1.6.5)
                   rack-test (0.6.3)
                     rack (>= 1.0)
                   rake (12.0.0)
                   rdiscount (2.2.0.1)
                   rouge (2.0.7)
+            +     ruby-progressbar (1.8.1)
                   ruby_parser (3.8.3)
                     sexp_processor (~> 4.1)
                   sass (3.4.23)
                     activesupport (>= 4.0)
                     sprockets (>= 3.0.0)
                   sqlite3 (1.3.12)
-            -     test-unit (3.2.3)
-            -       power_assert
                   thor (0.19.4)
                   thread_safe (0.3.5)
                   tilt (2.0.5)
                   uglifier (3.0.4)
                     execjs (>= 0.3.0, < 3)
                   will_paginate (3.0.12)
+            +     yaml_db (0.4.2)
+            +       rails (>= 3.0, < 5.1)
+            +       rake (>= 0.8.7)
               PLATFORMS
                 ruby
                 jquery-timepicker-addon-rails
                 jquery-ui-rails
                 mail
+            +   minitest-reporters
                 momentjs-rails
                 mysql2
                 rails (~> 4.2.0)
                 sass-rails
                 select2-rails
                 sqlite3
-            -   test-unit
                 uglifier
                 verification!
                 will_paginate (~> 3.0.7)
+            +   yaml_db
               BUNDLED WITH
 .13.6

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

               class ApplicationController < ActionController::Base
                 protect_from_forgery
-            -   before_filter :current_user
+            +   before_filter :current_user
                 SINGLE_USER_MODE_CONF_KEY = 'system.single_user_mode'
                 MULTIPLE_IP_LOGIN_CONF_KEY = 'right.multiple_ip_login'
                   end
                 end
+            +   def testcase_authorization
+            +     #admin always has privileged
+            +     if @current_user.admin?
+            +       return true
+            +     end
+            +
+            +     unauthorized_redirect if GraderConfiguration["right.view_testcase"]
+            +   end
+            +
                 protected
                 def authenticate

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

               class ProblemsController < ApplicationController
-            -   before_filter :authenticate, :authorization
+            +   before_action :authenticate, :authorization
+            +   before_action :testcase_authorization, only: [:show_testcase]
                 in_place_edit_for :problem, :name
                 in_place_edit_for :problem, :full_name
                   redirect_to :action => 'manage'
                 end
+            +   def show_testcase
+            +     @problem = Problem.includes(:testcases).find(params[:id])
+            +   end
+            +
                 ##################################
                 protected

app/models/grader_configuration.rb ¶ +6

                 MULTICONTESTS_KEY = 'system.multicontests'
                 CONTEST_TIME_LIMIT_KEY = 'contest.time_limit'
                 MULTIPLE_IP_LOGIN_KEY = 'right.multiple_ip_login'
+            +   VIEW_TESTCASE = 'right.view_testcase'
+            +   SINGLE_USER_KEY = 'system.single_user_mode'
                 cattr_accessor :config_cache
                 cattr_accessor :task_grading_info_cache
                   return (get(SYSTEM_MODE_CONF_KEY)=='analysis')
                 end
+            +   def  self.show_testcase
+            +     return get(VIEW_TESTCASE)
+            +   end
+            +
                 def self.allow_test_request(user)
                   mode = get(SYSTEM_MODE_CONF_KEY)
                   early_timeout = get(TEST_REQUEST_EARLY_TIMEOUT_KEY)

app/views/main/_login_box.html.haml ¶ +1 -1

                   %hr/
                 %div{ :style => "border: solid 1px gray; padding: 4px; background: #eeeeff;"}
-            -     = form_tag :controller => 'login', :action => 'login' do
+            +     = form_tag login_login_path do
                     %table
                       %tr
                         %td{:align => "right"}

app/views/main/_submission_short.html.haml ¶ +2

                   = link_to "#{t 'main.cmp_msg'}", compiler_msg_submission_path(submission.id), {popup: true,remote: true,class: 'btn btn-xs btn-info'}
                 = link_to "#{t 'main.src_link'}",{:action => 'source', :id => submission.id}, class: 'btn btn-xs btn-info'
                 = link_to "#{t 'main.submissions_link'}", problem_submissions_path(problem_id), class: 'btn btn-xs btn-info'
+            +   - if GraderConfiguration.show_testcase
+            +     = link_to "testcases", show_testcase_problem_path(problem_id), class: 'btn btn-xs btn-info'

app/views/main/list.html.haml ¶ +11

@@ -50,3 +50,14
50	= "Announcement.refreshUrl = '#{url_for :controller => 'main', :action => 'announcements'}';"	50	= "Announcement.refreshUrl = '#{url_for :controller => 'main', :action => 'announcements'}';"
51	Announcement.registerRefreshEventTimer();	51	Announcement.registerRefreshEventTimer();
52		52
		53	+ .modal.fade#compiler{tabindex: -1,role: 'dialog'}
		54	+ .modal-dialog.modal-lg{role:'document'}
		55	+ .modal-content
		56	+ .modal-header
		57	+ %button.close{type: 'button', data: {dismissed: :modal}, aria: {label: 'close'}}
		58	+ %span{aria: {hidden: 'true'}, data: {dismiss: 'modal'}} ×
		59	+ %h4 Compiler message
		60	+ .modal-body
		61	+ %pre#compiler_msg
		62	+ .modal-footer
		63	+ %button.btn.btn-default{type: 'button', data: {dismiss: 'modal'}} Close

app/views/submissions/compiler_msg.js.haml ¶ +4 -3

@@ -1,3 +1,4
1	- :javascript	1	+ :plain
2	- $("#compiler_msg").html("#{j @submissionhcompiler_msg}")	2	+ $("#compiler_msg").html("#{j @submission.compiler_message}");
3	-	3	+ $("#compiler").modal();
		4	+

app/views/submissions/get_latest_submission_status.js.haml ¶ +1 -1

@@ -1,2 +1,2
1	- :javascript	1	+ :plain
2	$("#latest_status").html("#{j render({partial: 'submission_short', locals: {submission: @submission, problem_name: @problem.name}})}")	2	$("#latest_status").html("#{j render({partial: 'submission_short', locals: {submission: @submission, problem_name: @problem.name}})}")

config/routes.rb ¶ +11

                 root :to => 'main#login'
+            +   #logins
+            +   get 'login/login',  to: 'login#login'
+            +
                 resources :contests
                 resources :sites
                     get 'toggle'
                     get 'toggle_test'
                     get 'stat'
+            +       get 'show_testcase'
                   end
                   collection do
                     get 'turn_all_off'
                     get 'import'
                     get 'manage'
                   end
+            +
+            +     resources :testcases, only: [] do
+            +       member do
+            +         get 'download_input'
+            +         get 'download_sol'
+            +       end
+            +     end
                 end
                 resources :grader_configuration, controller: 'configurations'

db/schema.rb ¶ +140 -140

               ActiveRecord::Schema.define(version: 20161031063337) do
                 create_table "announcements", force: :cascade do |t|
-            -     t.string   "author"
+            +     t.string   "author",       limit: 255
-            -     t.text     "body"
+            +     t.text     "body",         limit: 65535
                   t.boolean  "published"
-            -     t.datetime "created_at",                   null: false
+            +     t.datetime "created_at",                                 null: false
-            -     t.datetime "updated_at",                   null: false
+            +     t.datetime "updated_at",                                 null: false
-            -     t.boolean  "frontpage",    default: false
+            +     t.boolean  "frontpage",                  default: false
-            -     t.boolean  "contest_only", default: false
+            +     t.boolean  "contest_only",               default: false
-            -     t.string   "title"
+            +     t.string   "title",        limit: 255
-            -     t.string   "notes"
+            +     t.string   "notes",        limit: 255
                 end
                 create_table "contests", force: :cascade do |t|
-            -     t.string   "title"
+            +     t.string   "title",      limit: 255
                   t.boolean  "enabled"
-            -     t.datetime "created_at", null: false
+            +     t.datetime "created_at",             null: false
-            -     t.datetime "updated_at", null: false
+            +     t.datetime "updated_at",             null: false
-            -     t.string   "name"
+            +     t.string   "name",       limit: 255
                 end
                 create_table "contests_problems", id: false, force: :cascade do |t|
-            -     t.integer "contest_id"
+            +     t.integer "contest_id", limit: 4
-            -     t.integer "problem_id"
+            +     t.integer "problem_id", limit: 4
                 end
                 create_table "contests_users", id: false, force: :cascade do |t|
-            -     t.integer "contest_id"
+            +     t.integer "contest_id", limit: 4
-            -     t.integer "user_id"
+            +     t.integer "user_id",    limit: 4
                 end
                 create_table "countries", force: :cascade do |t|
-            -     t.string   "name"
+            +     t.string   "name",       limit: 255
-            -     t.datetime "created_at", null: false
+            +     t.datetime "created_at",             null: false
-            -     t.datetime "updated_at", null: false
+            +     t.datetime "updated_at",             null: false
                 end
                 create_table "descriptions", force: :cascade do |t|
-            -     t.text     "body"
+            +     t.text     "body",       limit: 65535
                   t.boolean  "markdowned"
-            -     t.datetime "created_at", null: false
+            +     t.datetime "created_at",               null: false
-            -     t.datetime "updated_at", null: false
+            +     t.datetime "updated_at",               null: false
                 end
                 create_table "grader_configurations", force: :cascade do |t|
-            -     t.string   "key"
+            +     t.string   "key",         limit: 255
-            -     t.string   "value_type"
+            +     t.string   "value_type",  limit: 255
-            -     t.string   "value"
+            +     t.string   "value",       limit: 255
-            -     t.datetime "created_at",  null: false
+            +     t.datetime "created_at",                null: false
-            -     t.datetime "updated_at",  null: false
+            +     t.datetime "updated_at",                null: false
-            -     t.text     "description"
+            +     t.text     "description", limit: 65535
                 end
                 create_table "grader_processes", force: :cascade do |t|
-            -     t.string   "host"
+            +     t.string   "host",       limit: 255
-            -     t.integer  "pid"
+            +     t.integer  "pid",        limit: 4
-            -     t.string   "mode"
+            +     t.string   "mode",       limit: 255
                   t.boolean  "active"
-            -     t.datetime "created_at", null: false
+            +     t.datetime "created_at",             null: false
-            -     t.datetime "updated_at", null: false
+            +     t.datetime "updated_at",             null: false
-            -     t.integer  "task_id"
+            +     t.integer  "task_id",    limit: 4
-            -     t.string   "task_type"
+            +     t.string   "task_type",  limit: 255
                   t.boolean  "terminated"
                 end
-            -   add_index "grader_processes", ["host", "pid"], name: "index_grader_processes_on_ip_and_pid"
+            +   add_index "grader_processes", ["host", "pid"], name: "index_grader_processes_on_ip_and_pid", using: :btree
                 create_table "heart_beats", force: :cascade do |t|
-            -     t.integer  "user_id"
+            +     t.integer  "user_id",    limit: 4
-            -     t.string   "ip_address"
+            +     t.string   "ip_address", limit: 255
-            -     t.datetime "created_at", null: false
+            +     t.datetime "created_at",             null: false
-            -     t.datetime "updated_at", null: false
+            +     t.datetime "updated_at",             null: false
-            -     t.string   "status"
+            +     t.string   "status",     limit: 255
                 end
-            -   add_index "heart_beats", ["updated_at"], name: "index_heart_beats_on_updated_at"
+            +   add_index "heart_beats", ["updated_at"], name: "index_heart_beats_on_updated_at", using: :btree
                 create_table "languages", force: :cascade do |t|
                   t.string "name",        limit: 10
-            -     t.string "pretty_name"
+            +     t.string "pretty_name", limit: 255
                   t.string "ext",         limit: 10
-            -     t.string "common_ext"
+            +     t.string "common_ext",  limit: 255
                 end
                 create_table "logins", force: :cascade do |t|
-            -     t.integer  "user_id"
+            +     t.integer  "user_id",    limit: 4
-            -     t.string   "ip_address"
+            +     t.string   "ip_address", limit: 255
-            -     t.datetime "created_at", null: false
+            +     t.datetime "created_at",             null: false
-            -     t.datetime "updated_at", null: false
+            +     t.datetime "updated_at",             null: false
                 end
                 create_table "messages", force: :cascade do |t|
-            -     t.integer  "sender_id"
+            +     t.integer  "sender_id",           limit: 4
-            -     t.integer  "receiver_id"
+            +     t.integer  "receiver_id",         limit: 4
-            -     t.integer  "replying_message_id"
+            +     t.integer  "replying_message_id", limit: 4
-            -     t.text     "body"
+            +     t.text     "body",                limit: 65535
                   t.boolean  "replied"
-            -     t.datetime "created_at",          null: false
+            +     t.datetime "created_at",                        null: false
-            -     t.datetime "updated_at",          null: false
+            +     t.datetime "updated_at",                        null: false
                 end
                 create_table "problems", force: :cascade do |t|
                   t.string  "name",                 limit: 30
-            -     t.string  "full_name"
+            +     t.string  "full_name",            limit: 255
-            -     t.integer "full_score"
+            +     t.integer "full_score",           limit: 4
                   t.date    "date_added"
                   t.boolean "available"
-            -     t.string  "url"
+            +     t.string  "url",                  limit: 255
-            -     t.integer "description_id"
+            +     t.integer "description_id",       limit: 4
                   t.boolean "test_allowed"
                   t.boolean "output_only"
-            -     t.string  "description_filename"
+            +     t.string  "description_filename", limit: 255
                 end
                 create_table "rights", force: :cascade do |t|
-            -     t.string "name"
+            +     t.string "name",       limit: 255
-            -     t.string "controller"
+            +     t.string "controller", limit: 255
-            -     t.string "action"
+            +     t.string "action",     limit: 255
                 end
                 create_table "rights_roles", id: false, force: :cascade do |t|
-            -     t.integer "right_id"
+            +     t.integer "right_id", limit: 4
-            -     t.integer "role_id"
+            +     t.integer "role_id",  limit: 4
                 end
-            -   add_index "rights_roles", ["role_id"], name: "index_rights_roles_on_role_id"
+            +   add_index "rights_roles", ["role_id"], name: "index_rights_roles_on_role_id", using: :btree
                 create_table "roles", force: :cascade do |t|
-            -     t.string "name"
+            +     t.string "name", limit: 255
                 end
                 create_table "roles_users", id: false, force: :cascade do |t|
-            -     t.integer "role_id"
+            +     t.integer "role_id", limit: 4
-            -     t.integer "user_id"
+            +     t.integer "user_id", limit: 4
                 end
-            -   add_index "roles_users", ["user_id"], name: "index_roles_users_on_user_id"
+            +   add_index "roles_users", ["user_id"], name: "index_roles_users_on_user_id", using: :btree
                 create_table "sessions", force: :cascade do |t|
-            -     t.string   "session_id"
+            +     t.string   "session_id", limit: 255
-            -     t.text     "data"
+            +     t.text     "data",       limit: 65535
                   t.datetime "updated_at"
                 end
-            -   add_index "sessions", ["session_id"], name: "index_sessions_on_session_id"
+            +   add_index "sessions", ["session_id"], name: "index_sessions_on_session_id", using: :btree
-            -   add_index "sessions", ["updated_at"], name: "index_sessions_on_updated_at"
+            +   add_index "sessions", ["updated_at"], name: "index_sessions_on_updated_at", using: :btree
                 create_table "sites", force: :cascade do |t|
-            -     t.string   "name"
+            +     t.string   "name",       limit: 255
                   t.boolean  "started"
                   t.datetime "start_time"
-            -     t.datetime "created_at", null: false
+            +     t.datetime "created_at",             null: false
-            -     t.datetime "updated_at", null: false
+            +     t.datetime "updated_at",             null: false
-            -     t.integer  "country_id"
+            +     t.integer  "country_id", limit: 4
-            -     t.string   "password"
+            +     t.string   "password",   limit: 255
                 end
                 create_table "submission_view_logs", force: :cascade do |t|
-            -     t.integer  "user_id"
+            +     t.integer  "user_id",       limit: 4
-            -     t.integer  "submission_id"
+            +     t.integer  "submission_id", limit: 4
-            -     t.datetime "created_at",    null: false
+            +     t.datetime "created_at",              null: false
-            -     t.datetime "updated_at",    null: false
+            +     t.datetime "updated_at",              null: false
                 end
                 create_table "submissions", force: :cascade do |t|
-            -     t.integer  "user_id"
+            +     t.integer  "user_id",               limit: 4
-            -     t.integer  "problem_id"
+            +     t.integer  "problem_id",            limit: 4
-            -     t.integer  "language_id"
+            +     t.integer  "language_id",           limit: 4
-            -     t.text     "source"
+            +     t.text     "source",                limit: 65535
-            -     t.binary   "binary"
+            +     t.binary   "binary",                limit: 65535
                   t.datetime "submitted_at"
                   t.datetime "compiled_at"
-            -     t.text     "compiler_message"
+            +     t.text     "compiler_message",      limit: 65535
                   t.datetime "graded_at"
-            -     t.integer  "points"
+            +     t.integer  "points",                limit: 4
-            -     t.text     "grader_comment"
+            +     t.text     "grader_comment",        limit: 65535
-            -     t.integer  "number"
+            +     t.integer  "number",                limit: 4
-            -     t.string   "source_filename"
+            +     t.string   "source_filename",       limit: 255
-            -     t.float    "max_runtime"
+            +     t.float    "max_runtime",           limit: 24
-            -     t.integer  "peak_memory"
+            +     t.integer  "peak_memory",           limit: 4
-            -     t.integer  "effective_code_length"
+            +     t.integer  "effective_code_length", limit: 4
-            -     t.string   "ip_address"
+            +     t.string   "ip_address",            limit: 255
                 end
-            -   add_index "submissions", ["user_id", "problem_id", "number"], name: "index_submissions_on_user_id_and_problem_id_and_number", unique: true
+            +   add_index "submissions", ["user_id", "problem_id", "number"], name: "index_submissions_on_user_id_and_problem_id_and_number", unique: true, using: :btree
-            -   add_index "submissions", ["user_id", "problem_id"], name: "index_submissions_on_user_id_and_problem_id"
+            +   add_index "submissions", ["user_id", "problem_id"], name: "index_submissions_on_user_id_and_problem_id", using: :btree
                 create_table "tasks", force: :cascade do |t|
-            -     t.integer  "submission_id"
+            +     t.integer  "submission_id", limit: 4
                   t.datetime "created_at"
-            -     t.integer  "status"
+            +     t.integer  "status",        limit: 4
                   t.datetime "updated_at"
                 end
                 create_table "test_pairs", force: :cascade do |t|
-            -     t.integer  "problem_id"
+            +     t.integer  "problem_id", limit: 4
                   t.text     "input",      limit: 16777215
                   t.text     "solution",   limit: 16777215
                   t.datetime "created_at",                  null: false
                 end
                 create_table "test_requests", force: :cascade do |t|
-            -     t.integer  "user_id"
+            +     t.integer  "user_id",          limit: 4
-            -     t.integer  "problem_id"
+            +     t.integer  "problem_id",       limit: 4
-            -     t.integer  "submission_id"
+            +     t.integer  "submission_id",    limit: 4
-            -     t.string   "input_file_name"
+            +     t.string   "input_file_name",  limit: 255
-            -     t.string   "output_file_name"
+            +     t.string   "output_file_name", limit: 255
-            -     t.string   "running_stat"
+            +     t.string   "running_stat",     limit: 255
-            -     t.integer  "status"
+            +     t.integer  "status",           limit: 4
-            -     t.datetime "updated_at",       null: false
+            +     t.datetime "updated_at",                     null: false
                   t.datetime "submitted_at"
                   t.datetime "compiled_at"
-            -     t.text     "compiler_message"
+            +     t.text     "compiler_message", limit: 65535
                   t.datetime "graded_at"
-            -     t.string   "grader_comment"
+            +     t.string   "grader_comment",   limit: 255
-            -     t.datetime "created_at",       null: false
+            +     t.datetime "created_at",                     null: false
-            -     t.float    "running_time"
+            +     t.float    "running_time",     limit: 24
-            -     t.string   "exit_status"
+            +     t.string   "exit_status",      limit: 255
-            -     t.integer  "memory_usage"
+            +     t.integer  "memory_usage",     limit: 4
                 end
-            -   add_index "test_requests", ["user_id", "problem_id"], name: "index_test_requests_on_user_id_and_problem_id"
+            +   add_index "test_requests", ["user_id", "problem_id"], name: "index_test_requests_on_user_id_and_problem_id", using: :btree
                 create_table "testcases", force: :cascade do |t|
-            -     t.integer  "problem_id"
+            +     t.integer  "problem_id", limit: 4
-            -     t.integer  "num"
+            +     t.integer  "num",        limit: 4
-            -     t.integer  "group"
+            +     t.integer  "group",      limit: 4
-            -     t.integer  "score"
+            +     t.integer  "score",      limit: 4
-            -     t.text     "input"
+            +     t.text     "input",      limit: 65535
-            -     t.text     "sol"
+            +     t.text     "sol",        limit: 65535
-            -     t.datetime "created_at", null: false
+            +     t.datetime "created_at"
-            -     t.datetime "updated_at", null: false
+            +     t.datetime "updated_at"
                 end
-            -   add_index "testcases", ["problem_id"], name: "index_testcases_on_problem_id"
+            +   add_index "testcases", ["problem_id"], name: "index_testcases_on_problem_id", using: :btree
                 create_table "user_contest_stats", force: :cascade do |t|
-            -     t.integer  "user_id"
+            +     t.integer  "user_id",       limit: 4
                   t.datetime "started_at"
-            -     t.datetime "created_at",    null: false
+            +     t.datetime "created_at",              null: false
-            -     t.datetime "updated_at",    null: false
+            +     t.datetime "updated_at",              null: false
                   t.boolean  "forced_logout"
                 end
                 create_table "users", force: :cascade do |t|
                   t.string   "login",           limit: 50
-            -     t.string   "full_name"
+            +     t.string   "full_name",       limit: 255
-            -     t.string   "hashed_password"
+            +     t.string   "hashed_password", limit: 255
                   t.string   "salt",            limit: 5
-            -     t.string   "alias"
+            +     t.string   "alias",           limit: 255
-            -     t.string   "email"
+            +     t.string   "email",           limit: 255
-            -     t.integer  "site_id"
+            +     t.integer  "site_id",         limit: 4
-            -     t.integer  "country_id"
+            +     t.integer  "country_id",      limit: 4
-            -     t.boolean  "activated",                  default: false
+            +     t.boolean  "activated",                   default: false
                   t.datetime "created_at"
                   t.datetime "updated_at"
-            -     t.boolean  "enabled",                    default: true
+            +     t.boolean  "enabled",                     default: true
-            -     t.string   "remark"
+            +     t.string   "remark",          limit: 255
-            -     t.string   "last_ip"
+            +     t.string   "last_ip",         limit: 255
-            -     t.string   "section"
+            +     t.string   "section",         limit: 255
                 end
-            -   add_index "users", ["login"], name: "index_users_on_login", unique: true
+            +   add_index "users", ["login"], name: "index_users_on_login", unique: true, using: :btree
               end

db/seeds.rb ¶ +6

                    :description => 'Heart beat response text'
                  },
+            +    {
+            +      :key => 'right.view_testcase',
+            +      :value_type => 'boolean',
+            +      :default_value => 'false',
+            +      :description => 'When true, any user can view/download test data'
+            +    },
                  # If Configuration['system.online_registration'] is true, the
                  # system allows online registration, and will use these
                  # information for sending confirmation emails.

lib/grader_script.rb ¶ +16 -1

@@ -49,10 +49,25
49	output = `#{cmd}`	49	output = `#{cmd}`
50		50
51	Dir.chdir(cur_dir)	51	Dir.chdir(cur_dir)
52	-	52	+
53	return "import CMD: #{cmd}\n" + output	53	return "import CMD: #{cmd}\n" + output
54	end	54	end
55	return ''	55	return ''
56	end	56	end
57		57
		58	+ def self.call_import_testcase(problem_name)
		59	+ if GraderScript.grader_control_enabled?
		60	+ cur_dir = `pwd`.chomp
		61	+ Dir.chdir(GRADER_ROOT_DIR)
		62	+
		63	+ script_name = File.join(GRADER_ROOT_DIR, "scripts/load_testcase")
		64	+ cmd = "#{script_name} #{problem_name}"
		65	+
		66	+ output = `#{cmd}`
		67	+
		68	+ Dir.chdir(cur_dir)
		69	+ return "Testcase import result:\n" + output
		70	+ end
		71	+ end
		72	+
58	end	73	end

lib/testdata_importer.rb ¶ +3

                   @log_msg << import_problem_pdf(dirname)
                   @log_msg << import_full_score(dirname)
+            +     #import test data
+            +     @log_msg << GraderScript.call_import_testcase(@problem.name)
+            +
                   return true
                 end

test/fixtures/languages.yml ¶ +36 -5

@@ -1,5 +1,36
1	- # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html	1	+ Language_1:
2	- one:	2	+ name: c
3	- id: 1	3	+ pretty_name: C
4	- two:	4	+ ext: c
5	- id: 2	5	+ common_ext: c
		6	+
		7	+ Language_2:
		8	+ name: cpp
		9	+ pretty_name: C++
		10	+ ext: cpp
		11	+ common_ext: cpp,cc
		12	+
		13	+ Language_3:
		14	+ name: pas
		15	+ pretty_name: Pascal
		16	+ ext: pas
		17	+ common_ext: pas
		18	+
		19	+ Language_4:
		20	+ name: ruby
		21	+ pretty_name: Ruby
		22	+ ext: rb
		23	+ common_ext: rb
		24	+
		25	+ Language_5:
		26	+ name: python
		27	+ pretty_name: Python
		28	+ ext: py
		29	+ common_ext: py
		30	+
		31	+ Language_6:
		32	+ name: java
		33	+ pretty_name: Java
		34	+ ext: java
		35	+ common_ext: java
		36	+

test/fixtures/users.yml ¶ +4 -4

                 salt: <%= salt %>
                 activated: true
-            - mary:
+            + admin:
-            -   login: mary
+            +   login: admin
-            -   full_name: mary
+            +   full_name: admin
-            -   hashed_password: <%= User.encrypt("goodbye",salt) %>
+            +   hashed_password: <%= User.encrypt("admin",salt) %>
                 salt: <%= salt %>
                 roles: admin
                 activated: true

test/integration/login_test.rb ¶ +28 -1

@@ -5,9 +5,36
5	# assert true	5	# assert true
6	# end	6	# end
7		7
8	- test "login with valid information" do	8	+ test "login with invalid information" do
		9	+ get root_path
		10	+ assert_response :success
		11	+ post login_login_path, login: "root", password: "hahaha"
		12	+ assert_redirected_to root_path
		13	+ end
		14	+
		15	+ test "normal user login" do
9	get root_path	16	get root_path
10	assert_response :success	17	assert_response :success
		18	+ post login_login_path, {login: "john", password: "hello" }
		19	+ assert_redirected_to main_list_path
		20	+ end
11		21
		22	+ test "normal user login in single_user mode" do
		23	+ GraderConfiguration.find_by(key: GraderConfiguration::SINGLE_USER_KEY).update_attributes(value: 'true')
		24	+ GraderConfiguration.reload
		25	+ get root_path
		26	+ assert_response :success
		27	+ post login_login_path, {login: "john", password: "hello" }
		28	+ follow_redirect!
		29	+ assert_redirected_to root_path
		30	+ end
		31	+
		32	+ test "root login in in single_user mode" do
		33	+ GraderConfiguration.find_by(key: GraderConfiguration::SINGLE_USER_KEY).update_attributes(value: 'true')
		34	+ GraderConfiguration.reload
		35	+ get root_path
		36	+ assert_response :success
		37	+ post login_login_path, {login: "admin", password: "admin" }
		38	+ assert_redirected_to main_list_path
12	end	39	end
13	end	40	end

test/test_helper.rb ¶ +4

               require File.expand_path('../../config/environment', __FILE__)
               require 'rails/test_help'
+            + #reporter
+            + require "minitest/reporters"
+            + Minitest::Reporters.use!
+            +
               class ActiveSupport::TestCase
                 # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
                 #

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

r628:3df78cd5515f - Fri, 06 Jan 2017 11:05:50 - 25 files changed: 560 inserted, 168 deleted

Sign in to your account

Commit r628:3df78cd5515f public

Author

r628:3df78cd5515f - Fri, 06 Jan 2017 11:05:50 - 25 files changed: 560 inserted, 168 deleted

Commit `r628:3df78cd5515f` public