Rubocop: prefer if/unless as modifier when body trivial

Laust Rud Jacobsen
1 parent 086f0dc6
Showing 6 changed files with 6 additions and 29 deletions Show diff stats
.rubocop_todo.yml
app/controllers/api/v1/stats_controller.rb
app/controllers/application_controller.rb
app/controllers/problems_controller.rb
app/models/notice.rb
app/models/user.rb
@@ -93,17 +93,6 @@ Style/FileName:
 Style/GuardClause:
   Enabled: false
-# Offense count: 6
-# Cop supports --auto-correct.
-# Configuration parameters: MaxLineLength.
-Style/IfUnlessModifier:
-  Exclude:
-    - 'app/controllers/api/v1/stats_controller.rb'
-    - 'app/controllers/application_controller.rb'
-    - 'app/controllers/problems_controller.rb'
-    - 'app/models/notice.rb'
-    - 'app/models/user.rb'
-
 # Offense count: 873
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
@@ -25,9 +25,7 @@ class Api::V1::StatsController &lt; ApplicationController
   protected def require_api_key_or_authenticate_user!
     if params[:api_key].present?
-      if (@app = App.where(api_key: params[:api_key]).first)
-        return true
-      end
+      return true if (@app = App.where(api_key: params[:api_key]).first)
     end
     authenticate_user!
@@ -41,8 +41,6 @@ protected
     user_token = params[User.token_authentication_key].presence
     user       = user_token && User.find_by(authentication_token: user_token)
-    if user
-      sign_in user, store: false
-    end
+    sign_in user, store: false if user
   end
 end
@@ -58,9 +58,7 @@ class ProblemsController &lt; ApplicationController
     issue = Issue.new(problem: problem, user: current_user)
     issue.body = render_to_string(*issue.render_body_args)
-    unless issue.save
-      flash[:error] = issue.errors.full_messages.join(', ')
-    end
+    flash[:error] = issue.errors.full_messages.join(', ') unless issue.save
     redirect_to app_problem_path(app, problem)
   end
@@ -107,15 +107,11 @@ class Notice
   # TODO: Move on decorator maybe
   #
   def project_root
-    if server_environment
-      server_environment['project-root'] || ''
-    end
+    server_environment['project-root'] || '' if server_environment
   end
   def app_version
-    if server_environment
-      server_environment['app-version'] || ''
-    end
+    server_environment['app-version'] || '' if server_environment
   end
   # filter memory addresses out of object strings
@@ -67,9 +67,7 @@ class User
   end
   def github_login=(login)
-    if login.is_a?(String) && login.strip.empty?
-      login = nil
-    end
+    login = nil if login.is_a?(String) && login.strip.empty?
     self[:github_login] = login
   end
	@@ -93,17 +93,6 @@ Style/FileName:		@@ -93,17 +93,6 @@ Style/FileName:
93	Style/GuardClause:	93	Style/GuardClause:
94	Enabled: false	94	Enabled: false
95		95
96	-# Offense count: 6
97	-# Cop supports --auto-correct.
98	-# Configuration parameters: MaxLineLength.
99	-Style/IfUnlessModifier:
100	- Exclude:
101	- - 'app/controllers/api/v1/stats_controller.rb'
102	- - 'app/controllers/application_controller.rb'
103	- - 'app/controllers/problems_controller.rb'
104	- - 'app/models/notice.rb'
105	- - 'app/models/user.rb'
106	-
107	# Offense count: 873	96	# Offense count: 873
108	# Cop supports --auto-correct.	97	# Cop supports --auto-correct.
109	# Configuration parameters: EnforcedStyle, SupportedStyles.	98	# Configuration parameters: EnforcedStyle, SupportedStyles.