Update rubocop

skryukov · skryukov · commit 42e1ce2a5691 · 2022-05-20T22:50:45.000+03:00
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -0,0 +1,23 @@
+name: Lint Ruby
+
+on:
+  push:
+    branches:
+      - master
+
+  pull_request:
+
+jobs:
+  rubocop:
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_GEMFILE: 'gemfiles/rubocop.gemfile'
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.0'
+          bundler-cache: true
+      - name: Lint Ruby code with Rubocop
+        run: bundle exec rubocop
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,23 +1,21 @@
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
+  NewCops: disable
+  SuggestExtensions: false
   Exclude:
     - 'bin/**/*'
-    - 'db/**/*'
-    - 'config/**/*'
-    - 'script/**/*'
+    - 'tmp/**/*'
+    - 'vendor/**/*'
 
-Style/AlignParameters:
+Layout/ArgumentAlignment:
   EnforcedStyle: with_fixed_indentation
 
-Style/CaseIndentation:
-  IndentWhenRelativeTo: end
+Layout/CaseIndentation:
+  EnforcedStyle: end
 
 Style/AsciiComments:
   Enabled: false
 
-Style/IndentHash:
-  Enabled: false
-
 Style/CollectionMethods:
   Enabled: true
   PreferredMethods:
@@ -30,17 +28,13 @@ Style/BlockDelimiters:
   Exclude:
     - spec/**/*_spec.rb
 
-Style/BracesAroundHashParameters:
-  Exclude:
-    - spec/**/*_spec.rb
-
 Style/GuardClause:
   Enabled: false
 
 Style/IfUnlessModifier:
   Enabled: false
 
-Style/SpaceInsideHashLiteralBraces:
+Layout/SpaceInsideHashLiteralBraces:
   Enabled: false
 
 Style/Lambda:
@@ -61,7 +55,10 @@ Metrics/ClassLength:
 Metrics/ModuleLength:
   Enabled: false
 
-Metrics/LineLength:
+Layout/LineLength:
+  Enabled: false
+
+Metrics/BlockLength:
   Enabled: false
 
 Metrics/MethodLength:
@@ -70,13 +67,13 @@ Metrics/MethodLength:
 Style/SingleLineBlockParams:
   Enabled: false
 
-Lint/EndAlignment:
-  AlignWith: variable
+Layout/EndAlignment:
+  EnforcedStyleAlignWith: variable
 
 Style/FormatString:
   Enabled: false
 
-Style/MultilineOperationIndentation:
+Layout/MultilineOperationIndentation:
   EnforcedStyle: indented
 
 Style/WordArray:
@@ -95,6 +92,9 @@ Style/FrozenStringLiteralComment:
 Style/TrivialAccessors:
   AllowPredicates: true
 
-Style/FileName:
+Style/NumericPredicate:
+  Enabled: false
+
+Naming/FileName:
   Exclude:
     - lib/faraday-http-cache.rb
diff --git a/Gemfile b/Gemfile
@@ -12,8 +12,10 @@ elsif ENV['FARADAY_ADAPTER'] == 'em_http'
   gem 'faraday-em_http'
 end
 
+gem 'activesupport',      '>= 5.0'
 gem 'em-http-request',    '~> 1.1'
-gem 'rspec',              '~> 3.1'
 gem 'rake',               '~> 13.0'
-gem 'activesupport',      '>= 5.0'
+gem 'rspec',              '~> 3.1'
 gem 'sinatra',            '~> 2.0'
+
+eval_gemfile 'gemfiles/rubocop.gemfile'
diff --git a/Rakefile b/Rakefile
diff --git a/examples/github.rb b/examples/github.rb
@@ -5,7 +5,7 @@
 require 'active_support/logger'
 
 client = Faraday.new('https://api.github.com') do |stack|
-  stack.use :http_cache, logger: ActiveSupport::Logger.new(STDOUT)
+  stack.use :http_cache, logger: ActiveSupport::Logger.new($stdout)
   stack.adapter Faraday.default_adapter
 end
 
