From bbd965263c7895d0f017db9fd4aff92f0f51215e Mon Sep 17 00:00:00 2001 From: Paul Makepeace Date: Wed, 24 Aug 2016 22:24:49 -0700 Subject: [PATCH 1/3] remove redundant accept-encoding:gzip header rest-client already sets this (and deflate). --- lib/unirest.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/unirest.rb b/lib/unirest.rb index ce5e8e2..d6ac7df 100644 --- a/lib/unirest.rb +++ b/lib/unirest.rb @@ -51,7 +51,6 @@ def self.request(method, url, headers, body, auth, timeout, &callback) def self.internal_request(http_request, timeout) # Set the user agent http_request.add_header("user-agent", Unirest.user_agent) - http_request.add_header("accept-encoding", "gzip") http_response = nil @@ -119,4 +118,4 @@ def self.patch(url, headers: {}, parameters: nil, auth:nil, &callback) HttpClient.request(:patch, url, headers.merge(@@default_headers), parameters, auth, @@timeout, &callback) end -end \ No newline at end of file +end From 523972e06314d4b3ba5e9714afdcb05f7eeeed75 Mon Sep 17 00:00:00 2001 From: Paul Makepeace Date: Wed, 24 Aug 2016 22:25:39 -0700 Subject: [PATCH 2/3] drop use of obsolete URI.regexp disambiguate gsub too --- lib/unirest/http_request.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/unirest/http_request.rb b/lib/unirest/http_request.rb index e217e44..3e2acac 100644 --- a/lib/unirest/http_request.rb +++ b/lib/unirest/http_request.rb @@ -57,11 +57,13 @@ def initialize(method, url, headers = {}, body = nil, auth = nil) @body = body end - unless url =~ URI.regexp + begin + Addressable::URI.parse url + rescue Addressable::URI::InvalidURIError raise "Invalid URL: #{url}" end - @url = url.gsub /\s+/, '%20' + @url = url.gsub(/\s+/, '%20') @headers = {} From 5271d4724cf721859d70b6a626ef282def911c27 Mon Sep 17 00:00:00 2001 From: Paul Makepeace Date: Wed, 24 Aug 2016 22:26:08 -0700 Subject: [PATCH 3/3] remove pinning on minor gem version --- unirest.gemspec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/unirest.gemspec b/unirest.gemspec index 974206e..569cc67 100644 --- a/unirest.gemspec +++ b/unirest.gemspec @@ -8,11 +8,11 @@ Gem::Specification.new do |s| s.homepage = 'https://github.com/Mashape/unirest-ruby' s.license = 'MIT' - s.add_dependency('rest-client', '~> 1.8.0') - s.add_dependency('json', '~> 1.8.1') - s.add_dependency('addressable', '~> 2.3.5') + s.add_dependency('rest-client', '~> 1.8') + s.add_dependency('json', '~> 1.8') + s.add_dependency('addressable', '~> 2.3') - s.add_development_dependency('shoulda', '~> 3.5.0') + s.add_development_dependency('shoulda', '~> 3.5') s.add_development_dependency('test-unit') s.add_development_dependency('rake')