The Rubocopening, ruby version bump

.rubocop_todo.yml

@@ -6,13 +6,6 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 2
-# Cop supports --auto-correct.
-Rails/ActiveRecordAliases:
-  Exclude:
-    - 'app/controllers/activities_controller.rb'
-    - 'app/controllers/api/activities_controller.rb'
-
 # Offense count: 1
 # Configuration parameters: Include.
 # Include: db/migrate/*.rb
@@ -21,59 +14,8 @@ Rails/CreateTableWithTimestamps:
     - 'db/migrate/20170210180426_remove_tokens_from_users.rb'
 
 # Offense count: 1
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: slashes, arguments
-Rails/FilePath:
-  Exclude:
-    - 'config/environments/development.rb'
-
-# Offense count: 1
-# Configuration parameters: Include.
-# Include: app/models/**/*.rb
-Rails/HasManyOrHasOneDependent:
-  Exclude:
-    - 'app/models/person.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: numeric, symbolic
-Rails/HttpStatus:
-  Exclude:
-    - 'app/controllers/application_controller.rb'
-
-# Offense count: 6
-# Cop supports --auto-correct.
-Rails/PluralizationGrammar:
-  Exclude:
-    - 'app/helpers/authentication_helper.rb'
-    - 'app/models/person.rb'
-    - 'app/models/token.rb'
-    - 'db/seeds.rb'
-
-# Offense count: 1
 # Configuration parameters: Include.
 # Include: db/migrate/*.rb
 Rails/ReversibleMigration:
   Exclude:
     - 'db/migrate/20161214112504_remove_group_type_from_groups.rb'
-
-# Offense count: 4
-# Configuration parameters: Blacklist, Whitelist.
-# Blacklist: decrement!, decrement_counter, increment!, increment_counter, toggle!, touch, update_all, update_attribute, update_column, update_columns, update_counters
-Rails/SkipsModelValidations:
-  Exclude:
-    - 'app/controllers/members_controller.rb'
-    - 'app/models/activity.rb'
-    - 'app/models/user.rb'
-
-# Offense count: 9
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: strict, flexible
-Rails/TimeZone:
-  Exclude:
-    - 'app/controllers/activities_controller.rb'
-    - 'app/controllers/api/groups_controller.rb'
-    - 'app/controllers/dashboard_controller.rb'
-    - 'app/models/group.rb'
-    - 'db/seeds.rb'

.ruby-version

@@ -1 +1 @@
-2.5.1
+2.5.3

Gemfile

@@ -90,6 +90,9 @@ group :development do
 
   # Translation helpers
   gem 'i18n_generators'
+
+  # Codestyle enforcement
+  gem 'rubocop'
 end
 
 group :production do

Gemfile.lock

@@ -39,6 +39,7 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     arel (7.1.4)
+    ast (2.4.0)
     autoprefixer-rails (9.4.3)
       execjs
     babel-source (5.8.35)
@@ -96,6 +97,7 @@ GEM
     icalendar (2.5.2)
       ice_cube (~> 0.16)
     ice_cube (0.16.3)
+    jaro_winkler (1.5.2)
     jquery-rails (4.3.3)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
@@ -126,7 +128,11 @@ GEM
     nokogiri (1.9.1)
       mini_portile2 (~> 2.4.0)
     oj (3.7.4)
+    parallel (1.13.0)
+    parser (2.6.0.0)
+      ast (~> 2.4.0)
     pg (1.1.3)
+    powerpack (0.1.2)
     puma (3.12.0)
     rabl (0.14.0)
       activesupport (>= 2.3.14)
@@ -156,6 +162,7 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
+    rainbow (3.0.0)
     rake (12.3.2)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
@@ -164,6 +171,15 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
+    rubocop (0.63.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.5, != 2.5.1.1)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.4.0)
+    ruby-progressbar (1.10.0)
     sass (3.7.2)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
@@ -207,6 +223,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
+    unicode-display_width (1.4.1)
     web-console (3.7.0)
       actionview (>= 5.0)
       activemodel (>= 5.0)
@@ -248,6 +265,7 @@ DEPENDENCIES
   puma (~> 3.0)
   rabl
   rails (~> 5.0.0, >= 5.0.0.1)
+  rubocop
   sass-rails (~> 5.0)
   sentry-raven
   spring
@@ -262,4 +280,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.17.1
+   1.17.3

app/controllers/activities_controller.rb

@@ -26,12 +26,12 @@ class ActivitiesController < ApplicationController
   def index
     @activities = if params[:past]
                     @group.activities
-                          .where('start < ?', Time.now)
+                          .where('start < ?', Time.zone.now)
                           .order(start: :desc)
                           .paginate(page: params[:page], per_page: 25)
                   else
                     @group.activities
-                          .where('start > ?', Time.now)
+                          .where('start > ?', Time.zone.now)
                           .order(start: :asc)
                           .paginate(page: params[:page], per_page: 25)
                   end
@@ -273,13 +273,13 @@ class ActivitiesController < ApplicationController
       return
     end
 
-    if @activity.deadline && @activity.deadline < Time.now && !@activity.may_change?(current_person)
+    if @activity.deadline&.past? && !@activity.may_change?(current_person)
       head :locked
       return
     end
 
     params[:notes] = params[:participant][:notes] if params[:participant]
-    participant.update_attributes(params.permit(:notes, :attending))
+    participant.update!(params.permit(:notes, :attending))
     head :no_content
   end
 

app/controllers/api/activities_controller.rb

@@ -83,7 +83,7 @@ module Api
         activity: @activity
       )
 
-      participant.update_attributes(params.permit(:attending))
+      participant.update!(params.permit(:attending))
       head :no_content
     end
 

