Use Rubocop to do auto-correction.

Author: Winbobob

Capfile

@@ -24,4 +24,4 @@ require 'capistrano/deploy'
 require 'capistrano/rails'
 
 # Loads custom tasks from `lib/capistrano/tasks' if you have any defined.
-Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }
+Dir.glob('lib/capistrano/tasks/*.rake').each {|r| import r }

Gemfile

@@ -15,13 +15,13 @@ gem 'delayed_job_active_record'
 gem 'dynamic_form'
 gem 'edavis10-ruby-web-search'
 gem 'engtagger'
-gem 'expertiza-authlogic', github: 'expertiza/authlogic', :require => 'authlogic'
+gem 'expertiza-authlogic', github: 'expertiza/authlogic', require: 'authlogic'
 gem 'fastercsv'
 gem 'ffi-aspell'
 gem 'font-awesome-rails'
-gem 'gchartrb', :require => 'google_chart'
-gem "googlecharts", :require => "gchart"
-gem 'gdata', :require => false
+gem 'gchartrb', require: 'google_chart'
+gem "googlecharts", require: "gchart"
+gem 'gdata', require: false
 gem 'graphviz'
 gem 'haml-rails'
 gem 'hoptoad_notifier'
@@ -42,10 +42,10 @@ gem 'rake'
 gem 'rb-readline'
 gem 'rest-client', '~> 1.8'
 gem 'RedCloth'
-gem 'rgl', :require => 'rgl/adjacency'
+gem 'rgl', require: 'rgl/adjacency'
 gem 'rjb'
 gem 'rubyzip'
-gem 'rwordnet','0.1.3'
+gem 'rwordnet', '0.1.3'
 gem 'scrypt'
 gem 'sass-rails', '5.0.3'
 gem 'seer'
@@ -89,5 +89,5 @@ end
 
 group :development, :test do
   gem 'capybara'
-  gem 'simplecov', :require => false
-end
+  gem 'simplecov', require: false
+end

Guardfile

@@ -6,7 +6,6 @@ guard 'rails' do
   watch(%r{^(config|lib)/.*})
 end
 
-
 # Note: The cmd option is now required due to the increasing number of ways
 #       rspec may be run, below are examples of the most common uses.
 #  * bundler: 'bundle exec rspec'
