Code style for v8

Author: nygrenh

.rubocop.yml

@@ -6,7 +6,7 @@ AllCops:
     - 'db/**/*'
     - 'ext/**/*'
     - 'tmp/**/*'
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.5
 
 Rails:
   Enabled: true

app/controllers/api/v8/apidocs_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Api
   module V8
     class ApidocsController < ActionController::Base
@@ -134,7 +136,7 @@ class ApidocsController < ActionController::Base
           end
         end
         key :host, 'localhost:3000'
-        key :schemes, %w(http https)
+        key :schemes, %w[http https]
         key :consumes, ['application/json']
         key :produces, ['application/json']
       end

app/controllers/api/v8/application/credentials_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Api
   module V8
     module Application

app/controllers/api/v8/base_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 module Api
@@ -31,8 +33,8 @@ def present(hash)
       def authenticate_user!
         return @current_user if @current_user
         if doorkeeper_token
-          @current_user ||= User.find_by_id(doorkeeper_token.resource_owner_id)
-          fail 'Invalid token' unless @current_user
+          @current_user ||= User.find_by(id: doorkeeper_token.resource_owner_id)
+          raise 'Invalid token' unless @current_user
         end
         @current_user ||= user_from_session || Guest.new
       end

app/controllers/api/v8/core.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Api
   module V8
     module Core

app/controllers/api/v8/core/courses/reviews_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Api
   module V8
     module Core
@@ -54,9 +56,9 @@ def index
             course = Course.find_by!(id: params[:course_id])
             authorize! :read, course
             users_reviewed_submissions = course.submissions
-                                         .where(user_id: current_user.id)
-                                         .where('requests_review OR requires_review OR reviewed')
-                                         .order('created_at DESC')
+                                               .where(user_id: current_user.id)
+                                               .where('requests_review OR requires_review OR reviewed')
+                                               .order('created_at DESC')
 
             present Review.course_reviews_json(course, users_reviewed_submissions, view_context)
           end
@@ -81,7 +83,7 @@ def update_review
               award_points
               @review.submission.save!
               @review.save!
-            rescue
+            rescue StandardError
               ::Rails.logger.error($!)
               respond_with_error('Failed to save code review.')
             else
@@ -119,16 +121,16 @@ def mark_as_reviewed
             sub.reviewed = true
             sub.review_dismissed = false
             sub.of_same_kind
-              .where('(requires_review OR requests_review) AND NOT reviewed')
-              .where(['created_at < ?', sub.created_at])
-              .update_all(newer_submission_reviewed: true)
+               .where('(requires_review OR requests_review) AND NOT reviewed')
+               .where(['created_at < ?', sub.created_at])
+               .update_all(newer_submission_reviewed: true)
           end
 
           def award_points
             submission = @review.submission
             exercise = submission.exercise
             course = exercise.course
-            fail 'Exercise of submission has been moved or deleted' unless exercise
+            raise 'Exercise of submission has been moved or deleted' unless exercise
 
             available_points = exercise.available_points.where(requires_review: true).map(&:name)
             previous_points = course.awarded_points.where(user_id: submission.user_id, name: available_points).map(&:name)
@@ -137,7 +139,7 @@ def award_points
             if params[:review][:points].respond_to?(:keys)
               params[:review][:points].keys.each do |point_name|
                 unless exercise.available_points.where(name: point_name).any?
-                  fail "Point does not exist: #{point_name}"
+                  raise "Point does not exist: #{point_name}"
                 end
 
                 new_points << point_name

app/controllers/api/v8/core/courses/unlocks_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Api
   module V8
     module Core

app/controllers/api/v8/core/courses_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Api
   module V8
     module Core

app/controllers/api/v8/core/exercises/solutions_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Api
   module V8
     module Core

app/controllers/api/v8/core/exercises/submissions_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Api
   module V8
     module Core
@@ -96,7 +98,7 @@ def create
 
               unless @submission.save
                 errormsg = 'Failed to save submission.'
-                errormsg += " Errors: #{@submission.errors.messages.to_s}"
+                errormsg += " Errors: #{@submission.errors.messages}"
               end
             end