Use the latest Rails rubocop config

Author: nygrenh

.rubocop.yml

@@ -1,17 +1,14 @@
+inherit_gem:
+  rubocop-rails_config:
+    - config/rails.yml
+
 AllCops:
-  Include:
-    - '**/config.ru'
-    - '**/Rakefile'
-  Exclude:
-    - 'db/**/*'
-    - 'ext/**/*'
-    - 'tmp/**/*'
   TargetRubyVersion: 2.5
 
-Rails:
-  Enabled: true
-
 # Style
+Style/StringLiterals:
+  Enabled: true
+  EnforcedStyle: single_quotes
 
 Style/Documentation:
   Enabled: false

Gemfile

@@ -67,7 +67,8 @@ group :development, :test do
   gem 'launchy' # for capybara's save_and_open_page
   gem 'mimic', '~> 0.4.3'
   gem 'railroady' # for doc/diagrams
-  gem 'rubocop', '~> 0.35.0', require: false
+  gem 'rubocop', '~> 0.59.2', require: false
+  gem 'rubocop-rails_config', '~> 0.2.4'
   gem 'ruby-prof', '~> 0.12.2' # for performance tests
   gem 'simplecov'
 end

Gemfile.lock

@@ -46,8 +46,6 @@ GEM
     andand (1.3.3)
     arel (6.0.4)
     ast (2.4.0)
-    astrolabe (1.3.1)
-      parser (~> 2.2)
     autoprefixer-rails (8.2.0)
       execjs
     bootstrap (4.0.0)
@@ -130,6 +128,7 @@ GEM
     hurley (0.2)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
+    jaro_winkler (1.5.1)
     jquery-rails (3.1.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
@@ -183,7 +182,8 @@ GEM
       mime-types
       mimemagic (~> 0.3.0)
       terrapin (~> 0.6.0)
-    parser (2.5.0.5)
+    parallel (1.12.1)
+    parser (2.5.1.2)
       ast (~> 2.4.0)
     pdfkit (0.8.2)
     pg (0.19.0)
@@ -196,7 +196,7 @@ GEM
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
     popper_js (1.12.9)
-    powerpack (0.1.1)
+    powerpack (0.1.2)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -237,8 +237,7 @@ GEM
       activesupport (= 4.2.10)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rainbow (2.2.2)
-      rake
+    rainbow (3.0.0)
     rake (12.3.1)
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
@@ -286,15 +285,19 @@ GEM
       rspec-mocks (~> 3.5.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    rubocop (0.35.1)
-      astrolabe (~> 1.3)
-      parser (>= 2.2.3.0, < 3.0)
+    rubocop (0.59.2)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      tins (<= 1.6.0)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    rubocop-rails_config (0.2.4)
+      railties (>= 3.0)
+      rubocop (~> 0.56)
     ruby-prof (0.12.2)
-    ruby-progressbar (1.9.0)
+    ruby-progressbar (1.10.0)
     sass (3.5.6)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
@@ -337,7 +340,6 @@ GEM
     thor (0.20.0)
     thread_safe (0.3.6)
     tilt (2.0.8)
-    tins (1.6.0)
     transaction_isolation (1.0.3)
       activerecord (>= 3.0.11)
     tzinfo (1.2.5)
@@ -349,6 +351,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
+    unicode-display_width (1.4.0)
     websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
@@ -404,7 +407,8 @@ DEPENDENCIES
   rspec-activemodel-mocks (~> 1.0.0)
   rspec-core (~> 3.5.2)
   rspec-rails (~> 3.5.1)
-  rubocop (~> 0.35.0)
+  rubocop (~> 0.59.2)
+  rubocop-rails_config (~> 0.2.4)
   ruby-prof (~> 0.12.2)
   sass-rails (~> 5.0)
   simplecov
@@ -415,4 +419,4 @@ DEPENDENCIES
   xml-simple (~> 1.1.1)
 
 BUNDLED WITH
-   1.16.2
+   1.16.5

app/controllers/api/beta/base_controller.rb

@@ -29,19 +29,19 @@ def present(hash)
 
   private
 
-  def authenticate_user!
-    if doorkeeper_token
-      @current_user = User.find(doorkeeper_token.resource_owner_id)
-    end
+    def authenticate_user!
+      if doorkeeper_token
+        @current_user = User.find(doorkeeper_token.resource_owner_id)
+      end
 
-    return if @current_user
+      return if @current_user
 
-    render json: { errors: ['User is not authenticated!'] }, status: :unauthorized
-  end
+      render json: { errors: ['User is not authenticated!'] }, status: :unauthorized
+    end
 
-  attr_reader :current_user
+    attr_reader :current_user
 
-  def errors_json(messages)
-    { errors: [*messages] }
-  end
+    def errors_json(messages)
+      { errors: [*messages] }
+    end
 end

app/controllers/api/v8/base_controller.rb

@@ -30,20 +30,20 @@ def present(hash)
 
       private
 
-      def authenticate_user!
-        return @current_user if @current_user
-        if doorkeeper_token
-          @current_user ||= User.find_by(id: doorkeeper_token.resource_owner_id)
-          raise 'Invalid token' unless @current_user
+        def authenticate_user!
+          return @current_user if @current_user
+          if doorkeeper_token
+            @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
-        @current_user ||= user_from_session || Guest.new
-      end
 
-      attr_reader :current_user
+        attr_reader :current_user
 
-      def errors_json(messages)
-        { errors: [*messages] }
-      end
+        def errors_json(messages)
+          { errors: [*messages] }
+        end
     end
   end
 end

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

@@ -63,60 +63,60 @@ def create
 
           private
 
-          def award_points
-            submission = @review.submission
-            exercise = submission.exercise
-            course = exercise.course
-            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)
-
-            new_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?
-                  raise "Point does not exist: #{point_name}"
+            def award_points
+              submission = @review.submission
+              exercise = submission.exercise
+              course = exercise.course
+              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)
+
+              new_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?
+                    raise "Point does not exist: #{point_name}"
+                  end
+
+                  new_points << point_name
+                  pt = submission.awarded_points.build(
+                    course_id: submission.course_id,
+                    user_id: submission.user_id,
+                    name: point_name
+                  )
+                  authorize! :create, pt
+                  pt.save!
                 end