diff --git a/examples/parallel.rb b/examples/parallel.rb
@@ -6,7 +6,7 @@
 require 'em-http-request'
 
 client = Faraday.new('https://api.github.com') do |stack|
-  stack.use :http_cache, logger: ActiveSupport::Logger.new(STDOUT)
+  stack.use :http_cache, logger: ActiveSupport::Logger.new($stdout)
   stack.adapter :em_http
 end
 
diff --git a/faraday-http-cache.gemspec b/faraday-http-cache.gemspec
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Gem::Specification.new do |gem|
   gem.name          = 'faraday-http-cache'
   gem.version       = '2.2.0'
@@ -14,6 +15,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.executables   = []
 
-  gem.required_ruby_version = '>= 2.4.0'
+  gem.required_ruby_version = '>= 2.1.0' # rubocop:disable Gemspec/RequiredRubyVersion
   gem.add_dependency 'faraday', '>= 0.8'
 end
diff --git a/gemfiles/rubocop.gemfile b/gemfiles/rubocop.gemfile
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gem 'rubocop', '~> 1.12.0'
diff --git a/lib/faraday/http_cache.rb b/lib/faraday/http_cache.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'faraday'
 
 require 'faraday/http_cache/storage'
@@ -44,7 +45,7 @@ module Faraday
   #     builder.use :http_cache, store: Rails.cache, instrumenter: ActiveSupport::Notifications
   #   end
   class HttpCache < Faraday::Middleware
-    UNSAFE_METHODS = [:post, :put, :delete, :patch].freeze
+    UNSAFE_METHODS = %i[post put delete patch].freeze
 
     ERROR_STATUSES = (400..499).freeze
 
@@ -71,7 +72,7 @@ class HttpCache < Faraday::Middleware
       :uncacheable,
 
       # The request was cached but need to be revalidated by the server.
-      :must_revalidate,
+      :must_revalidate
     ].freeze
 
     # Public: Initializes a new HttpCache middleware.
@@ -263,7 +264,7 @@ def store(response)
     end
 
     def delete(request, response)
-      headers = %w(Location Content-Location)
+      headers = %w[Location Content-Location]
       headers.each do |header|
         url = response.headers[header]
         @storage.delete(url) if url
diff --git a/lib/faraday/http_cache/cache_control.rb b/lib/faraday/http_cache/cache_control.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Faraday
   class HttpCache < Faraday::Middleware
     # Internal: A class to represent the 'Cache-Control' header options.
diff --git a/lib/faraday/http_cache/request.rb b/lib/faraday/http_cache/request.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Faraday
   class HttpCache < Faraday::Middleware
     # Internal: A class to represent a request
@@ -24,6 +25,7 @@ def initialize(method:, url:, headers:)
       def cacheable?
         return false if method != :get && method != :head
         return false if cache_control.no_store?
+
         true
       end
 
diff --git a/lib/faraday/http_cache/response.rb b/lib/faraday/http_cache/response.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'time'
 require 'faraday/http_cache/cache_control'
 
@@ -204,7 +205,7 @@ def wrap_headers!
       # Returns nothing.
       def ensure_date_header!
         date
-      rescue
+      rescue StandardError
         headers['Date'] = @now.httpdate
       end
 
diff --git a/lib/faraday/http_cache/storage.rb b/lib/faraday/http_cache/storage.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'json'
 require 'digest/sha1'
 
@@ -167,7 +168,7 @@ def assert_valid_store!
       end
 
       def warn(message)
-        @logger.warn(message) if @logger
+        @logger.warn(message) if @logger # rubocop:disable Style/SafeNavigation
       end
     end
 
diff --git a/spec/binary_spec.rb b/spec/binary_spec.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Faraday::HttpCache do
@@ -10,7 +11,7 @@
       stack.adapter adapter.to_sym
     end
   end
