cafe-grader-web Commit - r420:2693b87c015f

cafe-grader-web

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

               #
               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'

Gemfile.lock ¶ +2

                     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)
                 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

                 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])

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

+            + %style{type: "text/css"}
+            +   = @css_style
+            +
               %h1= "Submission: #{@submission.id}"
               %p
                 User:
                 = "#{@submission.user.login}"
                 %br/
                 - 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

               %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

You need to be logged in to leave comments. Login now

	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