diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 840fa2fab..219153727 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,6 +1,6 @@ # This configuration was generated by # `rubocop --auto-gen-config` -# on 2019-03-03 20:17:49 +0900 using RuboCop version 0.65.0. +# on 2019-03-04 00:45:24 +0900 using RuboCop version 0.65.0. # The point is for the user to remove these configuration records # one by one as the offenses are removed from the code base. # Note that changes in the inspected code, or installation of new @@ -8,7 +8,7 @@ # Offense count: 40 Metrics/AbcSize: - Max: 86 + Max: 85 # Offense count: 2 # Configuration parameters: CountComments, ExcludedMethods. @@ -19,7 +19,7 @@ Metrics/BlockLength: # Offense count: 5 # Configuration parameters: CountComments. Metrics/ClassLength: - Max: 216 + Max: 213 # Offense count: 19 Metrics/CyclomaticComplexity: @@ -66,17 +66,6 @@ Style/Documentation: - 'lib/faraday/response/raise_error.rb' - 'lib/faraday/utils.rb' -# Offense count: 9 -Style/DoubleNegation: - Exclude: - - 'lib/faraday/adapter/em_http.rb' - - 'lib/faraday/adapter/excon.rb' - - 'lib/faraday/adapter/net_http.rb' - - 'lib/faraday/adapter/test.rb' - - 'lib/faraday/connection.rb' - - 'lib/faraday/options/env.rb' - - 'lib/faraday/response.rb' - # Offense count: 2 # Configuration parameters: AllowedVariables. Style/GlobalVars: diff --git a/lib/faraday/adapter.rb b/lib/faraday/adapter.rb index 4523d8884..aca9ac40f 100644 --- a/lib/faraday/adapter.rb +++ b/lib/faraday/adapter.rb @@ -59,7 +59,7 @@ def save_response(env, status, body, headers = nil, reason_phrase = nil) yield(response_headers) if block_given? end - env.response.finish(env) unless env.parallel? + env.response.finish(env) unless env.parallel_manager env.response end end diff --git a/lib/faraday/adapter/em_http.rb b/lib/faraday/adapter/em_http.rb index 65fab2189..7f915b422 100644 --- a/lib/faraday/adapter/em_http.rb +++ b/lib/faraday/adapter/em_http.rb @@ -101,7 +101,7 @@ def call(env) end def perform_request(env) - if parallel?(env) + if env[:parallel_manager] manager = env[:parallel_manager] manager.add do perform_single_request(env) @@ -183,11 +183,6 @@ def raise_error(msg) raise errklass, msg end - # @return [Boolean] - def parallel?(env) - !!env[:parallel_manager] - end - # This parallel manager is designed to start an EventMachine loop # and block until all registered requests have been completed. class Manager diff --git a/lib/faraday/adapter/excon.rb b/lib/faraday/adapter/excon.rb index 421052bee..b9b6b4dcf 100644 --- a/lib/faraday/adapter/excon.rb +++ b/lib/faraday/adapter/excon.rb @@ -11,7 +11,7 @@ def call(env) opts = {} if env[:url].scheme == 'https' && (ssl = env[:ssl]) - opts[:ssl_verify_peer] = !!ssl.fetch(:verify, true) + opts[:ssl_verify_peer] = !ssl[:verify] opts[:ssl_ca_path] = ssl[:ca_path] if ssl[:ca_path] opts[:ssl_ca_file] = ssl[:ca_file] if ssl[:ca_file] opts[:client_cert] = ssl[:client_cert] if ssl[:client_cert] diff --git a/lib/faraday/adapter/net_http.rb b/lib/faraday/adapter/net_http.rb index ab219e678..8af889825 100644 --- a/lib/faraday/adapter/net_http.rb +++ b/lib/faraday/adapter/net_http.rb @@ -69,7 +69,7 @@ def call(env) def create_request(env) request = Net::HTTPGenericRequest.new \ env[:method].to_s.upcase, # request method - !!env[:body], # is there request body + env[:body].nil?, # is there request body env[:method] != :head, # is there response body env[:url].request_uri, # request uri path env[:request_headers] # request headers diff --git a/lib/faraday/adapter/test.rb b/lib/faraday/adapter/test.rb index e8dfb81d5..830df4ed4 100644 --- a/lib/faraday/adapter/test.rb +++ b/lib/faraday/adapter/test.rb @@ -163,7 +163,8 @@ def matches?(request_host, request_uri, request_headers, request_body) def path_match?(request_path, meta) if path.is_a? Regexp - !!(meta[:match_data] = path.match(request_path)) + meta[:match_data] = path.match(request_path) + meta.key?(:match_data) else path == request_path end diff --git a/lib/faraday/connection.rb b/lib/faraday/connection.rb index fe13034d9..33ae778e7 100644 --- a/lib/faraday/connection.rb +++ b/lib/faraday/connection.rb @@ -81,7 +81,7 @@ def initialize(url = nil, options = nil) @params.update(options.params) if options.params @headers.update(options.headers) if options.headers - @manual_proxy = !!options.proxy + @manual_proxy = options.proxy @proxy = options.proxy ? ProxyOptions.from(options.proxy) : proxy_from_env(url) @temp_proxy = @proxy @@ -352,13 +352,6 @@ def default_parallel_manager end end - # Determine if this Faraday::Connection can make parallel requests. - # - # @return [Boolean] - def in_parallel? - !!@parallel_manager - end - # Sets up the parallel manager to make a set of requests. # # @param manager [Object] The parallel manager that this Connection's Adapter uses. diff --git a/lib/faraday/options/env.rb b/lib/faraday/options/env.rb index f68e9ca8d..494878300 100644 --- a/lib/faraday/options/env.rb +++ b/lib/faraday/options/env.rb @@ -105,7 +105,7 @@ def []=(key, value) end def current_body - !!status ? :response_body : :request_body + status ? :response_body : :request_body end def body @@ -137,11 +137,6 @@ def parse_body? !StatusesWithoutBody.include?(status) end - # @return [Boolean] true if there is a parallel_manager - def parallel? - !!parallel_manager - end - def inspect attrs = [nil] members.each do |mem| diff --git a/lib/faraday/response.rb b/lib/faraday/response.rb index dbe0b3793..cc47b8583 100644 --- a/lib/faraday/response.rb +++ b/lib/faraday/response.rb @@ -51,7 +51,7 @@ def body end def finished? - !!env + env ? true : false end def on_complete diff --git a/spec/support/shared_examples/request_method.rb b/spec/support/shared_examples/request_method.rb index 2e8b3cc4f..f5f7d1287 100644 --- a/spec/support/shared_examples/request_method.rb +++ b/spec/support/shared_examples/request_method.rb @@ -173,12 +173,12 @@ resp1 = conn.public_send(http_method, '/', payload1) resp2 = conn.public_send(http_method, '/', payload2) - expect(conn.in_parallel?).to be_truthy + expect(conn.parallel_manager).to be_truthy expect(resp1.body).to be_nil expect(resp2.body).to be_nil end - expect(conn.in_parallel?).to be_falsey + expect(conn.parallel_manager).to be_falsey expect(resp1&.body).to eq(payload1.to_json) expect(resp2&.body).to eq(payload2.to_json) end diff --git a/test/adapters/integration.rb b/test/adapters/integration.rb index 719549e58..1bfbe200b 100644 --- a/test/adapters/integration.rb +++ b/test/adapters/integration.rb @@ -52,14 +52,14 @@ def test_callback_is_called_in_parallel_with_no_streaming_support connection.in_parallel do resp1, streamed1 = streaming_request(connection, :get, 'stream?a=1') resp2, streamed2 = streaming_request(connection, :get, 'stream?b=2', chunk_size: 16 * 1024) - assert connection.in_parallel? + assert connection.parallel_manager assert_nil resp1.body assert_nil resp2.body assert_equal [], streamed1 assert_equal [], streamed2 end end - assert !connection.in_parallel? + assert !connection.parallel_manager assert_match(/Streaming .+ not yet implemented/, err) opts = { streaming?: false, chunk_size: 16 * 1024 } check_streaming_response(streamed1, opts.merge(prefix: '{"a"=>"1"}'))