@@ -17,23 +16,22 @@ end
 #  * 'just' rspec: 'rspec'
 guard :rspec, cmd: 'bundle exec rspec' do
   watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch(%r{^lib/(.+)\.rb$})     {|m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
 
   # Rails example
-  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^app/(.*)(\.erb|\.haml|\.slim)$})          { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
-  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  watch(%r{^app/(.+)\.rb$})                           {|m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^app/(.*)(\.erb|\.haml|\.slim)$})          {|m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  {|m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
   watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
   watch('config/routes.rb')                           { "spec/routing" }
   watch('app/controllers/application_controller.rb')  { "spec/controllers" }
   watch('spec/rails_helper.rb')                       { "spec" }
 
   # Capybara features specs
-  watch(%r{^app/views/(.+)/.*\.(erb|haml|slim)$})     { |m| "spec/features/#{m[1]}_spec.rb" }
+  watch(%r{^app/views/(.+)/.*\.(erb|haml|slim)$})     {|m| "spec/features/#{m[1]}_spec.rb" }
 
   # Turnip features and steps
   watch(%r{^spec/acceptance/(.+)\.feature$})
-  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$}) {|m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
 end
-

app/controllers/admin_controller.rb

@@ -9,7 +9,7 @@ def action_allowed?
   end
 
   def list_instructors
-    @users = User.instructors.order(:name).where("parent_id = ?", current_user.id).paginate(:page => params[:page], :per_page => 50)
+    @users = User.instructors.order(:name).where("parent_id = ?", current_user.id).paginate(page: params[:page], per_page: 50)
   end
 
   def add_administrator
@@ -27,11 +27,11 @@ def create_administrator
   end
 
   def list_administrators
-    @users = User.admins.order(:name).where("parent_id = ?", current_user.id).paginate(:page => params[:page], :per_page => 50)
+    @users = User.admins.order(:name).where("parent_id = ?", current_user.id).paginate(page: params[:page], per_page: 50)
   end
 
   def list_users(conditions)
-    @users = User.order(:name).where(conditions).paginate(:page => params[:page], :per_page => 50)
+    @users = User.order(:name).where(conditions).paginate(page: params[:page], per_page: 50)
   end
 
   def new_super_administrator
@@ -46,7 +46,7 @@ def show_instructor
     @user = User.find(params[:id])
     @role = Role.find(@user.role_id)
   end
-  
+
   def show_super_admin
     @user = User.find(params[:id])
     @role = Role.find(@user.role_id)
@@ -59,14 +59,14 @@ def show_admin
 
   def remove_instructor
     User.find(params[:id]).destroy
-    redirect_to :action => 'list_instructors'
+    redirect_to action: 'list_instructors'
   end
 
   def remove_administrator
     User.find(params[:id]).destroy
-    redirect_to :action => 'list_administrators'
+    redirect_to action: 'list_administrators'
   end
-  
+
   def save_super_administrator
     PgUsersController.create(Role.superadministrator.id, :admin_controller, :list_super_administrators, :new_super_administrator)
   end

app/controllers/advertise_for_partner_controller.rb

@@ -3,51 +3,51 @@ def action_allowed?
     current_user.role.name.eql?("Student")
   end
 
-  #adds a new advertise for partners entry in team table...
+  # adds a new advertise for partners entry in team table...
   def new
   end
 
-  #removes an entry from team table for corresponding team who requested to remove their advertisement for partner request
+  # removes an entry from team table for corresponding team who requested to remove their advertisement for partner request
   def remove
     team = Team.find(params[:team_id])
     team.advertise_for_partner = false
     team.comments_for_advertisement = nil
     team.save
 
-    assignment=Assignment.find(Team.find(params[:team_id]).parent_id)
-    participant=AssignmentParticipant.where(parent_id: assignment.id, user_id: session[:user].id).first
+    assignment = Assignment.find(Team.find(params[:team_id]).parent_id)
+    participant = AssignmentParticipant.where(parent_id: assignment.id, user_id: session[:user].id).first
     redirect_to view_student_teams_path student_id: participant.id
   end
 
-  #update the team table with newly created advertise for partner request for the corresponding team
+  # update the team table with newly created advertise for partner request for the corresponding team
   def create
     team = Team.find(params[:id])
     team.advertise_for_partner = true
     team.comments_for_advertisement = params[:comments_for_advertisement]
     team.save
 
-    assignment=Assignment.find(Team.find(params[:id]).parent_id)
-    participant=AssignmentParticipant.where(parent_id: assignment.id, user_id: session[:user].id).first
+    assignment = Assignment.find(Team.find(params[:id]).parent_id)
+    participant = AssignmentParticipant.where(parent_id: assignment.id, user_id: session[:user].id).first
     redirect_to view_student_teams_path student_id: participant.id
   end
 
-  #update the advertisement when done with editing #####This should be edit rather than update....
+  # update the advertisement when done with editing #####This should be edit rather than update....
   def update
-    @team=Team.find(params[:id])
-    #@team.comments_for_advertisement = params[:comments_for_advertisement]
-    Team.update(params[:id], :comments_for_advertisement => params[:comments_for_advertisement])
-    assignment=Assignment.find(Team.find(params[:id]).parent_id)
-    participant=AssignmentParticipant.where(parent_id: assignment.id, user_id: session[:user].id).first
+    @team = Team.find(params[:id])
+    # @team.comments_for_advertisement = params[:comments_for_advertisement]
+    Team.update(params[:id], comments_for_advertisement: params[:comments_for_advertisement])
+    assignment = Assignment.find(Team.find(params[:id]).parent_id)
+    participant = AssignmentParticipant.where(parent_id: assignment.id, user_id: session[:user].id).first
     if @team.save
-      flash[:notice]='Your advertisement was successfully updated!'
+      flash[:notice] = 'Your advertisement was successfully updated!'
       redirect_to view_student_teams_path student_id: participant.id
     else
-      flash[:error]='An error occured and your advertisement was not updated!'
+      flash[:error] = 'An error occured and your advertisement was not updated!'
       redirect_to view_student_teams_path student_id: participant.id
     end
   end
 
-  #find the team who wants to edit their advertisement
+  # find the team who wants to edit their advertisement
   def edit
     @team = Team.find(params[:team_id])
   end

app/controllers/advice_controller.rb

@@ -7,23 +7,22 @@ def action_allowed?
 
   # Modify the advice associated with a questionnaire
   def edit_advice
-
     @questionnaire = Questionnaire.find(params[:id])
 
     for question in @questionnaire.questions
-      if question.is_a?(ScoredQuestion)
-        num_questions = @questionnaire.max_question_score - @questionnaire.min_question_score
-      else
-        num_questions=0
-      end
+      num_questions = if question.is_a?(ScoredQuestion)
+                        @questionnaire.max_question_score - @questionnaire.min_question_score
+                      else
+                        0
+                      end
 
-      sorted_advice = question.question_advices.sort_by { |x| -x.score }
+      sorted_advice = question.question_advices.sort_by {|x| -x.score }
       if question.question_advices.length != num_questions or
         sorted_advice.empty? or
         sorted_advice[0].score != @questionnaire.min_question_score or
-        sorted_advice[sorted_advice.length-1] != @questionnaire.max_question_score
+        sorted_advice[sorted_advice.length - 1] != @questionnaire.max_question_score
         #  The number of advices for this question has changed.
-        QuestionnaireHelper::adjust_advice_size(@questionnaire, question)
+        QuestionnaireHelper.adjust_advice_size(@questionnaire, question)
       end
     end
   end
@@ -33,15 +32,15 @@ def save_advice
     @questionnaire = Questionnaire.find(params[:id])
 
     begin
-      if !params[:advice].nil?
+      unless params[:advice].nil?
         for advice_key in params[:advice].keys
-          QuestionAdvice.update(advice_key, :advice=>params[:advice][advice_key.to_sym][:advice])
+          QuestionAdvice.update(advice_key, advice: params[:advice][advice_key.to_sym][:advice])
         end
         flash[:notice] = "The questionnaire's question advice was successfully saved!"
       end
     rescue ActiveRecord::RecordNotFound
-      render :action => 'edit_advice', :id => params[:id]
+      render action: 'edit_advice', id: params[:id]
     end
-    redirect_to :action => 'edit_advice', :id => params[:id]
+    redirect_to action: 'edit_advice', id: params[:id]
   end
 end