refactoring

Author: marcelja

app/controllers/exercises_controller.rb

@@ -35,8 +35,7 @@ def edit
   # POST /exercises.json
   def create
     @exercise = Exercise.new(exercise_params)
-    @exercise.add_files(params[:exercise][:exercise_files_attributes])
-    @exercise.add_descriptions(params[:exercise][:descriptions_attributes])
+    @exercise.add_attributes(params[:exercise])
     @exercise.user = current_user
     respond_to do |format|
       if @exercise.save
@@ -52,12 +51,7 @@ def create
   # PATCH/PUT /exercises/1
   # PATCH/PUT /exercises/1.json
   def update
-    #@exercise.exercise_files.each do |file|
-    #  file.update(file_params(file))
-    #end
-    @exercise.add_tests(params[:exercise][:tests_attributes])
-    @exercise.add_files(params[:exercise][:exercise_files_attributes])
-    @exercise.add_descriptions(params[:exercise][:descriptions_attributes])
+    @exercise.add_attributes(params[:exercise])
     respond_to do |format|
       if @exercise.update(exercise_params)
         format.html { redirect_to @exercise, notice: 'Exercise was successfully updated.' }
@@ -103,12 +97,4 @@ def set_exercise
     def exercise_params
       params.require(:exercise).permit(:title, :description, :maxrating, :public)
     end
-
-    def file_params(file)
-      params.require(file.id.to_s).permit(:main, :content, :path, :solution, :filetype)
-    end
-
-    def test_params(test)
-      params.require('test_'+test.id.to_s).permit(:content, :feedback_message, :testing_framework_id)
-    end
 end

app/models/exercise.rb

@@ -45,6 +45,12 @@ def round_avg_rating
     (avg_rating*2).round / 2.0
   end
 
+  def add_attributes(params)
+    add_tests(params[:tests_attributes])
+    add_files(params[:exercise_files_attributes])
+    add_descriptions(params[:descriptions_attributes])
+  end
+
   def add_descriptions(description_array)
     description_array.try(:each) do |key, array|
       destroy = array[:_destroy]