-  let(:data) { IO.binread File.expand_path('../support/empty.png', __FILE__) }
+  let(:data) { IO.binread File.expand_path('support/empty.png', __dir__) }
 
   it 'works fine with binary data' do
     expect(client.get('image').body).to eq data
diff --git a/spec/cache_control_spec.rb b/spec/cache_control_spec.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Faraday::HttpCache::CacheControl do
diff --git a/spec/http_cache_spec.rb b/spec/http_cache_spec.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Faraday::HttpCache do
@@ -36,7 +37,7 @@
 
   it 'adds a trace of the actions performed to the env' do
     response = client.post('post')
-    expect(response.env[:http_cache_trace]).to eq([:unacceptable, :delete])
+    expect(response.env[:http_cache_trace]).to eq(%i[unacceptable delete])
   end
 
   describe 'cache invalidation' do
diff --git a/spec/instrumentation_spec.rb b/spec/instrumentation_spec.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 require 'active_support'
 require 'active_support/notifications'
diff --git a/spec/json_spec.rb b/spec/json_spec.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Faraday::HttpCache do
diff --git a/spec/request_spec.rb b/spec/request_spec.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Faraday::HttpCache::Request do
diff --git a/spec/response_spec.rb b/spec/response_spec.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Faraday::HttpCache::Response do
@@ -228,11 +229,11 @@
   describe 'remove age before caching and normalize max-age if non-zero age present' do
     it 'is fresh if the response still has some time to live' do
       headers = {
-          'Age' => 6,
-          'Cache-Control' => 'public, max-age=40',
-          'Date' => (Time.now - 38).httpdate,
-          'Expires' => (Time.now - 37).httpdate,
-          'Last-Modified' => (Time.now - 300).httpdate
+        'Age' => 6,
+        'Cache-Control' => 'public, max-age=40',
+        'Date' => (Time.now - 38).httpdate,
+        'Expires' => (Time.now - 37).httpdate,
+        'Last-Modified' => (Time.now - 300).httpdate
       }
       response = Faraday::HttpCache::Response.new(response_headers: headers)
       expect(response).to be_fresh
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'uri'
 require 'socket'
 
diff --git a/spec/storage_spec.rb b/spec/storage_spec.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Faraday::HttpCache::Storage do
@@ -111,11 +112,11 @@
   describe 'remove age before caching and normalize max-age if non-zero age present' do
     it 'is fresh if the response still has some time to live' do
       headers = {
-          'Age' => 6,
-          'Cache-Control' => 'public, max-age=40',
-          'Date' => (Time.now - 38).httpdate,
-          'Expires' => (Time.now - 37).httpdate,
-          'Last-Modified' => (Time.now - 300).httpdate
+        'Age' => 6,
+        'Cache-Control' => 'public, max-age=40',
+        'Date' => (Time.now - 38).httpdate,
+        'Expires' => (Time.now - 37).httpdate,
+        'Last-Modified' => (Time.now - 300).httpdate
       }
       response = Faraday::HttpCache::Response.new(response_headers: headers)
       expect(response).to be_fresh
diff --git a/spec/support/test_app.rb b/spec/support/test_app.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'sinatra/base'
 require 'json'
 
@@ -27,7 +28,7 @@ class TestApp < Sinatra::Base
   end
 
   get '/image' do
-    image = File.expand_path('../empty.png', __FILE__)
+    image = File.expand_path('empty.png', __dir__)
     data  = IO.binread(image)
     [200, { 'Cache-Control' => 'max-age=400', 'Content-Type' => 'image/png' }, data]
   end
diff --git a/spec/support/test_server.rb b/spec/support/test_server.rb
diff --git a/spec/validation_spec.rb b/spec/validation_spec.rb

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`# frozen_string_literal: true`
	`2`	`+`
`2`	`3`	`module Faraday`
`3`	`4`	`class HttpCache < Faraday::Middleware`
`4`	`5`	`# Internal: A class to represent the 'Cache-Control' header options.`