More rubocop-suggested refactoring

Author: Vasfed

.rubocop.yml

@@ -5,12 +5,32 @@ require:
 
 AllCops:
   NewCops: enable
+  # 2.0 was dropped in rubocop 0.50
+  # TargetRubyVersion: 2.0
   Exclude:
     - gemfiles/*
 
 Rails/RakeEnvironment: { Enabled: false }
 Bundler/OrderedGems: { Enabled: false }
 
+Minitest/MultipleAssertions: { Enabled: false }
+
 # maybe later
 Style/StringLiterals: { Enabled: false }
 Style/Documentation: { Enabled: false }
+
+# we allow older rubies
+Gemspec/RequiredRubyVersion: { Enabled: false }
+
+# rails app is for tests
+Rails/RenderInline: { Enabled: false }
+Rails/ApplicationController: { Enabled: false }
+
+Metrics/BlockLength:
+  Exclude:
+    - spec/*
+
+Metrics/MethodLength: { Max: 25 }
+Metrics/AbcSize: { Enabled: false }
+Metrics/CyclomaticComplexity: { Max: 10 }
+Metrics/PerceivedComplexity: { Max: 10 }

lib/routes_coverage.rb

@@ -84,7 +84,7 @@ def self.perform_report
           put_route.verb == "PUT" # rails 5
         ) &&
           put_route.name.nil? &&
-          @@route_hit_count[put_route] == 0 &&
+          @@route_hit_count[put_route].zero? &&
           all_routes.any? do |patch_route|
             (
               patch_route.verb == /^PATCH$/ ||
@@ -97,21 +97,18 @@ def self.perform_report
       end
     end
 
-    all_result = Result.new(
-      all_routes,
-      @@route_hit_count,
-      settings
-    )
+    all_result = Result.new(all_routes, @@route_hit_count, settings)
 
     groups = settings.groups.map do |group_name, matcher|
       group_routes = all_routes.select do |route|
         if matcher.respond_to?(:call)
           matcher.call(route)
         elsif matcher.is_a?(Hash)
           matcher.all? do |key, value|
-            if key == :path
+            case key
+            when :path
               route.path.spec.to_s =~ value
-            elsif key == :constraints
+            when :constraints
               value.all? do |constraint_name, constraint_value|
                 if constraint_value.present?
                   route.constraints[constraint_name] && route.constraints[constraint_name].match?(constraint_value)
@@ -126,12 +123,7 @@ def self.perform_report
         end
       end
 
-      [group_name,
-       Result.new(
-         group_routes,
-         @@route_hit_count.slice(group_routes),
-         settings
-       )]
+      [group_name, Result.new(group_routes, @@route_hit_count.slice(group_routes), settings)]
     end.to_h
 
     if groups.size > 1
@@ -151,7 +143,7 @@ def self.perform_report
     end
 
     puts
-    puts settings.formatter_class.new(all_result, groups, settings).format
+    puts settings.formatter_class.new(all_result, groups, settings).format # rubocop:disable Rails/Output
   end
 
   def self._touch_route(route)

lib/routes_coverage/formatters/full_text.rb

@@ -6,7 +6,7 @@ class FullText < SummaryText
       class RouteFormatter
         attr_reader :buffer
 
-        def initialize(result = nil, _settings = nil, output_hits = false)
+        def initialize(result = nil, _settings = nil, output_hits: false)
           @buffer = []
           @result = result
           @output_hits = output_hits
@@ -95,7 +95,7 @@ def hit_routes_details
         pending_routes = collect_routes(result.pending_routes)
 
         <<~TXT
-          #{routes_section(RouteFormatter.new(result, settings, true), 'Covered routes:', hit_routes)}
+          #{routes_section(RouteFormatter.new(result, settings, output_hits: true), 'Covered routes:', hit_routes)}
 
           #{routes_section(RouteFormatter.new(result, settings), 'Pending routes:', pending_routes)}
         TXT

lib/routes_coverage/middleware.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RoutesCoverage
   class Middleware
     def initialize(app)

lib/routes_coverage/result.rb

@@ -22,7 +22,7 @@ def collect_all_routes
         def collect_routes(routes)
           routes.collect do |route|
             ActionDispatch::Routing::RouteWrapper.new(route)
-          end.reject(&:internal?).collect do |route|
+          end.reject(&:internal?).collect do |route| # rubocop:disable Style/MultilineBlockChain
             collect_engine_routes(route)
 
             { name: route.name,
@@ -40,7 +40,7 @@ def collect_routes(routes)
       require 'rails/application/route_inspector'
       class Inspector < Rails::Application::RouteInspector
         NEW_RAILS = false
-        def collect_all_routes(routes)
+        def collect_all_routes(routes) # rubocop:disable Lint/DuplicateMethods
           res = collect_routes(routes)
           @engines.each do |engine_name, engine_routes|
             res += engine_routes.map  do |er|
@@ -50,7 +50,7 @@ def collect_all_routes(routes)
           res
         end
 
-        def collect_routes(routes)
+        def collect_routes(routes) # rubocop:disable Lint/DuplicateMethods
           routes = routes.collect do |route|
             route_reqs = route.requirements
 
@@ -96,10 +96,10 @@ def expected_routes
       namespaces_regex = Regexp.union(@settings.exclude_namespaces.map { |n| %r{^/#{n}} })
 
       routes_groups = all_routes.group_by do |r|
-        !!(
+        (
           ("#{r.verb.to_s[8..-3]} #{r.path.spec}".strip =~ filter_regex) ||
           (r.path.spec.to_s =~ namespaces_regex)
-        )
+        ).present?
       end
 
       @excluded_routes = routes_groups[true] || []

routes_coverage.gemspec

@@ -1,5 +1,6 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'routes_coverage/version'
 
@@ -9,20 +10,23 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Vasily Fedoseyev"]
   spec.email         = ["vasilyfedoseyev@gmail.com"]
 
-  spec.summary       = %q{Provides coverage report for your rails routes}
-  spec.description   = %q{Generates coverage report for routes hit by your request/integration/feature tests including capybara ones}
+  spec.summary       = "Provides coverage report for your rails routes"
+  spec.description   = "Generates coverage report for routes hit by your request/integration/feature tests "\
+                       "including capybara ones"
   spec.homepage      = "https://github.com/Vasfed/routes_coverage"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+  spec.required_ruby_version = ">= 2.0"
+
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features|assets|bin|gemfiles)/}) ||
       f.start_with?('.') ||
       %w[Appraisals Gemfile Rakefile].include?(f)
   end
   spec.require_paths = ["lib"]
 
+  spec.add_development_dependency 'appraisal'
   spec.add_development_dependency "bundler", "~> 1.14"
-  spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest"
-  spec.add_development_dependency 'appraisal'
+  spec.add_development_dependency "rake", "~> 10.0"
 end

spec/fixtures/constraints_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 ENV['RAILS_ENV'] = 'test'
 require_relative 'dummy_app'
@@ -11,24 +12,23 @@ def self.matches?(request)
 
 DummyApplication.routes.draw do
   get 'rec', to: 'dummy#index',
-             constraints: -> (request) { request.params[:TYPE] == '1' },
+             constraints: ->(request) { request.params[:TYPE] == '1' },
              as: :route1
   get 'rec', to: 'dummy#update',
-             constraints: -> (request) { request.params[:TYPE] == '2' },
+             constraints: ->(request) { request.params[:TYPE] == '2' },
              as: :route2
   get 'rec/:TYPE', to: 'dummy#current', constraints: CustomConstraintsClass, as: :route3
 end
 
 DummyApplication.config.action_dispatch.show_exceptions = false
 
-RoutesCoverage.configure do|config|
+RoutesCoverage.configure do |config|
   config.format = :full_text
 end
 
-
 class DummyRequestTest < ActionDispatch::IntegrationTest
   def test_coverage_enabled
-    assert_equal RoutesCoverage.enabled?, true
+    assert(RoutesCoverage.enabled?)
   end
 
   def test_patch
@@ -45,6 +45,4 @@ def test_patch
       get '/rec?TYPE=4'
     end
   end
-
-
 end

spec/fixtures/dummy_app.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require 'rails'
 require "action_controller/railtie"
@@ -7,7 +8,7 @@ class DummyApplication < Rails::Application
   config.eager_load = false
   config.secret_token = 'df5394d6c6fa8fdc95cf883df725b8b8' unless Rails.version >= '5'
   config.secret_key_base = 'df5394d6c6fa8fdc95cf883df725b8b6'
-  config.active_support.test_order = :sorted #if config.active_support.respond_to?(:test_order)
+  config.active_support.test_order = :sorted # if config.active_support.respond_to?(:test_order)
 
   config.active_support.deprecation = :stderr
   # config.action_dispatch.show_exceptions = false #raise instead

spec/fixtures/dummy_html.rb

@@ -1,5 +1,6 @@
-require_relative 'dummy_test'
+# frozen_string_literal: true
 
+require_relative 'dummy_test'
 
 RoutesCoverage.configure do |config|
   config.format = :html

spec/fixtures/dummy_routes.rb

@@ -1,18 +1,20 @@
+# frozen_string_literal: true
+
 require_relative 'dummy_app'
 DummyApplication.routes.draw do
-  resources :reqs, only:[:index, :update], controller: :dummy do
+  resources :reqs, only: %i[index update], controller: :dummy do
     post :current, on: :collection
   end
 
   namespace :somespace do
-    resources :foo, only:[:index]
+    resources :foo, only: [:index]
   end
 
   namespace :otherspace do
-    resources :bar, only:[:index]
+    resources :bar, only: [:index]
   end
 
-  resources :subdomain_route, only:[:index], constraints: { subdomain: 'subdomain' }
+  resources :subdomain_route, only: [:index], constraints: { subdomain: 'subdomain' }
 
   get 'r*catch_almost_all_route', to: 'dummy#not_found_error'
 end