Fix Style/RedundantReturn

lynndylanhurley · Apr 9, 2018 · f097ecd · f097ecd
1 parent da0746c
commit f097ecd
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 21 deletions.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --exclude-limit 30`
-# on 2018-04-02 18:32:20 +0300 using RuboCop version 0.54.0.
+# on 2018-04-02 18:53:29 +0300 using RuboCop version 0.54.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -638,17 +638,6 @@ Style/PercentLiteralDelimiters:
 Style/RaiseArgs:
   EnforcedStyle: compact
 
-# Offense count: 6
-# Cop supports --auto-correct.
-# Configuration parameters: AllowMultipleReturnValues.
-Style/RedundantReturn:
-  Exclude:
-    - 'app/controllers/devise_token_auth/application_controller.rb'
-    - 'app/controllers/devise_token_auth/passwords_controller.rb'
-    - 'app/controllers/devise_token_auth/sessions_controller.rb'
-    - 'app/models/devise_token_auth/concerns/user.rb'
-    - 'lib/devise_token_auth/url.rb'
-
 # Offense count: 7
 # Cop supports --auto-correct.
 Style/RedundantSelf:

diff --git a/app/controllers/devise_token_auth/application_controller.rb b/app/controllers/devise_token_auth/application_controller.rb
@@ -12,7 +12,7 @@ def resource_data(opts={})
     end
 
     def resource_errors
-      return @resource.errors.to_hash.merge(full_messages: @resource.errors.full_messages)
+      @resource.errors.to_hash.merge(full_messages: @resource.errors.full_messages)
     end
 
     protected
@@ -53,7 +53,7 @@ def json_api?
       return ActiveModel::Serializer.setup do |config|
         config.adapter == :json_api
       end if ActiveModel::Serializer.respond_to?(:setup)
-      return ActiveModelSerializers.config.adapter == :json_api
+      ActiveModelSerializers.config.adapter == :json_api
     end
 
     def recoverable_enabled?

diff --git a/app/controllers/devise_token_auth/passwords_controller.rb b/app/controllers/devise_token_auth/passwords_controller.rb
@@ -172,7 +172,7 @@ def render_update_success
     end
 
     def render_update_error
-      return render json: {
+      render json: {
         success: false,
         errors: resource_errors
       }, status: 422

diff --git a/app/controllers/devise_token_auth/sessions_controller.rb b/app/controllers/devise_token_auth/sessions_controller.rb
@@ -85,10 +85,7 @@ def get_auth_params
         auth_val.downcase!
       end
 
-      return {
-        key: auth_key,
-        val: auth_val
-      }
+      { key: auth_key, val: auth_val }
     end
 
     def render_new_error

diff --git a/app/models/devise_token_auth/concerns/user.rb b/app/models/devise_token_auth/concerns/user.rb
@@ -121,7 +121,7 @@ def valid_token?(token, client_id='default')
     return true if token_can_be_reused?(token, client_id)
 
     # return false if none of the above conditions are met
-    return false
+    false
   end
 
   # this must be done from the controller so that additional params

diff --git a/lib/devise_token_auth/url.rb b/lib/devise_token_auth/url.rb
@@ -10,7 +10,7 @@ def self.generate(url, params = {})
     res += "?#{query}"
     res += "##{uri.fragment}" if uri.fragment
 
-    return res
+    res
   end
 
   def self.whitelisted?(url)