cafe-grader-web Commit - r420:2693b87c015f

cafe-grader-web

Commit `r420:2693b87c015f` public

parent | child

Description:

add syntax highlighter for submission view using Rouge gem

Commit status:

[Not Reviewed]

References:

algo

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r420:2693b87c015f - Thu, 04 Sep 2014 11:23:35 - 5 files changed: 25 inserted, 8 deleted

Gemfile ¶ +2

               source 'https://rubygems.org'
               gem 'rails', '3.2.19'
               # Bundle edge Rails instead:
               # gem 'rails', :git => 'git://github.com/rails/rails.git'
               gem 'mysql2'
               # Gems used only for assets and not required
               # in production environments by default.
               group :assets do
                 gem 'sass-rails',   '~> 3.2.3'
                 gem 'coffee-rails', '~> 3.2.1'
                 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
                 # gem 'therubyracer', :platforms => :ruby
                 gem 'uglifier', '>= 1.0.3'
               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'
               #
               gem 'jquery-rails'
               gem 'jquery-ui-sass-rails'
               gem 'jquery-timepicker-addon-rails'
+            + #syntax highlighter
+            + gem 'rouge'
               gem "haml"
               gem "mail"
               gem "rdiscount"
               gem "test-unit"
               gem 'will_paginate', '~> 3.0.0'
               gem 'dynamic_form'
               gem 'in_place_editing'
               gem 'verification', :git => 'git://github.com/sikachu/verification.git'
               group :test, :development do
                 gem "rspec-rails", "~> 2.0"
               end

Gemfile.lock ¶ +2

               GIT
                 remote: git://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:
                   actionmailer (3.2.19)
                     actionpack (= 3.2.19)
                     mail (~> 2.5.4)
                   actionpack (3.2.19)
                     activemodel (= 3.2.19)
                     activesupport (= 3.2.19)
                     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.19)
                     activesupport (= 3.2.19)
                     builder (~> 3.0.0)
                   activerecord (3.2.19)
                     activemodel (= 3.2.19)
                     activesupport (= 3.2.19)
                     arel (~> 3.0.2)
                     tzinfo (~> 0.3.29)
                   activeresource (3.2.19)
                     activemodel (= 3.2.19)
                     activesupport (= 3.2.19)
                   activesupport (3.2.19)
                     i18n (~> 0.6, >= 0.6.4)
                     multi_json (~> 1.0)
                   arel (3.0.3)
                   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.7.1)
                   diff-lcs (1.2.5)
                   dynamic_form (1.1.4)
                   erubis (2.7.0)
                   execjs (2.2.1)
                   haml (4.0.5)
                     tilt
                   hike (1.2.3)
                   i18n (0.6.11)
                   in_place_editing (1.2.0)
                   journey (1.0.4)
                   jquery-rails (3.1.1)
                     railties (>= 3.0, < 5.0)
                     thor (>= 0.14, < 2.0)
                   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.1)
                   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.16)
                   polyglot (0.3.5)
                   power_assert (0.1.3)
                   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.2)
                     rack (>= 1.0)
                   rails (3.2.19)
                     actionmailer (= 3.2.19)
                     actionpack (= 3.2.19)
                     activerecord (= 3.2.19)
                     activeresource (= 3.2.19)
                     activesupport (= 3.2.19)
                     bundler (~> 1.0)
                     railties (= 3.2.19)
                   railties (3.2.19)
                     actionpack (= 3.2.19)
                     activesupport (= 3.2.19)
                     rack-ssl (~> 1.3.2)
                     rake (>= 0.8.7)
                     rdoc (~> 3.4)
                     thor (>= 0.14.6, < 2.0)
                   rake (10.3.2)
                   rdiscount (2.1.7.1)
                   rdoc (3.12.2)
                     json (~> 1.4)
+            +     rouge (1.6.2)
                   rspec-collection_matchers (1.0.0)
                     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.2)
                   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.1)
                   sass-rails (3.2.6)
                     railties (~> 3.2.0)
                     sass (>= 3.1.10)
                     tilt (~> 1.3)
                   sprockets (2.2.2)
                     hike (~> 1.2)
                     multi_json (~> 1.0)
                     rack (~> 1.0)
                     tilt (~> 1.1, != 1.3.0)
                   test-unit (3.0.1)
                     power_assert
                   thor (0.19.1)
                   tilt (1.4.1)
                   treetop (1.4.15)
                     polyglot
                     polyglot (>= 0.3.1)
                   tzinfo (0.3.41)
                   uglifier (2.5.3)
                     execjs (>= 0.3.0)
                     json (>= 1.8.0)
                   will_paginate (3.0.7)
               PLATFORMS
                 ruby
               DEPENDENCIES
                 coffee-rails (~> 3.2.1)
                 dynamic_form
                 haml
                 in_place_editing
                 jquery-rails
                 jquery-timepicker-addon-rails
                 jquery-ui-sass-rails
                 mail
                 mysql2
                 prototype-rails
                 rails (= 3.2.19)
                 rdiscount
+            +   rouge
                 rspec-rails (~> 2.0)
                 sass-rails (~> 3.2.3)
                 test-unit
                 uglifier (>= 1.0.3)
                 verification!
                 will_paginate (~> 3.0.0)

