cafe-grader-web Commit - r564:484b31caab29

cafe-grader-web

Commit `r564:484b31caab29` public

parent | child

Description:

live editor using cloud9 ace for problem

Commit status:

[Not Reviewed]

References:

bootstrap

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r564:484b31caab29 - Sat, 02 Jul 2016 06:11:19 - 16 files changed: 121 inserted, 1 deleted

app/assets/javascripts/sources.js.coffee created 644 ¶ +10

@@ -0,0 +1,10
	1	+ # Place all the behaviors and hooks related to the matching controller here.
	2	+ # All this logic will automatically be available in application.js.
	3	+ # You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
	4	+
	5	+
	6	+ $ ->
	7	+ $("#live_submit").on "click", (event) ->
	8	+ h = $("#editor_text")
	9	+ e = ace.edit("editor")
	10	+ h.val(e.getValue())

app/assets/stylesheets/sources.css.scss created 644 ¶ +12

@@ -0,0 +1,12
	1	+ // Place all the styles related to the sources controller here.
	2	+ // They will automatically be included in application.css.
	3	+ // You can use Sass (SCSS) here: http://sass-lang.com/
	4	+
	5	+ #editor {
	6	+ position: absolute;
	7	+ top: 0;
	8	+ right: 0;
	9	+ bottom: 0;
	10	+ left: 0;
	11	+ }
	12	+

app/controllers/sources_controller.rb created 644 ¶ +7

@@ -0,0 +1,7
	1	+ class SourcesController < ApplicationController
	2	+ before_filter :authenticate, :except => [:index, :login]
	3	+
	4	+ def direct_edit
	5	+ @problem = Problem.find_by_id(params[:pid])
	6	+ end
	7	+ end

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

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

app/views/sources/direct_edit.html.haml created 644 ¶ +21

@@ -0,0 +1,21
	1	+ %h1 Live submit
	2	+ = form_tag({controller: :main, :action => 'submit'}, :multipart => true, class: 'form-inline') do
	3	+ = hidden_field_tag 'editor_text'
	4	+ = hidden_field_tag 'submission[problem_id]', @problem.id
	5	+ .form-group
	6	+ = label_tag "Task:"
	7	+ = text_field_tag 'asdf', "#{@problem.long_name}", class: 'form-control', disabled: true
	8	+
	9	+ .form-group
	10	+ = label_tag 'Language'
	11	+ = select_tag 'language_id', options_from_collection_for_select(Language.all, 'id', 'pretty_name',"C++"), class: 'form-control', style: "width: 100px"
	12	+ .form-group
	13	+ = submit_tag 'Submit', class: 'btn btn-success', id: 'live_submit'
	14	+
	15	+ %br
	16	+
	17	+ .container
	18	+ .row
	19	+ .col-md-12
	20	+ %div#editor{style: 'height: 400px'}
	21	+ Hahaha

spec/controllers/sources_controller_spec.rb created 644 ¶ +12

@@ -0,0 +1,12
	1	+ require 'spec_helper'
	2	+
	3	+ describe SourcesController do
	4	+
	5	+ describe "GET 'direct_edit'" do
	6	+ it "returns http success" do
	7	+ get 'direct_edit'
	8	+ response.should be_success
	9	+ end
	10	+ end
	11	+
	12	+ end

spec/helpers/sources_helper_spec.rb created 644 ¶ +15

@@ -0,0 +1,15
	1	+ require 'spec_helper'
	2	+
	3	+ # Specs in this file have access to a helper object that includes
	4	+ # the SourcesHelper. For example:
	5	+ #
	6	+ # describe SourcesHelper do
	7	+ # describe "string concat" do
	8	+ # it "concats two strings with spaces" do
	9	+ # expect(helper.concat_strings("this","that")).to eq("this that")
	10	+ # end
	11	+ # end
	12	+ # end
	13	+ describe SourcesHelper do
	14	+ pending "add some examples to (or delete) #{__FILE__}"
	15	+ end