-
-                new_points << point_name
-                pt = submission.awarded_points.build(
-                  course_id: submission.course_id,
-                  user_id: submission.user_id,
-                  name: point_name
-                )
-                authorize! :create, pt
-                pt.save!
               end
-            end
 
-            @review.points = (@review.points_list + new_points + previous_points).uniq.natsort.join(' ')
-            submission.points = (submission.points_list + new_points + previous_points).uniq.natsort.join(' ')
-          end
+              @review.points = (@review.points_list + new_points + previous_points).uniq.natsort.join(' ')
+              submission.points = (submission.points_list + new_points + previous_points).uniq.natsort.join(' ')
+            end
 
-          def mark_as_reviewed
-            sub = @review.submission
-            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)
-          end
+            def mark_as_reviewed
+              sub = @review.submission
+              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)
+            end
 
-          def notify_user_about_new_review
-            channel = '/broadcast/user/' + @review.submission.user.username + '/review-available'
-            data = {
-              exercise_name: @review.submission.exercise_name,
-              url: submission_reviews_url(@review.submission),
-              points: @review.points_list
-            }
-            CometServer.get.try_publish(channel, data)
-          end
+            def notify_user_about_new_review
+              channel = '/broadcast/user/' + @review.submission.user.username + '/review-available'
+              data = {
+                exercise_name: @review.submission.exercise_name,
+                url: submission_reviews_url(@review.submission),
+                points: @review.points_list
+              }
+              CometServer.get.try_publish(channel, data)
+            end
 
-          def send_email_about_new_review
-            ReviewMailer.review_email(@review).deliver
-          end
+            def send_email_about_new_review
+              ReviewMailer.review_email(@review).deliver
+            end
         end
       end
     end

app/controllers/api/v8/courses/exercises_controller.rb