app/controllers/graders_controller.rb ¶ +12

               class GradersController < ApplicationController
                 before_filter :admin_authorization
                 verify :method => :post, :only => ['clear_all',
                                                    'start_exam',
                                                    'start_grading',
                                                    'stop_all',
                                                    'clear_terminated'],
                        :redirect_to => {:action => 'index'}
                 def index
                   redirect_to :action => 'list'
                 end
                 def list
                   @grader_processes = GraderProcess.find_running_graders
                   @stalled_processes = GraderProcess.find_stalled_process
                   @terminated_processes = GraderProcess.find_terminated_graders
                   @last_task = Task.find(:first,
                                          :order => 'created_at DESC')
                   @last_test_request = TestRequest.find(:first,
                                                         :order => 'created_at DESC')
                 end
                 def clear
                   grader_proc = GraderProcess.find(params[:id])
                   grader_proc.destroy if grader_proc!=nil
                   redirect_to :action => 'list'
                 end
                 def clear_terminated
                   GraderProcess.find_terminated_graders.each do |p|
                     p.destroy
                   end
                   redirect_to :action => 'list'
                 end
                 def clear_all
                   GraderProcess.find(:all).each do |p|
                     p.destroy
                   end
                   redirect_to :action => 'list'
                 end
                 def view
                   if params[:type]=='Task'
                     redirect_to :action => 'task', :id => params[:id]
                   else
                     redirect_to :action => 'test_request', :id => params[:id]
                   end
                 end
                 def test_request
                   @test_request = TestRequest.find(params[:id])
                 end
                 def task
                   @task = Task.find(params[:id])
                 end
                 def submission
                   @submission = Submission.find(params[:id])
+            +     formatter = Rouge::Formatters::HTML.new(css_class: 'highlight', line_numbers: true )
+            +     lexer = case @submission.language.name
+            +       when "c"      then Rouge::Lexers::C.new
+            +       when "cpp"    then Rouge::Lexers::Cpp.new
+            +       when "pas"    then Rouge::Lexers::Pas.new
+            +       when "ruby"   then Rouge::Lexers::Ruby.new
+            +       when "python" then Rouge::Lexers::Python.new
+            +       when "java"   then Rouge::Lexers::Java.new
+            +     end
+            +     @formatted_code = formatter.format(lexer.lex(@submission.source))
+            +     @css_style = Rouge::Themes::ThankfulEyes.render(scope: '.highlight')
+            +
                 end
                 # various grader controls
                 def stop
                   grader_proc = GraderProcess.find(params[:id])
                   GraderScript.stop_grader(grader_proc.pid)
                   flash[:notice] = 'Grader stopped.  It may not disappear now, but it should disappear shortly.'
                   redirect_to :action => 'list'
                 end
                 def stop_all
                   GraderScript.stop_graders(GraderProcess.find_running_graders +
                                             GraderProcess.find_stalled_process)
                   flash[:notice] = 'Graders stopped.  They may not disappear now, but they should disappear shortly.'
                   redirect_to :action => 'list'
                 end
                 def start_grading
                   GraderScript.start_grader('grading')
                   flash[:notice] = '2 graders in grading env started, one for grading queue tasks, another for grading test request'
                   redirect_to :action => 'list'
                 end
                 def start_exam
                   GraderScript.start_grader('exam')
                   flash[:notice] = '2 graders in grading env started, one for grading queue tasks, another for grading test request'
                   redirect_to :action => 'list'
                 end
               end

app/views/graders/submission.html.haml ¶ +9 -4

+            + %style{type: "text/css"}
+            +   = @css_style
+            +
               %h1= "Submission: #{@submission.id}"
               %p
                 User:
                 = "#{@submission.user.login}"
                 %br/
                 Problem:
                 - if @submission.problem!=nil
                   = "#{@submission.problem.full_name}"
                 - else
                   = "(n/a)"
                 %br/
                 = "Number: #{@submission.number}"
                 %br/
                 = "Submitted at: #{format_short_time(@submission.submitted_at)}"
+            +   %br/
+            +   = "Points : #{@submission.points}/#{@submission.problem.full_score}"
+            +   %br/
+            +   = "Comment : #{@submission.grader_comment}"
               %b Source code (first 10kb)
-            - %div{:style => "border: 1px solid black; background: lightgrey"}
+            + //%div.highlight{:style => "border: 1px solid black;"}
-            -   - if @submission.source
+            + =@formatted_code.html_safe
-            -     %pre
-            -       =h truncate @submission.source, :length => 10240

app/views/report/submission_stat.html.haml ¶ -4

               - content_for :header do
                 = javascript_include_tag 'new'
               %script{:type=>"text/javascript"}
                 $(function () {
                 $('#since_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
                 $('#until_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
                 });
               %h1 Login status
               =render partial: 'report_menu'
               =render partial: 'date_range', locals: {param_text: 'Submission date range:', title: 'Query submission stat in the range'  }
               %table.info
                 %thead
                   %tr.info-head
                     %th login
                     %th full name
                     %th total submissions
                     %th submissions
                 %tbody
                   - @submissions.each do |user_id,data|
                     %tr{class: cycle('info-even','info-odd')}
                       %td= data[:login]
                       %td= data[:full_name]
                       %td= data[:count]
                       %td
                         - data[:sub].each do |prob_id,sub_data|
                           = "#{sub_data[:prob_name]}: ["
                           - st = []
                           - sub_data[:sub_ids].each do |id|
                             - st << link_to(id, controller: 'graders' , action: 'submission', id: id)
                           = raw st.join ', '
                           = ']'
                           %br/

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

r420:2693b87c015f - Thu, 04 Sep 2014 11:23:35 - 5 files changed: 25 inserted, 8 deleted

Sign in to your account

Commit r420:2693b87c015f public

Author

r420:2693b87c015f - Thu, 04 Sep 2014 11:23:35 - 5 files changed: 25 inserted, 8 deleted

Commit `r420:2693b87c015f` public