spec/views/sources/direct_edit.html.haml_spec.rb created 644 ¶ +5

@@ -0,0 +1,5
	1	+ require 'spec_helper'
	2	+
	3	+ describe "sources/direct_edit.html.haml" do
	4	+ pending "add some examples to (or delete) #{__FILE__}"
	5	+ end

Gemfile ¶ +3

               # Gems used only for assets and not required
               # in production environments by default.
               group :assets do
                 gem 'sass-rails',   '~> 3.2.6'
                 gem 'coffee-rails', '~> 3.2.2'
                 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
                 # gem 'therubyracer', :platforms => :ruby
                 gem 'uglifier'
               end
               gem 'prototype-rails'
               # To use ActiveModel has_secure_password
               # gem 'bcrypt-ruby', '~> 3.0.0'
               # To use Jbuilder templates for JSON
               # gem 'jbuilder'
               # Use unicorn as the app server
               # gem 'unicorn'
               # Deploy with Capistrano
               # gem 'capistrano'
               # To use debugger
               # gem 'debugger'
               #
               #in-place editor
               gem 'best_in_place', '~> 3.0.1'
               # jquery addition
               gem 'jquery-rails'
               gem 'jquery-ui-sass-rails'
               gem 'jquery-timepicker-addon-rails'
               gem 'jquery-tablesorter'
               #syntax highlighter
               gem 'rouge'
               #add bootstrap
               gem 'bootstrap-sass', '~> 3.2.0'
               gem 'bootstrap-switch-rails'
               gem 'bootstrap-toggle-rails'
               gem 'autoprefixer-rails'
+            + gem 'ace-rails-ap'
+            +
               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'
               group :test, :development do
                 gem 'rspec-rails', '~> 2.99.0'
               end

Gemfile.lock ¶ +8

               GIT
                 remote: https://github.com/sikachu/verification.git
                 revision: 76eaf51b13276ecae54bd9cd115832595d2ff56d
                 specs:
                   verification (1.0.3)
                     actionpack (>= 3.0.0, < 5.0)
                     activesupport (>= 3.0.0, < 5.0)
               GEM
                 remote: https://rubygems.org/
                 specs:
+            +     ace-rails-ap (4.0.2)
                   actionmailer (3.2.21)
                     actionpack (= 3.2.21)
                     mail (~> 2.5.4)
                   actionpack (3.2.21)
                     activemodel (= 3.2.21)
                     activesupport (= 3.2.21)
                     builder (~> 3.0.0)
                     erubis (~> 2.7.0)
                     journey (~> 1.0.4)
                     rack (~> 1.4.5)
                     rack-cache (~> 1.2)
                     rack-test (~> 0.6.1)
                     sprockets (~> 2.2.1)
                   activemodel (3.2.21)
                     activesupport (= 3.2.21)
                     builder (~> 3.0.0)
                   activerecord (3.2.21)
                     activemodel (= 3.2.21)
                     activesupport (= 3.2.21)
                     arel (~> 3.0.2)
                     tzinfo (~> 0.3.29)
                   activeresource (3.2.21)
                     activemodel (= 3.2.21)
                     activesupport (= 3.2.21)
                   activesupport (3.2.21)
                     i18n (~> 0.6, >= 0.6.4)
                     multi_json (~> 1.0)
                   arel (3.0.3)
                   autoprefixer-rails (6.0.3)
                     execjs
                     json
                   best_in_place (3.0.3)
                     actionpack (>= 3.2)
                     railties (>= 3.2)
                   bootstrap-sass (3.2.0.2)
                     sass (~> 3.2)
                   bootstrap-switch-rails (3.3.3)
                   bootstrap-toggle-rails (2.2.1.0)
                   builder (3.0.4)
                   coffee-rails (3.2.2)
                     coffee-script (>= 2.2.0)
                     railties (~> 3.2.0)
                   coffee-script (2.3.0)
                     coffee-script-source
                     execjs
                   coffee-script-source (1.9.0)
                   diff-lcs (1.2.5)
                   dynamic_form (1.1.4)
                   erubis (2.7.0)
                   execjs (2.3.0)
                   haml (4.0.6)
                     tilt