@@ -46,10 +46,10 @@ def index
           unless can_see_everything
             exercises = exercises.where(hidden: false, disabled_status: 0)
             exercises = if unlocked_exercises.empty?
-                          exercises.where(unlock_spec: nil)
-                        else
-                          exercises.where(["unlock_spec IS NULL OR exercises.name IN (#{unlocked_exercises.map { |_| '?' }.join(', ')})", *unlocked_exercises])
-                        end
+              exercises.where(unlock_spec: nil)
+            else
+              exercises.where(["unlock_spec IS NULL OR exercises.name IN (#{unlocked_exercises.map { |_| '?' }.join(', ')})", *unlocked_exercises])
+            end
           end
 
           exercises = exercises.pluck(:id)

app/controllers/api/v8/courses/users/submissions_controller.rb

@@ -22,7 +22,7 @@ class SubmissionsController < Api::V8::BaseController
               response 403, '$ref': '#/responses/error'
               response 404, '$ref': '#/responses/error'
               response 200 do
-                key :description, 'User\'s submissions in json'
+                key :description, "User's submissions in json"
                 schema do
                   key :title, :submissions
                   key :required, [:submissions]
@@ -39,7 +39,7 @@ class SubmissionsController < Api::V8::BaseController
 
           swagger_path '/api/v8/courses/{course_id}/users/current/submissions' do
             operation :get do
-              key :description, 'Returns the user\'s own submissions in a json format'
+              key :description, "Returns the user's own submissions in a json format"
               key :operationId, 'findUsersOwnSubmissionsById'
               key :produces, [
                 'application/json'
@@ -51,7 +51,7 @@ class SubmissionsController < Api::V8::BaseController
               response 403, '$ref': '#/responses/error'
               response 404, '$ref': '#/responses/error'
               response 200 do
-                key :description, 'User\'s own submissions in json'
+                key :description, "User's own submissions in json"
                 schema do
                   key :title, :submissions
                   key :required, [:submissions]

app/controllers/api/v8/organizations/courses/users/submissions_controller.rb

@@ -24,7 +24,7 @@ class SubmissionsController < Api::V8::BaseController
                 response 403, '$ref': '#/responses/error'
                 response 404, '$ref': '#/responses/error'
                 response 200 do
-                  key :description, 'User\'s submissions in json'
+                  key :description, "User's submissions in json"
                   schema do
                     key :title, :submissions
                     key :required, [:submissions]
@@ -41,7 +41,7 @@ class SubmissionsController < Api::V8::BaseController
 
             swagger_path '/api/v8/org/{organization_slug}/courses/{course_name}/users/current/submissions' do
               operation :get do
-                key :description, 'Returns the user\'s own submissions in a json format'
+                key :description, "Returns the user's own submissions in a json format"
                 key :operationId, 'findUsersOwnSubmissionsByCourseName'
                 key :produces, [
                   'application/json'
@@ -54,7 +54,7 @@ class SubmissionsController < Api::V8::BaseController
                 response 403, '$ref': '#/responses/error'
                 response 404, '$ref': '#/responses/error'
                 response 200 do
-                  key :description, 'User\'s own submissions in json'
+                  key :description, "User's own submissions in json"
                   schema do
                     key :title, :submissions
                     key :required, [:submissions]

app/controllers/api/v8/users/basic_info_by_usernames_controller.rb

@@ -8,7 +8,7 @@ class BasicInfoByUsernamesController < Api::V8::BaseController
 
         swagger_path '/api/v8/users/basic_info_by_usernames' do
           operation :post do
-            key :description, 'Find all users\' basic infos with the posted json array of usernames'
+            key :description, "Find all users' basic infos with the posted json array of usernames"
             key :operationId, 'findUsersBasicInfoByUsernames'
             parameter do
               key :name, :usernames
@@ -26,7 +26,7 @@ class BasicInfoByUsernamesController < Api::V8::BaseController
               'user'
             ]
             response 200 do
-              key :description, 'Users\' username, email, and administrator status by usernames as json'
+              key :description, "Users' username, email, and administrator status by usernames as json"
               schema do
                 key :title, :user
                 key :required, [:user]