From 15303a3415e0b5084b6bc906909d77c253cfea17 Mon Sep 17 00:00:00 2001 From: iMacTia Date: Sat, 2 Mar 2019 16:33:29 +0000 Subject: [PATCH] Fixes Rubocop Style/SingleLineMethods. --- .rubocop_todo.yml | 14 -------------- lib/faraday/adapter.rb | 4 +++- lib/faraday/adapter/em_http.rb | 4 +++- lib/faraday/rack_builder.rb | 8 ++++++-- lib/faraday/utils.rb | 4 +++- spec/support/fake_safe_buffer.rb | 4 +++- test/adapters/em_http_test.rb | 4 +++- test/adapters/em_synchrony_test.rb | 4 +++- test/adapters/rack_test.rb | 4 +++- 9 files changed, 27 insertions(+), 23 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 77f3a0b2..1f04dbd5 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -294,20 +294,6 @@ Style/SafeNavigation: - 'lib/faraday/connection.rb' - 'lib/faraday/options/proxy_options.rb' -# Offense count: 9 -# Cop supports --auto-correct. -# Configuration parameters: AllowIfMethodIsEmpty. -Style/SingleLineMethods: - Exclude: - - 'lib/faraday/adapter.rb' - - 'lib/faraday/adapter/em_http.rb' - - 'lib/faraday/rack_builder.rb' - - 'lib/faraday/utils.rb' - - 'spec/support/fake_safe_buffer.rb' - - 'test/adapters/em_http_test.rb' - - 'test/adapters/em_synchrony_test.rb' - - 'test/adapters/rack_test.rb' - # Offense count: 280 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns. # URISchemes: http, https diff --git a/lib/faraday/adapter.rb b/lib/faraday/adapter.rb index eedf27f7..05d86b05 100644 --- a/lib/faraday/adapter.rb +++ b/lib/faraday/adapter.rb @@ -24,7 +24,9 @@ module Faraday # This module marks an Adapter as supporting parallel requests. module Parallelism attr_writer :supports_parallel - def supports_parallel?() @supports_parallel end + def supports_parallel? + @supports_parallel + end def inherited(subclass) super diff --git a/lib/faraday/adapter/em_http.rb b/lib/faraday/adapter/em_http.rb index e17bc9da..f121ce3b 100644 --- a/lib/faraday/adapter/em_http.rb +++ b/lib/faraday/adapter/em_http.rb @@ -206,7 +206,9 @@ module Faraday end # @return [Boolean] - def running?() @running end + def running? + @running + end def add if running? diff --git a/lib/faraday/rack_builder.rb b/lib/faraday/rack_builder.rb index ce295cbe..7a3c49ca 100644 --- a/lib/faraday/rack_builder.rb +++ b/lib/faraday/rack_builder.rb @@ -36,9 +36,13 @@ module Faraday @args, @block = args, block end - def klass() @@constants[@name] end + def klass + @@constants[@name] + end - def inspect() @name end + def inspect + @name + end def ==(other) if other.is_a? Handler diff --git a/lib/faraday/utils.rb b/lib/faraday/utils.rb index d5ed272f..3899844e 100644 --- a/lib/faraday/utils.rb +++ b/lib/faraday/utils.rb @@ -23,7 +23,9 @@ module Faraday end.tr(' ', '+') end - def unescape(str) CGI.unescape str.to_s end + def unescape(str) + CGI.unescape str.to_s + end DEFAULT_SEP = /[&;] */n diff --git a/spec/support/fake_safe_buffer.rb b/spec/support/fake_safe_buffer.rb index e8a02450..62a56aa5 100644 --- a/spec/support/fake_safe_buffer.rb +++ b/spec/support/fake_safe_buffer.rb @@ -2,7 +2,9 @@ # emulates ActiveSupport::SafeBuffer#gsub FakeSafeBuffer = Struct.new(:string) do - def to_s; self end + def to_s + self + end def gsub(regex) string.gsub(regex) do diff --git a/test/adapters/em_http_test.rb b/test/adapters/em_http_test.rb index 1d9f5d2e..fa0fa030 100644 --- a/test/adapters/em_http_test.rb +++ b/test/adapters/em_http_test.rb @@ -4,7 +4,9 @@ require File.expand_path('integration', __dir__) module Adapters class EMHttpTest < Faraday::TestCase - def adapter() :em_http end + def adapter + :em_http + end Integration.apply(self, :Parallel, :NonStreaming, :ParallelNonStreaming) do # https://github.com/eventmachine/eventmachine/pull/289 diff --git a/test/adapters/em_synchrony_test.rb b/test/adapters/em_synchrony_test.rb index 1a682037..f95351a3 100644 --- a/test/adapters/em_synchrony_test.rb +++ b/test/adapters/em_synchrony_test.rb @@ -4,7 +4,9 @@ require File.expand_path('integration', __dir__) module Adapters class EMSynchronyTest < Faraday::TestCase - def adapter() :em_synchrony end + def adapter + :em_synchrony + end unless jruby? Integration.apply(self, :Parallel, :NonStreaming, :ParallelNonStreaming) do diff --git a/test/adapters/rack_test.rb b/test/adapters/rack_test.rb index a0c1e4ed..149db6db 100644 --- a/test/adapters/rack_test.rb +++ b/test/adapters/rack_test.rb @@ -5,7 +5,9 @@ require File.expand_path('../live_server', __dir__) module Adapters class RackTest < Faraday::TestCase - def adapter() :rack end + def adapter + :rack + end def adapter_options [Faraday::LiveServer]