+            +     haml-rails (0.4)
+            +       actionpack (>= 3.1, < 4.1)
+            +       activesupport (>= 3.1, < 4.1)
+            +       haml (>= 3.1, < 4.1)
+            +       railties (>= 3.1, < 4.1)
                   hike (1.2.3)
                   i18n (0.7.0)
                   in_place_editing (1.2.0)
                   journey (1.0.4)
                   jquery-rails (3.1.2)
                     railties (>= 3.0, < 5.0)
                     thor (>= 0.14, < 2.0)
                   jquery-tablesorter (1.13.4)
                     railties (>= 3.1, < 5)
                   jquery-timepicker-addon-rails (1.4.1)
                     railties (>= 3.1)
                   jquery-ui-rails (4.0.3)
                     jquery-rails
                     railties (>= 3.1.0)
                   jquery-ui-sass-rails (4.0.3.0)
                     jquery-rails
                     jquery-ui-rails (= 4.0.3)
                     railties (>= 3.1.0)
                   json (1.8.2)
                   mail (2.5.4)
                     mime-types (~> 1.16)
                     treetop (~> 1.4.8)
                   mime-types (1.25.1)
                   multi_json (1.10.1)
                   mysql2 (0.3.20)
                   polyglot (0.3.5)
                   power_assert (0.2.2)
                   prototype-rails (3.2.1)
                     rails (~> 3.2)
                   rack (1.4.5)
                   rack-cache (1.2)
                     rack (>= 0.4)
                   rack-ssl (1.3.4)
                     rack
                   rack-test (0.6.3)
                     rack (>= 1.0)
                   rails (3.2.21)
                     actionmailer (= 3.2.21)
                     actionpack (= 3.2.21)
                     activerecord (= 3.2.21)
                     activeresource (= 3.2.21)
                     activesupport (= 3.2.21)
                     bundler (~> 1.0)
                     railties (= 3.2.21)
                   railties (3.2.21)
                     actionpack (= 3.2.21)
                     activesupport (= 3.2.21)
                     rack-ssl (~> 1.3.2)
                   rdiscount (2.1.8)
                   rdoc (3.12.2)
                     json (~> 1.4)
                   rouge (1.8.0)
                   rspec-collection_matchers (1.1.2)
                     rspec-expectations (>= 2.99.0.beta1)
                   rspec-core (2.99.2)
                   rspec-expectations (2.99.2)
                     diff-lcs (>= 1.1.3, < 2.0)
                   rspec-mocks (2.99.3)
                   rspec-rails (2.99.0)
                     actionpack (>= 3.0)
                     activemodel (>= 3.0)
                     activesupport (>= 3.0)
                     railties (>= 3.0)
                     rspec-collection_matchers
                     rspec-core (~> 2.99.0)
                     rspec-expectations (~> 2.99.0)
                     rspec-mocks (~> 2.99.0)
                   sass (3.4.11)
                   sass-rails (3.2.6)
                     railties (~> 3.2.0)
                     sass (>= 3.1.10)
                     tilt (~> 1.3)
                   select2-rails (4.0.1)
                     thor (~> 0.14)
                   sprockets (2.2.3)
                     hike (~> 1.2)
                     multi_json (~> 1.0)
                     rack (~> 1.0)
                     tilt (~> 1.1, != 1.3.0)
                   test-unit (3.0.9)
                     power_assert
                   thor (0.19.1)
                   tilt (1.4.1)
                   treetop (1.4.15)
                     polyglot
                     polyglot (>= 0.3.1)
                   tzinfo (0.3.43)
                   uglifier (2.7.0)
                     execjs (>= 0.3.0)
                     json (>= 1.8.0)
                   will_paginate (3.0.7)
               PLATFORMS
                 ruby
               DEPENDENCIES
