rest-client 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 164c2c41b4ec9185047a9c54005a4cda0d0b00a1
-  data.tar.gz: 0609bc767927170a96d36f44d01068333764a7f8
+  metadata.gz: 10312217af6f5a0312bdce748c8fd82f428fce64
+  data.tar.gz: 67846732a7926b335a7082eb1fba0b7178f0c5c4
 SHA512:
-  metadata.gz: 134a846db71895039df52e3b65709767f8234df3414f53665228944432f2b5b39eeb5399f1baed1baf47fcd16d031ac5dbb442140e9381175c6c6192170848b8
-  data.tar.gz: 69cedd07d3fc17d5e983fd264ef38517ea8233fa0f5c9de3f1ffc06f33b2b4902f07d673eb26f6aaca2fe29e3e474f5555f3dec5efb04330df7f4ceadc7316fa
+  metadata.gz: 56d9d3140ee5418e9b4e877e9756bbb1a1858314c4487b5d7e41ca5fc72f70532f764dcf480c8c3098f4297025fa66c7d8db0bd890e9ae46459e7478a34a685a
+  data.tar.gz: 812f11c8a6c2c4ac5ec68852e75f64ae2d7416ae4683f5ff6525055dbf8e472baed3cc01a85eb76e5da2cb39233ff2dc2129cbdab7165dec89637987b346359b

data/.travis.yml

@@ -17,6 +17,8 @@ rvm:
   - "jruby-9.1.5.0"
   - "jruby-head"
 
+cache: bundler
+
 script:
   bundle exec rake test
 
@@ -44,10 +46,3 @@ matrix:
   fast_finish: true
 
 sudo: false
-
-
-# Use Java 8 for jruby to fix some Java 7 bugs.
-addons:
-  apt:
-    packages:
-      - oracle-java8-set-default

data/README.md

@@ -762,13 +762,12 @@ Need caching, more advanced logging or any ability provided by Rack middleware?
 Have a look at rest-client-components: http://github.com/crohr/rest-client-components
 
 ## Credits
-
-|||
-|---------------------|---------------------------------------------------------|
-| REST Client Team    | Andy Brody                                              |
-| Creator             | Adam Wiggins                                            |
-| Maintainers Emeriti | Lawrence Leonard Gilbert, Matthew Manning, Julien Kirch |
-| Major contributions | Blake Mizerany, Julien Kirch                            |
+| | |
+|-------------------------|---------------------------------------------------------|
+| **REST Client Team**    | Andy Brody                                              |
+| **Creator**             | Adam Wiggins                                            |
+| **Maintainers Emeriti** | Lawrence Leonard Gilbert, Matthew Manning, Julien Kirch |
+| **Major contributions** | Blake Mizerany, Julien Kirch                            |
 
 A great many generous folks have contributed features and patches.
 See AUTHORS for the full list.

data/history.md

@@ -1,3 +1,8 @@
+# 2.0.2
+
+- Suppress the header override warning introduced in 2.0.1 if the value is the
+  same. There's no conflict if the value is unchanged. (#578)
+
 # 2.0.1
 
 - Warn if auto-generated headers from the payload, such as Content-Type,

data/lib/restclient/request.rb

@@ -373,7 +373,7 @@ module RestClient
         # x-www-form-urlencoded but a Content-Type application/json was
         # also supplied by the user.
         payload_headers.each_pair do |key, val|
-          if headers.include?(key)
+          if headers.include?(key) && headers[key] != val
             warn("warning: Overriding #{key.inspect} header " +
                  "#{headers.fetch(key).inspect} with #{val.inspect} " +
                  "due to payload")

data/lib/restclient/version.rb

@@ -1,5 +1,5 @@
 module RestClient
-  VERSION_INFO = [2, 0, 1] unless defined?(self::VERSION_INFO)
+  VERSION_INFO = [2, 0, 2] unless defined?(self::VERSION_INFO)
   VERSION = VERSION_INFO.map(&:to_s).join('.') unless defined?(self::VERSION)
 
   def self.version

data/spec/integration/httpbin_spec.rb

@@ -13,7 +13,8 @@ describe RestClient::Request do
   def default_httpbin_url
     # add a hack to work around java/jruby bug
     # java.lang.RuntimeException: Could not generate DH keypair with backtrace
-    if ['jruby-19mode', 'jruby-9.0.5.0'].include?(ENV['TRAVIS_RUBY_VERSION'])
+    # Also (2017-04-09) Travis Jruby versions have a broken CA keystore
+    if ENV['TRAVIS_RUBY_VERSION'] =~ /\Ajruby-/
       'http://httpbin.org/'
     else
       'https://httpbin.org/'

data/spec/unit/request_spec.rb

@@ -280,6 +280,13 @@ describe RestClient::Request, :include_helpers do
     }).to match(/warning: Overriding "Content-Length" header/i)
   end
 
+  it "does not warn when overriding user header with header derived from payload if those header values were identical" do
+    expect(fake_stderr {
+      RestClient::Request.new(method: :post, url: 'example.com',
+                              payload: {'foo' => '123456'}, headers: { 'Content-Type' => 'application/x-www-form-urlencoded' })
+    }).not_to match(/warning: Overriding "Content-Type" header/i)
+  end
+
   it 'does not warn for a normal looking payload' do
     expect(fake_stderr {
       RestClient::Request.new(method: :post, url: 'example.com', payload: 'payload')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-client
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - REST Client Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-19 00:00:00.000000000 Z
+date: 2017-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
@@ -244,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Simple HTTP and REST client for Ruby, inspired by microframework syntax for