app/controllers/api/groups_controller.rb

@@ -61,7 +61,7 @@ module Api
       return unless input
 
       begin
-        DateTime.parse input # rubocop:disable Style/DateTime
+        DateTime.zone.parse input
       rescue ArgumentError
         nil
       end

app/controllers/application_controller.rb

@@ -8,6 +8,6 @@ class ApplicationController < ActionController::Base
   private
 
   def invalid_auth_token
-    render text: I18n.t(:invalid_csrf), status: 400
+    render text: I18n.t(:invalid_csrf), status: :bad_request
   end
 end

app/controllers/dashboard_controller.rb

@@ -5,7 +5,7 @@ class DashboardController < ApplicationController
     @upcoming = current_person
                 .participants
                 .joins(:activity)
-                .where('activities.end >= ? OR (activities.end IS NULL AND activities.start >= ?)', Time.now, Time.now)
+                .where('activities.end >= ? OR (activities.end IS NULL AND activities.start >= ?)', Time.zone.now, Time.zone.now)
                 .order('activities.start ASC')
     @user_organized = @upcoming
                       .where(is_organizer: true)
@@ -20,7 +20,7 @@ class DashboardController < ApplicationController
   def set_settings_params!
     @person = current_person
     @send_attendance_reminder = @person.send_attendance_reminder
-    @active_sessions = Session.where(user: current_user).where(active: true).where('expires > ?', Time.now).count
+    @active_sessions = Session.where(user: current_user).where(active: true).where('expires > ?', Time.zone.now).count
   end
 
   def settings

app/controllers/members_controller.rb

@@ -28,13 +28,13 @@ class MembersController < ApplicationController
   end
 
   def promote
-    @member.update_attribute(:is_leader, true)
+    @member.update!(is_leader: true)
     flash_message(:success, I18n.t('groups.leader_added', name: @member.person.full_name))
     redirect_to group_members_path(@group)
   end
 
   def demote
-    @member.update_attribute(:is_leader, false)
+    @member.update!(is_leader: false)
     flash_message(:success, I18n.t('groups.leader_removed', name: @member.person.full_name))
     redirect_to group_members_path(@group)
   end

app/helpers/authentication_helper.rb

@@ -11,7 +11,7 @@ module AuthenticationHelper
 
     if remember == 1
       token = Session.new_token
-      expiry = 1.years.since
+      expiry = 1.year.since
       cookies.signed.permanent[:remember_token] = {
         value: token,
         httponly: true

app/models/activity.rb

@@ -152,7 +152,7 @@ class Activity < ApplicationRecord
     defaults = group.default_subgroups
 
     # If there are no subgroups, there cannot be subgroup division.
-    update_attribute(:subgroup_division_enabled, false) if defaults.none?
+    update!(:subgroup_division_enabled, false) if defaults.none?
 
     defaults.each do |dsg|
       sg = Subgroup.new(activity: self)

app/models/group.rb

@@ -30,7 +30,7 @@ class Group < ApplicationRecord
 
   # @return [Array<Activity>] the activities that haven't started yet.
   def future_activities
-    activities.where('start > ?', Time.now)
+    activities.where('start > ?', Time.zone.now)
   end
 
   # @return [Array<Activity>]

app/models/person.rb

@@ -34,7 +34,7 @@ class Person < ApplicationRecord
   #   @return [Boolean]
   #     whether or not the person has administrative rights.
 
-  has_one :user
+  has_one :user, dependent: :destroy
   has_many :members,
            dependent: :destroy
   has_many :participants,
@@ -109,7 +109,7 @@ class Person < ApplicationRecord
     cal = Icalendar::Calendar.new
     cal.x_wr_calname = 'Aardbei'
 
-    tzid = 1.seconds.since.time_zone.tzinfo.name
+    tzid = 1.second.since.time_zone.tzinfo.name
 
     selection =
       participants

app/models/token.rb

@@ -55,7 +55,7 @@ class Token < ApplicationRecord
   def generate_expiry
     case tokentype
     when TYPES[:password_reset]
-      self.expires = 1.days.since
+      self.expires = 1.day.since
     when TYPES[:account_confirmation]
       self.expires = 7.days.since
     end

app/models/user.rb

@@ -21,8 +21,8 @@ class User < ApplicationRecord
   # Set all sessions associated with this User to inactive, for instance after
   # a password change, or when the user selects this options in the Settings.
   def logout_all_sessions!
-    sessions = Session.where(user: self)
-    sessions.update_all(active: false)
+    Session.where(user: self)
+           .update_all(active: false) # rubocop:disable Rails/SkipsModelValidations
   end
 
   private

config/environments/development.rb

@@ -13,7 +13,7 @@ Rails.application.configure do
   config.consider_all_requests_local = true
 
   # Enable/disable caching. By default caching is disabled.
-  if Rails.root.join('tmp/caching-dev.txt').exist?
+  if Rails.root.join('tmp', 'caching-dev.txt').exist?
     config.action_controller.perform_caching = true
 
     config.cache_store = :memory_store

db/seeds.rb

@@ -64,8 +64,8 @@ Activity.create!(
 
 Group.all.each do |g|
   10.times do
-    starttime = Faker::Time.between(Time.now, 1.years.since, :morning)
-    endtime   = Faker::Time.between(1.hours.since(starttime), 1.days.since(starttime), :afternoon)
+    starttime = Faker::Time.between(Time.zone.now, 1.year.since, :morning)
+    endtime   = Faker::Time.between(1.hour.since(starttime), 1.day.since(starttime), :afternoon)
     deadline  = 5.days.ago(starttime)
 
     Activity.create!(