Skip to content

Commit d75d713

Browse files
committed
Add rubocop linter to code climate
1 parent 470c84b commit d75d713

File tree

12 files changed

+29
-17
lines changed

12 files changed

+29
-17
lines changed

.rubocop.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@ inherit_from: .rubocop_todo.yml
33
AllCops:
44
Exclude:
55
- 'coverage/**/*'
6+
- 'test/dummy/db/**/*'
67
- 'test/dummy/tmp/**/*'
78
- 'test/dummy/log/**/*'
9+
- 'gemfiles/*'
10+
TargetRubyVersion: 2.2
811

912
# Cop supports --auto-correct.
1013
# Configuration parameters: EnforcedStyle, IndentationWidth.
@@ -15,10 +18,15 @@ AllCops:
1518
# that span more than one line.
1619
#
1720
# https://rubocop.readthedocs.io/en/latest/cops_layout/#layoutmultilinemethodcallindentation
21+
Layout/ClosingHeredocIndentation:
22+
Exclude:
23+
- 'lib/generators/devise_token_auth/install_generator.rb'
24+
1825
Layout/MultilineMethodCallIndentation:
1926
Enabled: true
2027
EnforcedStyle: indented_relative_to_receiver
2128

29+
2230
# Cop supports --auto-correct.
2331
# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, IgnoredMethods.
2432
# SupportedStyles: line_count_based, semantic, braces_for_chaining
@@ -91,6 +99,7 @@ Metrics/BlockLength:
9199
- 'lib/devise_token_auth/engine.rb'
92100
- 'test/dummy/config/**/*'
93101
- 'test/dummy/db/**/*'
102+
- 'test/factories/*'
94103
ExcludedMethods:
95104
- describe
96105
- draw
@@ -111,4 +120,4 @@ Metrics/LineLength:
111120
- 'devise_token_auth.gemspec'
112121
IgnoredPatterns:
113122
- '(\A|\s)#'
114-
Max: 80
123+
Max: 80

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,4 @@ addons:
3838

3939
after_success:
4040
- bundle exec codeclimate-test-reporter
41+
- bundle exec rubocop .

app/controllers/devise_token_auth/application_controller.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ def resource_class(m = nil)
5454

5555
def json_api?
5656
return false unless defined?(ActiveModel::Serializer)
57+
5758
return ActiveModel::Serializer.setup do |config|
5859
config.adapter == :json_api
5960
end if ActiveModel::Serializer.respond_to?(:setup)

app/controllers/devise_token_auth/concerns/set_user_by_token.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,12 @@ module DeviseTokenAuth::Concerns::SetUserByToken
1313

1414
# keep track of request duration
1515
def set_request_start
16-
@request_started_at = Time.zone.now
1716
@used_auth_by_token = true
18-
19-
# initialize instance variables
2017
@client_id ||= nil
2118
@resource ||= nil
2219
@token ||= nil
2320
@is_batch_request ||= nil
21+
@request_started_at = Time.zone.now
2422
end
2523

2624
def ensure_pristine_resource

app/controllers/devise_token_auth/confirmations_controller.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ def show
2929
# fall back to default value if provided
3030
@redirect_url ||= DeviseTokenAuth.default_confirm_success_url
3131

32-
3332
redirect_to(@resource.build_auth_url(@redirect_url, redirect_headers))
3433
else
3534
raise ActionController::RoutingError, 'Not Found'

app/controllers/devise_token_auth/sessions_controller.rb

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,8 @@ def create
2222
end
2323

2424
if @resource && valid_params?(field, q_value) && (!@resource.respond_to?(:active_for_authentication?) || @resource.active_for_authentication?)
25-
valid_password = @resource.valid_password?(resource_params[:password])
26-
if (@resource.respond_to?(:valid_for_authentication?) && !@resource.valid_for_authentication? { valid_password }) || !valid_password
27-
return render_create_error_bad_credentials
28-
end
25+
return render_create_error_bad_credentials unless valid_credentials?
26+
2927
@client_id, @token = @resource.create_token
3028
@resource.save
3129

@@ -127,5 +125,10 @@ def render_destroy_error
127125
def resource_params
128126
params.permit(*params_for_resource(:sign_in))
129127
end
128+
129+
def valid_credentials?
130+
valid_password = @resource.valid_password?(resource_params[:password])
131+
(@resource.respond_to?(:valid_for_authentication?) && @resource.valid_for_authentication? { valid_password }) || valid_password
132+
end
130133
end
131134
end

app/models/devise_token_auth/concerns/user.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ def will_save_change_to_email?; false; end
4646

4747
def password_required?
4848
return false unless provider == 'email'
49+
4950
super
5051
end
5152

devise_token_auth.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
2020
s.test_files = Dir['test/**/*']
2121
s.test_files.reject! { |file| file.match(/[.log|.sqlite3]$/) }
2222

23-
s.required_ruby_version = ">= 2.2.0"
23+
s.required_ruby_version = '>= 2.2.0'
2424

2525
s.add_dependency 'rails', '>= 4.2.0', '< 6'
2626
s.add_dependency 'devise', '> 3.5.2', '< 4.6'

test/controllers/custom/custom_confirmations_controller_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
class Custom::ConfirmationsControllerTest < ActionController::TestCase
66
describe Custom::ConfirmationsController do
77
include CustomControllersRoutes
8-
8+
99
before do
1010
@redirect_url = Faker::Internet.url
1111
@new_user = create(:user)

test/controllers/custom/custom_registrations_controller_test.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ class Custom::RegistrationsControllerTest < ActionDispatch::IntegrationTest
88

99
before do
1010
@create_params = attributes_for(:user,
11-
confirm_success_url: Faker::Internet.url,
12-
unpermitted_param: '(x_x)')
11+
confirm_success_url: Faker::Internet.url,
12+
unpermitted_param: '(x_x)')
1313

1414
@existing_user = create(:user, :confirmed)
1515
@auth_headers = @existing_user.create_new_auth_token

0 commit comments

Comments
 (0)