Adds editorconfig

This commit is contained in:
Harman Singh 2018-10-08 17:14:44 +05:30
parent 9ff17bc6ad
commit 57a6bd6e1d
14 changed files with 87 additions and 48 deletions

18
.editorconfig Normal file
View File

@ -0,0 +1,18 @@
; This file is for unifying the coding style for different editors and IDEs.
; More information at http://EditorConfig.org
root = true
[*]
end_of_line = lf
trim_trailing_whitespace = true
[**.rb]
indent_size = 2
indent_style = spaces
insert_final_newline = true
[**.xml]
trim_trailing_whitespace = false
[**.html]
trim_trailing_whitespace = false

View File

@ -593,7 +593,8 @@ module HTTParty
def validate_format
if format && parser.respond_to?(:supports_format?) && !parser.supports_format?(format)
raise UnsupportedFormat, "'#{format.inspect}' Must be one of: #{parser.supported_formats.map(&:to_s).sort.join(', ')}"
supported_format_names = parser.supported_formats.map(&:to_s).sort.join(', ')
raise UnsupportedFormat, "'#{format.inspect}' Must be one of: #{supported_format_names}"
end
end
end

View File

@ -91,7 +91,14 @@ module HTTParty
host = clean_host(uri.host)
port = uri.port || (uri.scheme == 'https' ? 443 : 80)
if options.key?(:http_proxyaddr)
http = Net::HTTP.new(host, port, options[:http_proxyaddr], options[:http_proxyport], options[:http_proxyuser], options[:http_proxypass])
http = Net::HTTP.new(
host,
port,
options[:http_proxyaddr],
options[:http_proxyport],
options[:http_proxyuser],
options[:http_proxypass]
)
else
http = Net::HTTP.new(host, port)
end

View File

@ -39,7 +39,9 @@ module HTTParty
if value.empty?
normalized_keys << ["#{key}[]", '']
else
normalized_keys = value.to_ary.flat_map { |element| normalize_keys("#{key}[]", element) }
normalized_keys = value.to_ary.flat_map do |element|
normalize_keys("#{key}[]", element)
end
end
elsif value.respond_to?(:to_hash)
stack << [key, value.to_hash]
@ -52,7 +54,9 @@ module HTTParty
if child_value.respond_to?(:to_hash)
stack << ["#{parent}[#{child_key}]", child_value.to_hash]
elsif child_value.respond_to?(:to_ary)
child_value.to_ary.each { |v| normalized_keys << normalize_keys("#{parent}[#{child_key}][]", v).flatten }
child_value.to_ary.each do |v|
normalized_keys << normalize_keys("#{parent}[#{child_key}][]", v).flatten
end
else
normalized_keys << normalize_keys("#{parent}[#{child_key}]", child_value).flatten
end

View File

@ -9,12 +9,12 @@ module HTTParty
duplicate = hash.dup
duplicate.each_pair do |key, value|
duplicate[key] = if value.is_a?(Hash)
hash_deep_dup(value)
if value.is_a?(Hash)
duplicate[key] = hash_deep_dup(value)
elsif value.is_a?(Proc)
duplicate[key] = value.dup
else
value
duplicate[key] = value
end
end

View File

@ -64,7 +64,8 @@ module Net
def parse(response_header)
header = response_header['www-authenticate']
.gsub(/qop=(auth(?:-int)?)/, 'qop="\\1"')
header = header.gsub(/qop=(auth(?:-int)?)/, 'qop="\\1"')
header =~ /Digest (.*)/
params = {}

View File

@ -14,7 +14,11 @@ module HTTParty
@headers = Headers.new(response.to_hash)
if request.options[:logger]
logger = ::HTTParty::Logger.build(request.options[:logger], request.options[:log_level], request.options[:log_format])
logger = ::HTTParty::Logger.build(
request.options[:logger],
request.options[:log_level],
request.options[:log_format]
)
logger.format(request, self)
end

View File

@ -312,8 +312,12 @@ RSpec.describe HTTParty::ConnectionAdapter do
context 'as well as proxy user and password' do
let(:options) do
{http_proxyaddr: '1.2.3.4', http_proxyport: 8080,
http_proxyuser: 'user', http_proxypass: 'pass'}
{
http_proxyaddr: '1.2.3.4',
http_proxyport: 8080,
http_proxyuser: 'user',
http_proxypass: 'pass'
}
end
describe '#proxy_user' do