+            +   ace-rails-ap
                 autoprefixer-rails
                 best_in_place (~> 3.0.1)
                 bootstrap-sass (~> 3.2.0)
                 bootstrap-switch-rails
                 bootstrap-toggle-rails
                 coffee-rails (~> 3.2.2)
                 dynamic_form
                 haml
+            +   haml-rails
                 in_place_editing
                 jquery-rails
                 jquery-tablesorter
                 jquery-timepicker-addon-rails
                 jquery-ui-sass-rails
                 mail
                 mysql2
                 prototype-rails
                 rails (= 3.2.21)
                 rdiscount
                 rouge
                 rspec-rails (~> 2.99.0)
                 sass-rails (~> 3.2.6)
                 select2-rails
                 test-unit
                 uglifier
                 verification!
                 will_paginate (~> 3.0.7)

app/assets/javascripts/application.js ¶ +1

               // This is a manifest file that'll be compiled into application.js, which will include all the files
               // listed below.
               //
               // Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
               // or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
               //
               // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
               // the compiled file.
               //
               // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
               // GO AFTER THE REQUIRES BELOW.
               //
               //= require jquery
               //= require jquery_ujs
               //= require jquery.ui.all
               //= require bootstrap-sprockets
               //x= require bootstrap-switch
               //= require bootstrap-toggle
               //= require select2
               //= require custom
+            + //= require ace-rails-ap
               // since this is after blank line, it is not downloaded
               //x= require prototype
               //x= require prototype_ujs
               //x= require effects
               //x= require dragdrop
               //x= require controls

