Merge remote-tracking branch 'origin/master' into ace-editor-exercise-edit

app/controllers/code_ocean/files_controller.rb

@@ -10,6 +10,11 @@ module CodeOcean
 
     def create
       @file = CodeOcean::File.new(file_params)
+      if @file.file_template_id
+        content = FileTemplate.find(@file.file_template_id).content
+        content.sub! '{{file_name}}', @file.name
+        @file.content = content
+      end
       authorize!
       create_and_respond(object: @file, path: proc { implement_exercise_path(@file.context.exercise, tab: 2) })
     end

app/controllers/concerns/file_parameters.rb

@@ -1,6 +1,6 @@
 module FileParameters
   def file_attributes
-    %w(content context_id feedback_message file_id file_type_id hidden id name native_file path read_only role weight)
+    %w(content context_id feedback_message file_id file_type_id hidden id name native_file path read_only role weight file_template_id)
   end
   private :file_attributes
 end

app/controllers/exercises_controller.rb

@@ -9,7 +9,6 @@ class ExercisesController < ApplicationController
   before_action :set_exercise, only: MEMBER_ACTIONS + [:clone, :implement, :edit, :run, :statistics, :submit, :reload]
   before_action :set_external_user, only: [:statistics]
   before_action :set_file_types, only: [:create, :edit, :new, :update]
-  before_action :set_teams, only: [:create, :edit, :new, :update]
 
   skip_before_filter :verify_authenticity_token, only: [:import_proforma_xml]
   skip_after_action :verify_authorized, only: [:import_proforma_xml]
@@ -121,7 +120,7 @@ class ExercisesController < ApplicationController
   private :user_by_code_harbor_token
 
   def exercise_params
-    params[:exercise].permit(:description, :execution_environment_id, :file_id, :instructions, :public, :hide_file_tree, :allow_file_creation, :team_id, :title, files_attributes: file_attributes).merge(user_id: current_user.id, user_type: current_user.class.name)
+    params[:exercise].permit(:description, :execution_environment_id, :file_id, :instructions, :public, :hide_file_tree, :allow_file_creation, :title, files_attributes: file_attributes).merge(user_id: current_user.id, user_type: current_user.class.name)
   end
   private :exercise_params
 
@@ -197,11 +196,6 @@ class ExercisesController < ApplicationController
   end
   private :set_file_types
 
-  def set_teams
-    @teams = Team.all.order(:name)
-  end
-  private :set_teams
-
   def show
   end
 

app/controllers/file_templates_controller.rb

