Skip to content

Commit 2f63926

Browse files
VasfedVasfed
committed
Fix most rubocop warnings
1 parent 9fa1b32 commit 2f63926

17 files changed

+43
-43
lines changed

‎.rubocop.yml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require:
66
AllCops:
77
NewCops: enable
88
# 2.0 was dropped in rubocop 0.50
9-
# TargetRubyVersion: 2.0
9+
TargetRubyVersion: 2.1
1010
Exclude:
1111
- gemfiles/*
1212

@@ -27,10 +27,14 @@ Rails/RenderInline: { Enabled: false }
2727
Rails/ApplicationController: { Enabled: false }
2828

2929
Metrics/BlockLength:
30+
Max: 30
3031
Exclude:
3132
- spec/*
32-
33-
Metrics/MethodLength: { Max: 25 }
33+
Metrics/MethodLength: { Max: 30 }
34+
Metrics/ModuleLength: { Max: 150 }
35+
Metrics/ClassLength: { Max: 150 }
3436
Metrics/AbcSize: { Enabled: false }
3537
Metrics/CyclomaticComplexity: { Max: 15 }
36-
Metrics/PerceivedComplexity: { Max: 15 }
38+
Metrics/PerceivedComplexity: { Max: 15 }
39+
40+
Style/HashConversion: { Enabled: false } # ruby 2.0 does not have ary.to_h

‎Rakefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Rake::TestTask.new(:dummytest_controller) { |t| t.pattern = 'spec/fixtures/dummy
2020

2121
task default: :spec
2222

23-
$LOAD_PATH.push File.expand_path('../lib', __FILE__)
23+
$LOAD_PATH.push File.expand_path('lib', __dir__)
2424
require 'routes_coverage/version'
2525

2626
namespace :assets do

‎lib/routes_coverage.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def process(action, *args)
2020

2121
module ActionControllerTestCaseKvargs
2222
if RUBY_VERSION >= '2'
23-
class_eval <<-RUBY, __FILE__, __LINE__+1
23+
class_eval <<-RUBY, __FILE__, __LINE__ + 1
2424
def process(action, **kvargs)
2525
return super unless RoutesCoverage.settings.include_from_controller_tests
2626

‎lib/routes_coverage/auditor.rb‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -125,27 +125,24 @@ def print_missing_actions
125125
# NB: for singular `resource` there may be unnecessary `index` in suggestions
126126
restful_actions = %w[index new create show edit update destroy].freeze
127127

128-
declared_restful = all_routes.select { |route|
128+
declared_restful = all_routes.select do |route|
129129
route.respond_to?(:requirements) && route.requirements[:controller] &&
130-
restful_actions.include?(route.requirements[:action])
131-
}.group_by{ |route| route.requirements[:controller]}
130+
restful_actions.include?(route.requirements[:action])
131+
end.group_by { |route| route.requirements[:controller] }
132132

133133
missing_actions.keys.map { |action| action.split('#', 2) }.group_by(&:first).each do |(controller, actions)|
134134
missing = actions.map(&:last)
135135
next if missing.empty?
136136

137-
undeclared_restful = restful_actions - declared_restful[controller].map{|r| r.requirements[:action] }
137+
undeclared_restful = restful_actions - declared_restful[controller].map { |r| r.requirements[:action] }
138138
logger.info([
139139
"#{controller}:",
140140
(if (restful_actions & missing).any?
141-
"#{(missing & restful_actions).join(', ')}"\
142-
", except: %i[#{(restful_actions & (missing + undeclared_restful)).join(' ')}]"\
143-
", only: %i[#{(restful_actions - (missing + undeclared_restful)).join(' ')}]"
144-
end),
145-
(if (missing - restful_actions).any?
146-
", Missing custom: #{(missing - restful_actions).join(', ')}"
147-
end)
148-
141+
"#{(missing & restful_actions).join(', ')}" \
142+
", except: %i[#{(restful_actions & (missing + undeclared_restful)).join(' ')}]" \
143+
", only: %i[#{(restful_actions - (missing + undeclared_restful)).join(' ')}]"
144+
end),
145+
(", Missing custom: #{(missing - restful_actions).join(', ')}" if (missing - restful_actions).any?)
149146
].compact.join(' '))
150147
end
151148
end

‎lib/routes_coverage/formatters/full_text.rb‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ def draw_section(routes)
4949
# unwrap SimpleDelegator
5050
original_route = r[:original].respond_to?(:__getobj__) ? r[:original].__getobj__ : r[:original]
5151

52-
"#{r[:name].rjust(name_width) if @output_prefix} "\
53-
"#{r[:verb].ljust(verb_width)} #{r[:path].ljust(path_width)} #{r[:reqs].ljust(reqs_width)}"\
52+
"#{r[:name].rjust(name_width) if @output_prefix} " \
53+
"#{r[:verb].ljust(verb_width)} #{r[:path].ljust(path_width)} #{r[:reqs].ljust(reqs_width)}" \
5454
"#{" #{@result.route_hit_counts[original_route]}" if @output_hits}"
5555
end
5656
end
@@ -68,7 +68,7 @@ def draw_header(routes)
6868
end
6969

7070
def widths(routes)
71-
[:name, :verb, :path, :reqs].map do |key|
71+
%i[name verb path reqs].map do |key|
7272
routes.map { |r| r[key].length }.max.to_i
7373
end
7474
end
@@ -99,9 +99,9 @@ def hit_routes_details
9999
hit_routes = collect_routes(result.hit_routes)
100100
pending_routes = collect_routes(result.pending_routes)
101101

102-
"#{routes_section(RouteFormatter.new(result, settings).with_hits, 'Covered routes:', hit_routes)}\n"\
103-
"\n"\
104-
"#{routes_section(RouteFormatter.new(result, settings), 'Pending routes:', pending_routes)}"
102+
"#{routes_section(RouteFormatter.new(result, settings).with_hits, 'Covered routes:', hit_routes)}\n" \
103+
"\n" \
104+
"#{routes_section(RouteFormatter.new(result, settings), 'Pending routes:', pending_routes)}"
105105
end
106106

107107
def format

‎lib/routes_coverage/formatters/summary_text.rb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ module RoutesCoverage
44
module Formatters
55
class SummaryText < Base
66
def hits_count(result)
7-
"#{result.hit_routes_count} of #{result.expected_routes_count}"\
8-
"#{"(#{result.total_count} total)" if result.expected_routes_count != result.total_count}"\
9-
" routes hit#{" at #{result.avg_hits} hits average" if result.hit_routes_count > 0}"
7+
"#{result.hit_routes_count} of #{result.expected_routes_count}" \
8+
"#{"(#{result.total_count} total)" if result.expected_routes_count != result.total_count} " \
9+
"routes hit#{" at #{result.avg_hits} hits average" if result.hit_routes_count > 0}"
1010
end
1111

1212
def status

‎lib/routes_coverage/result.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ def expected_routes
9696

9797
routes_groups = all_routes.group_by do |r|
9898
# rails <=4 has regex in verb
99-
verb = r.verb.is_a?(Regexp) && r.verb.inspect.gsub(/[^\w]/, '') || r.verb
99+
verb = (r.verb.is_a?(Regexp) && r.verb.inspect.gsub(/[^\w]/, '')) || r.verb
100100
(
101101
("#{verb} #{r.path.spec}".strip =~ filter_regex) ||
102102
(r.path.spec.to_s =~ namespaces_regex)

‎routes_coverage.gemspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# frozen_string_literal: true
22

3-
lib = File.expand_path('../lib', __FILE__)
3+
lib = File.expand_path('lib', __dir__)
44
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
55
require 'routes_coverage/version'
66

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
1111
spec.email = ["vasilyfedoseyev@gmail.com"]
1212

1313
spec.summary = "Provides coverage report for your rails routes"
14-
spec.description = "Generates coverage report for routes hit by your request/integration/feature tests "\
14+
spec.description = "Generates coverage report for routes hit by your request/integration/feature tests " \
1515
"including capybara ones"
1616
spec.homepage = "https://github.com/Vasfed/routes_coverage"
1717
spec.license = "MIT"
@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
2626
spec.require_paths = ["lib"]
2727

2828
spec.add_development_dependency 'appraisal'
29-
spec.add_development_dependency "bundler" #, ">= 2.2.10"
29+
spec.add_development_dependency "bundler" # , ">= 2.2.10"
3030
spec.add_development_dependency "minitest"
3131
spec.add_development_dependency "rake", ">= 12.3.3"
3232
end

‎spec/fixtures/constraints_test.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def self.matches?(request)
2828

2929
class DummyRequestTest < ActionDispatch::IntegrationTest
3030
def test_coverage_enabled
31-
assert(RoutesCoverage.enabled?)
31+
assert_predicate(RoutesCoverage, :enabled?)
3232
end
3333

3434
def test_patch

‎spec/fixtures/dummy_controller_test.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class DummyControllerTest < ActionController::TestCase
1818
setup { @routes = Rails.application.routes }
1919

2020
def test_index_working
21-
assert(RoutesCoverage.enabled?)
21+
assert_predicate(RoutesCoverage, :enabled?)
2222
get :index
2323
assert_response :success
2424
end

0 commit comments

Comments
 (0)