app/assets/javascripts/custom.js.coffee ¶ +4

               $(document).on 'change', '.btn-file :file', ->
                 input = $(this)
                 numFiles = if input.get(0).files then input.get(0).files.length else 1
                 label = input.val().replace(/\\/g, '/').replace(/.*\//, '')
                 input.trigger 'fileselect', [
                   numFiles
                   label
                 ]
                 return
               # document ready
               $ ->
                 $(".select2").select2()
                 #$(".bootstrap-switch").bootstrapSwitch()
                 $(".bootstrap-toggle").bootstrapToggle()
                 $('.btn-file :file').on 'fileselect', (event, numFiles, label) ->
                   input = $(this).parents('.input-group').find(':text')
                   log = if numFiles > 1 then numFiles + ' files selected' else label
                   if input.length
                     input.val log
                   else
                     if log
                       alert log
                   return
                 $(".go-button").on 'click', (event) ->
                   link = $(this).attr("data-source")
                   url = $(link).val()
                   if url
                     window.location.href = url
                   return
                 $('.ajax-toggle').on 'click', (event) ->
                   target = $(event.target)
                   target.removeClass 'btn-default'
                   target.removeClass 'btn-success'
                   target.addClass 'btn-warning'
                   target.text '...'
                   return
+            +   editor = ace.edit("editor")
+            +   editor.setTheme("ace/theme/monokai")
+            +   editor.getSession().setMode("ace/mode/javascript")
+            +
                 return

app/controllers/main_controller.rb ¶ +8

                 # COMMENT OUT: only need when having high load
                 # caches_action :index, :login
                 # NOTE: This method is not actually needed, 'config/routes.rb' has
                 # assigned action login as a default action.
                 def index
                   redirect_to :action => 'login'
                 end
                 def login
                   saved_notice = flash[:notice]
                   reset_session
                   flash.now[:notice] = saved_notice
                   # EXPERIMENT:
                   # Hide login if in single user mode and the url does not
                   # explicitly specify /login
                   #
                   # logger.info "PATH: #{request.path}"
                   # if GraderConfiguration['system.single_user_mode'] and
                   #     request.path!='/main/login'
                   #   @hidelogin = true
                   # end
                   @announcements = Announcement.find_for_frontpage
                   render :action => 'login', :layout => 'empty'
                 end
                 def list
                   prepare_list_information
                 end
                 def help
                   @user = User.find(session[:user_id])
                 end
                 def submit
                   user = User.find(session[:user_id])
                   @submission = Submission.new
                   @submission.problem_id = params[:submission][:problem_id]
                   @submission.user = user
                   @submission.language_id = 0
                   if (params['file']) and (params['file']!='')
                     @submission.source = File.open(params['file'].path,'r:UTF-8',&:read)
                     @submission.source.encode!('UTF-8','UTF-8',invalid: :replace, replace: '')
                     @submission.source_filename = params['file'].original_filename
                   end
+            +
+            +     if (params[:editor_text])
+            +       language = Language.find_by_id(params[:language_id])
+            +       @submission.source = params[:editor_text]
+            +       @submission.source_filename = "live_edit.#{language.ext}"
+            +       @submission.language = language
+            +     end
+            +
                   @submission.submitted_at = Time.new.gmtime
                   @submission.ip_address = request.remote_ip
                   if GraderConfiguration.time_limit_mode? and user.contest_finished?
                     @submission.errors.add(:base,"The contest is over.")
                     prepare_list_information
                     render :action => 'list' and return
                   end
                   if @submission.valid?
                     if @submission.save == false
               	flash[:notice] = 'Error saving your submission'
                     elsif Task.create(:submission_id => @submission.id,
                                       :status => Task::STATUS_INQUEUE) == false
               	flash[:notice] = 'Error adding your submission to task queue'
                     end
                   else
                     prepare_list_information
                     render :action => 'list' and return
                   end
                   redirect_to :action => 'list'
                 end
                 def source
                   submission = Submission.find(params[:id])
                   if ((submission.user_id == session[:user_id]) and
                       (submission.problem != nil) and
                       (submission.problem.available))
                     send_data(submission.source,
               		{:filename => submission.download_filename,
                                 :type => 'text/plain'})
                   else
                     flash[:notice] = 'Error viewing source'
                     redirect_to :action => 'list'
                   end
                 end
                 def compiler_msg
                   @submission = Submission.find(params[:id])
                   if @submission.user_id == session[:user_id]
                     render :action => 'compiler_msg', :layout => 'empty'
                   else
                     flash[:notice] = 'Error viewing source'
                     redirect_to :action => 'list'
                   end
                 end
                 def submission

app/models/problem.rb ¶ +4

                 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
                   problem.available = false
                   if not problem.save
                     return problem, 'Error importing'
                   end
                   import_to_db = params.has_key? :import_to_db
                   importer = TestdataImporter.new(problem)
                   if not importer.import_from_file(import_params[:file],
                                                    import_params[:time_limit],
                                                    import_params[:memory_limit],
                                                    import_params[:checker_name],
                                                    import_to_db)
                     problem.errors.add(:base,'Import error.')
                   end
                   return problem, importer.log_msg
                 end
                 def self.download_file_basedir
                   return "#{Rails.root}/data/tasks"
                 end
                 def get_submission_stat
                   result = Hash.new
                   #total number of submission
                   result[:total_sub] = Submission.where(problem_id: self.id).count
                   result[:attempted_user] = Submission.where(problem_id: self.id).group_by(:user_id)
                 end
+            +
+            +   def long_name
+            +     "[#{name}] #{full_name}"
+            +   end
                 protected
                 def self.to_i_or_default(st, default)
                   if st!=''
                     result = st.to_i
                   end
                   result ||= default
                 end
                 def self.to_f_or_default(st, default)
                   if st!=''
                     result = st.to_f
                   end
                   result ||= default
                 end
                 def self.extract_params_and_check(params, problem)
                   time_limit = Problem.to_f_or_default(params[:time_limit],
                                                        DEFAULT_TIME_LIMIT)
                   memory_limit = Problem.to_i_or_default(params[:memory_limit],
                                                          DEFAULT_MEMORY_LIMIT)
                   if time_limit<=0 or time_limit >60
                     problem.errors.add(:base,'Time limit out of range.')
                   end
                   if memory_limit==0 and params[:memory_limit]!='0'
                     problem.errors.add(:base,'Memory limit format errors.')
                   elsif memory_limit<=0 or memory_limit >512
                     problem.errors.add(:base,'Memory limit out of range.')
                   end
                   if params[:file]==nil or params[:file]==''
                     problem.errors.add(:base,'No testdata file.')
                   end
                   checker_name = 'text'
                   if ['text','float'].include? params[:checker]
                     checker_name = params[:checker]
                   end
                   file = params[:file]
                   if !problem.errors.empty?
                     return nil, problem
                   end

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

               - if submission==nil
                 = "-"
               - else
                 - if submission.graded_at==nil
                   =t 'main.submitted_at'
                   = format_short_time(submission.submitted_at.localtime)
                 - else
                   = t 'main.graded_at'
                   = "#{format_short_time(submission.graded_at.localtime)}, "
                   - if GraderConfiguration['ui.show_score']
                     = t 'main.score'
                     = "#{(submission.points*100/submission.problem.full_score).to_i} "
                   = " ["
                   %tt
                     = submission.grader_comment
                   = "]"
                   - if GraderConfiguration.show_grading_result
                     = " | "
                     = link_to '[detailed result]', :action => 'result', :id => submission.id
                   = " | "
                   = link_to("[#{t 'main.cmp_msg'}]", {:action => 'compiler_msg', :id => submission.id}, {:popup => true})
                 = " | "
                 = link_to("[#{t 'main.src_link'}]",{:action => 'source', :id => submission.id})
                 = " | "
-            -   = link_to "[#{t 'main.submissions_link'}]", :action => 'submission', :id => problem_name
+            +   = link_to "[#{t 'main.submissions_link'}]", :action => 'submission', :id => submission.problem.id

config/routes.rb ¶ +8

               CafeGrader::Application.routes.draw do
+            +   get "sources/direct_edit"
+            +
                 root :to => 'main#login'
                 resources :contests
                 resources :sites
                 resources :announcements do
                   member do
                     get 'toggle'
                   end
                 end
                 resources :problems do
                   member do
                     get 'toggle'
                   end
                   collection do
                     get 'turn_all_off'
                     get 'turn_all_on'
                     get 'import'
                     get 'manage'
                   end
                 end
                 resources :grader_configuration, controller: 'configurations'
                 resources :users do
                   member do
                     get 'toggle_activate', 'toggle_enable'
                   end
                 end
+            +   #resources :sources do
+            +   #  collection do
+            +   #  end
+            +   #end
+            +   get 'sources/direct_edit/:pid', to: 'sources#direct_edit', as: 'direct_edit'
+            +
                 match 'tasks/view/:file.:ext' => 'tasks#view'
                 match 'tasks/download/:id/:file.:ext' => 'tasks#download'
                 match 'heartbeat/:id/edit' => 'heartbeat#edit'
                 #main
                 get "main/list"
                 get 'main/submission(/:id)', to: 'main#submission', as: 'main_submission'
                 #report
                 get 'report/problem_hof(/:id)', to: 'report#problem_hof', as: 'report_problem_hof'
                 get "report/login"
                 # See how all your routes lay out with "rake routes"
                 # This is a legacy wild controller route that's not recommended for RESTful applications.
                 # Note: This route will make all actions in every controller accessible via GET requests.
                 match ':controller(/:action(/:id))(.:format)'
               end

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

r564:484b31caab29 - Sat, 02 Jul 2016 06:11:19 - 16 files changed: 121 inserted, 1 deleted

Sign in to your account

Commit r564:484b31caab29 public

Author

r564:484b31caab29 - Sat, 02 Jul 2016 06:11:19 - 16 files changed: 121 inserted, 1 deleted

Commit `r564:484b31caab29` public