@@ -0,0 +1,94 @@
+class FileTemplatesController < ApplicationController
+  before_action :set_file_template, only: [:show, :edit, :update, :destroy]
+
+  def authorize!
+    authorize(@file_template || @file_templates)
+  end
+  private :authorize!
+
+  def by_file_type
+    @file_templates = FileTemplate.where(:file_type_id => params[:file_type_id])
+    authorize!
+    respond_to do |format|
+      format.json { render :show, status: :ok, json: @file_templates.to_json }
+    end
+  end
+
+  # GET /file_templates
+  # GET /file_templates.json
+  def index
+    @file_templates = FileTemplate.all.order(:file_type_id).paginate(page: params[:page])
+    authorize!
+  end
+
+  # GET /file_templates/1
+  # GET /file_templates/1.json
+  def show
+    authorize!
+  end
+
+  # GET /file_templates/new
+  def new
+    @file_template = FileTemplate.new
+    authorize!
+  end
+
+  # GET /file_templates/1/edit
+  def edit
+    authorize!
+  end
+
+  # POST /file_templates
+  # POST /file_templates.json
+  def create
+    @file_template = FileTemplate.new(file_template_params)
+    authorize!
+
+    respond_to do |format|
+      if @file_template.save
+        format.html { redirect_to @file_template, notice: 'File template was successfully created.' }
+        format.json { render :show, status: :created, location: @file_template }
+      else
+        format.html { render :new }
+        format.json { render json: @file_template.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PATCH/PUT /file_templates/1
+  # PATCH/PUT /file_templates/1.json
+  def update
+    authorize!
+    respond_to do |format|
+      if @file_template.update(file_template_params)
+        format.html { redirect_to @file_template, notice: 'File template was successfully updated.' }
+        format.json { render :show, status: :ok, location: @file_template }
+      else
+        format.html { render :edit }
+        format.json { render json: @file_template.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /file_templates/1
+  # DELETE /file_templates/1.json
+  def destroy
+    authorize!
+    @file_template.destroy
+    respond_to do |format|
+      format.html { redirect_to file_templates_url, notice: 'File template was successfully destroyed.' }
+      format.json { head :no_content }
+    end
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_file_template
+      @file_template = FileTemplate.find(params[:id])
+    end
+
+    # Never trust parameters from the scary internet, only allow the white list through.
+    def file_template_params
+      params[:file_template].permit(:name, :file_type_id, :content)
+    end
+end

app/controllers/request_for_comments_controller.rb

@@ -82,6 +82,6 @@ class RequestForCommentsController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def request_for_comment_params
-      params.require(:request_for_comment).permit(:exercise_id, :file_id, :question, :requested_at, :solved).merge(user_id: current_user.id, user_type: current_user.class.name)
+      params.require(:request_for_comment).permit(:exercise_id, :file_id, :question, :requested_at, :solved, :submission_id).merge(user_id: current_user.id, user_type: current_user.class.name)
     end
 end

app/controllers/submissions_controller.rb

@@ -6,9 +6,9 @@ class SubmissionsController < ApplicationController
   include SubmissionScoring
   include Tubesock::Hijack
 
-  before_action :set_submission, only: [:download_file, :render_file, :run, :score, :show, :statistics, :stop, :test]
+  before_action :set_submission, only: [:download, :download_file, :render_file, :run, :score, :show, :statistics, :stop, :test]
   before_action :set_docker_client, only: [:run, :test]
-  before_action :set_files, only: [:download_file, :render_file, :show]
+  before_action :set_files, only: [:download, :download_file, :render_file, :show]
   before_action :set_file, only: [:download_file, :render_file]
   before_action :set_mime_type, only: [:download_file, :render_file]
   skip_before_action :verify_authenticity_token, only: [:download_file, :render_file]
@@ -53,6 +53,20 @@ class SubmissionsController < ApplicationController
     end
   end
 
+  def download
+    # files = @submission.files.map{ }
+    # zipline( files, 'submission.zip')
+    # send_data(@file.content, filename: @file.name_with_extension)
+    require 'zip'
+    stringio = Zip::OutputStream.write_buffer do |zio|
+      @files.each do |file|
+        zio.put_next_entry(file.name_with_extension)
+        zio.write(file.content)
+      end
+    end
+    send_data(stringio.string, filename: @submission.exercise.title.tr(" ", "_") + ".zip")
+  end
+
   def download_file
     if @file.native_file?
       send_file(@file.native_file.path)
@@ -214,7 +228,11 @@ class SubmissionsController < ApplicationController
   end
 
   def score
-    render(json: score_submission(@submission))
+    hijack do |tubesock|
+      Thread.new { EventMachine.run } unless EventMachine.reactor_running? && EventMachine.reactor_thread.alive?
+      # tubesock is the socket to the client
+      tubesock.send_data JSON.dump(score_submission(@submission))
+    end
   end
 
   def set_docker_client
@@ -266,8 +284,14 @@ class SubmissionsController < ApplicationController
   private :store_error
 
   def test
-    output = @docker_client.execute_test_command(@submission, params[:filename])
-    render(json: [output])
+    hijack do |tubesock|
+      Thread.new { EventMachine.run } unless EventMachine.reactor_running? && EventMachine.reactor_thread.alive?
+
+      output = @docker_client.execute_test_command(@submission, params[:filename])
+
+      # tubesock is the socket to the client
+      tubesock.send_data JSON.dump(output)
+    end
   end
 
   def with_server_sent_events

app/controllers/teams_controller.rb

@@ -1,51 +0,0 @@
-class TeamsController < ApplicationController
-  include CommonBehavior
-
-  before_action :set_team, only: MEMBER_ACTIONS
-
-  def authorize!
-    authorize(@team || @teams)
-  end
-  private :authorize!
-
-  def create
-    @team = Team.new(team_params)
-    authorize!
-    create_and_respond(object: @team)
-  end
-
-  def destroy
-    destroy_and_respond(object: @team)
-  end
-
-  def edit
-  end
-
-  def index
-    @teams = Team.all.includes(:internal_users).order(:name).paginate(page: params[:page])
-    authorize!
-  end
-
-  def new
-    @team = Team.new
-    authorize!
-  end
-
-  def set_team
-    @team = Team.find(params[:id])
-    authorize!
-  end
-  private :set_team
-
-  def show
-  end
-
-  def team_params
-    params[:team].permit(:name, internal_user_ids: [])
-  end
-  private :team_params
-
-  def update
-    update_and_respond(object: @team, params: team_params)
-  end
-end