httparty 0.15.5 → 0.15.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3abfd0d8679e4054bc591215e90d767d5024cbf6
-  data.tar.gz: 38fa4872a3e9cef824a947443b5d7eb3bb04a709
+  metadata.gz: e1263475e1be2f8d5150af07865061bc509a4bcc
+  data.tar.gz: d531b6ddb71d9f04945f4136f519743e4f04e7d2
 SHA512:
-  metadata.gz: b398852558384d98d88f73c750e9e41ec93ae631b7f7de00f382d11087b70eae9ccf620a3cd99513f8b926caa97af5f7f3d6ec319b984c004759fad2a3cd22fe
-  data.tar.gz: bb01e3e75b9cf968aa6196843e66366679b0242833a89e488e6d589f67083cd4fde486bfeef56fd32386da214107e8dc9e10b3d482f8dca0496257e9b5e388ca
+  metadata.gz: 07f2e819d9dd8892682d445dcd0f24e4b90f5d7f3bdbd763ffcb00da32602a5caf4b4da7b8b41df291500a7a0e67fac8bf8169b8cc37c398dbab93fff3da7957
+  data.tar.gz: ea815b4c8982649e4927d3a83ab82faeb7bea6be4a5e8d459072c5fa5b7db55506f705eacf6bda1d32b3a7892c65a059da72e29fbb0e233e882f9734165cbb51

data/.gitignore

@@ -9,3 +9,4 @@ pkg/
 /.bundle
 .rvmrc
 coverage
+*.gem

data/.travis.yml

@@ -4,5 +4,6 @@ rvm:
   - 2.1.8
   - 2.2.4
   - 2.3.0
+  - 2.4.1
 bundler_args: --without development
 before_install: gem install bundler

data/Gemfile

@@ -2,7 +2,6 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'rake'
-gem 'fakeweb',  '~> 1.3'
 gem 'mongrel',  '1.2.0.pre2'
 
 group :development do
@@ -16,4 +15,5 @@ group :test do
   gem 'simplecov', require: false
   gem 'aruba'
   gem 'cucumber', '~> 2.3'
+  gem 'webmock'
 end

data/docs/README.md

@@ -24,11 +24,10 @@ You can use this guide to work with SSL certificates.
 # Use this example if you are using a pem file
 
 class Client
-	include HTTParty
-	
-	base_uri "https://example.com"
-	pem File.read("#{File.expand_path('.')}/path/to/certs/cert.pem"), "123456"
+  include HTTParty
 
+  base_uri "https://example.com"
+  pem File.read("#{File.expand_path('.')}/path/to/certs/cert.pem"), "123456"
 end
 ```
 
@@ -38,11 +37,10 @@ end
 # Use this example if you are using a pkcs12 file
 
 class Client
-	include HTTParty
-	
-	base_uri "https://example.com"
-	pkcs12 File.read("#{File.expand_path('.')}/path/to/certs/cert.p12"), "123456"
+  include HTTParty
 
+  base_uri "https://example.com"
+  pkcs12 File.read("#{File.expand_path('.')}/path/to/certs/cert.p12"), "123456"
 end
 ```
 
@@ -52,11 +50,10 @@ end
 # Use this example if you are using a pkcs12 file
 
 class Client
-	include HTTParty
-	
-	base_uri "https://example.com"
-	ssl_ca_file "#{File.expand_path('.')}/path/to/certs/cert.pem"
+  include HTTParty
 
+  base_uri "https://example.com"
+  ssl_ca_file "#{File.expand_path('.')}/path/to/certs/cert.pem"
 end
 ```
 
@@ -66,10 +63,10 @@ end
 # Use this example if you are using a pkcs12 file
 
 class Client
-	include HTTParty
-	
-	base_uri "https://example.com"
- 	ssl_ca_path '/path/to/certs'
+  include HTTParty
+
+  base_uri "https://example.com"
+  ssl_ca_path '/path/to/certs'
 end
 ```
 
@@ -77,13 +74,13 @@ You can also include this options with the call:
 
 ```ruby
 class Client
-	include HTTParty
-	
-	base_uri "https://example.com"
-	
-	def	self.fetch
-		get("/resources", pem: (File.read("#{File.expand_path('.')}/path/to/certs/cert.pem"), "123456")
-	end
+  include HTTParty
+
+  base_uri "https://example.com"
+
+  def self.fetch
+    get("/resources", pem: (File.read("#{File.expand_path('.')}/path/to/certs/cert.pem"), "123456")
+  end
 end
 ```
 
@@ -92,18 +89,18 @@ end
 In some cases you may want to skip SSL verification, because the entity that issue the certificate is not a valid one, but you still want to work with it. You can achieve this through:
 
 ```ruby
-#Skips SSL certificate verification
+# Skips SSL certificate verification
 
 class Client
-	include HTTParty
-
-	base_uri "https://example.com"
-	pem File.read("#{File.expand_path('.')}/path/to/certs/cert.pem"), "123456"
-	
-	def	self.fetch
-		get("/resources", verify: false)
-		# You can also use something like:
-		# get("resources", verify_peer: false)
-	end
+  include HTTParty
+
+  base_uri "https://example.com"
+  pem File.read("#{File.expand_path('.')}/path/to/certs/cert.pem"), "123456"
+
+  def self.fetch
+    get("/resources", verify: false)
+    # You can also use something like:
+    # get("resources", verify_peer: false)
+  end
 end
 ```

data/lib/httparty/exceptions.rb

@@ -20,6 +20,7 @@ module HTTParty
     # @param [Net::HTTPResponse]
     def initialize(response)
       @response = response
+      super(response)
     end
   end
 

data/lib/httparty/request.rb

@@ -276,11 +276,10 @@ module HTTParty
     end
 
     def encode_with_ruby_encoding(body, charset)
-      if !body.nil? && Encoding.name_list.include?(charset)
-        body.force_encoding(charset)
-      else
-        body
-      end
+      encoding = Encoding.find(charset)
+      body.force_encoding(charset)
+    rescue ArgumentError
+      body
     end
 
     def assume_utf16_is_big_endian

data/lib/httparty/version.rb

@@ -1,3 +1,3 @@
 module HTTParty
-  VERSION = "0.15.5"
+  VERSION = "0.15.6"
 end

data/spec/httparty/request_spec.rb

@@ -157,46 +157,49 @@ RSpec.describe HTTParty::Request do
       expect(@request.instance_variable_get(:@raw_request)['authorization']).not_to be_nil
     end
 
-    context 'digest_auth' do 
-      before do 
+    context 'digest_auth' do
+      before do
         response_sequence = [
-          {status: ['401', 'Unauthorized' ], 
-            www_authenticate: 'Digest realm="Log Viewer", qop="auth", nonce="2CA0EC6B0E126C4800E56BA0C0003D3C", opaque="5ccc069c403ebaf9f0171e9517f40e41", stale=false',
-            set_cookie: 'custom-cookie=1234567', 
+          {
+            status: ['401', 'Unauthorized' ], headers: {
+              www_authenticate: 'Digest realm="Log Viewer", qop="auth", nonce="2CA0EC6B0E126C4800E56BA0C0003D3C", opaque="5ccc069c403ebaf9f0171e9517f40e41", stale=false',
+              set_cookie: 'custom-cookie=1234567'
+            }
           },
-          {status: ['200', 'OK']}
-        ]      
-        FakeWeb.register_uri(:get, "http://api.foo.com/v1",
-                            response_sequence)
-      end 
+          { status: ['200', 'OK'] }
+        ]
+        stub_request(:get, 'http://api.foo.com/v1').to_return(response_sequence)
+      end
 
       it 'should not send credentials more than once' do
         response_sequence = [
-          {status: ['401', 'Unauthorized' ], 
-            www_authenticate: 'Digest realm="Log Viewer", qop="auth", nonce="2CA0EC6B0E126C4800E56BA0C0003D3C", opaque="5ccc069c403ebaf9f0171e9517f40e41", stale=false',
-            set_cookie: 'custom-cookie=1234567', 
+          {
+            status: ['401', 'Unauthorized' ], headers: {
+              www_authenticate: 'Digest realm="Log Viewer", qop="auth", nonce="2CA0EC6B0E126C4800E56BA0C0003D3C", opaque="5ccc069c403ebaf9f0171e9517f40e41", stale=false',
+              set_cookie: 'custom-cookie=1234567'
+            }
           },
-          {status: ['401', 'Unauthorized' ], 
-            www_authenticate: 'Digest realm="Log Viewer", qop="auth", nonce="2CA0EC6B0E126C4800E56BA0C0003D3C", opaque="5ccc069c403ebaf9f0171e9517f40e41", stale=false',
-            set_cookie: 'custom-cookie=1234567', 
-          },      
-          {status: ['404', 'Not found']}
-        ]      
-        FakeWeb.register_uri(:get, "http://api.foo.com/v1",
-                            response_sequence)
-
-        @request.options[:digest_auth] = {username: 'foobar', password: 'secret'}        
+          {
+            status: ['401', 'Unauthorized' ], headers: {
+              www_authenticate: 'Digest realm="Log Viewer", qop="auth", nonce="2CA0EC6B0E126C4800E56BA0C0003D3C", opaque="5ccc069c403ebaf9f0171e9517f40e41", stale=false',
+              set_cookie: 'custom-cookie=1234567'
+            }
+          },
+          { status: ['404', 'Not found'] }
+        ]
+        stub_request(:get, 'http://api.foo.com/v1').to_return(response_sequence)
+
+        @request.options[:digest_auth] = {username: 'foobar', password: 'secret'}
         response = @request.perform { |v| }
         expect(response.code).to eq(401)
 
         raw_request = @request.instance_variable_get(:@raw_request)
-        expect(raw_request['Authorization']).not_to be_nil                    
-      end 
+        expect(raw_request['Authorization']).not_to be_nil
+      end
 
       it 'should not be used when configured and the response is 200' do
-        FakeWeb.register_uri(:get, "http://api.foo.com/v1",
-          status: 200)
-        @request.options[:digest_auth] = {username: 'foobar', password: 'secret'}        
+        stub_request(:get, 'http://api.foo.com/v1').to_return(status: 200)
+        @request.options[:digest_auth] = {username: 'foobar', password: 'secret'}
         response = @request.perform { |v| }
         expect(response.code).to eq(200)
 
@@ -206,7 +209,7 @@ RSpec.describe HTTParty::Request do
       end
 
       it "should be used when configured and the response is 401" do
-        @request.options[:digest_auth] = {username: 'foobar', password: 'secret'}        
+        @request.options[:digest_auth] = {username: 'foobar', password: 'secret'}
         response = @request.perform { |v| }
         expect(response.code).to eq(200)
 
@@ -215,16 +218,16 @@ RSpec.describe HTTParty::Request do
       end
 
       it 'should maintain cookies returned from a 401 response' do
-        @request.options[:digest_auth] = {username: 'foobar', password: 'secret'}        
+        @request.options[:digest_auth] = {username: 'foobar', password: 'secret'}
         response = @request.perform {|v|}
         expect(response.code).to eq(200)
-        
+
         raw_request = @request.instance_variable_get(:@raw_request)
         expect(raw_request.get_fields('cookie')).to eql ["custom-cookie=1234567"]
       end
 
       it 'should merge cookies from request and a 401 response' do
-        
+
         @request.options[:digest_auth] = {username: 'foobar', password: 'secret'}
         @request.options[:headers] = {'cookie' => 'request-cookie=test'}
         response = @request.perform {|v|}
@@ -243,7 +246,7 @@ RSpec.describe HTTParty::Request do
     end
 
     it 'should normalize base uri when specified as request option' do
-      FakeWeb.register_uri(:get, 'http://foo.com/resource', :body => 'Bar')
+      stub_request(:get, 'http://foo.com/resource').to_return(body: 'Bar')
       response = HTTParty.get('/resource', {
         base_uri: 'foo.com'
       })
@@ -462,7 +465,7 @@ RSpec.describe HTTParty::Request do
       }
 
       it "should process charset in content type properly" do
-        response = stub_response "Content"
+        response = stub_response "Content".force_encoding('ascii-8bit')
         response.initialize_http_header("Content-Type" => "text/plain;charset = utf-8")
         resp = @request.perform
         expect(response_charset).to_not be_empty
@@ -470,7 +473,7 @@ RSpec.describe HTTParty::Request do
       end
 
       it "should process charset in content type properly if it has a different case" do
-        response = stub_response "Content"
+        response = stub_response "Content".force_encoding('ascii-8bit')
         response.initialize_http_header("Content-Type" => "text/plain;CHARSET = utf-8")
         resp = @request.perform
         expect(response_charset).to_not be_empty
@@ -478,7 +481,7 @@ RSpec.describe HTTParty::Request do
       end
 
       it "should process quoted charset in content type properly" do
-        response = stub_response "Content"
+        response = stub_response "Content".force_encoding('ascii-8bit')
         response.initialize_http_header("Content-Type" => "text/plain;charset = \"utf-8\"")
         resp = @request.perform
         expect(response_charset).to_not be_empty
@@ -526,7 +529,7 @@ RSpec.describe HTTParty::Request do
         response = stub_response "Content"
         response.initialize_http_header("Content-Type" => "text/plain;charset = utf-lols")
         resp = @request.perform
-        expect(response_charset).to_not be_empty        
+        expect(response_charset).to_not be_empty
         # This encoding does not exist, thus the string should not be encodd with it
         expect(resp.body.encoding).to_not eq(response_charset)
         expect(resp.body).to eq("Content")
@@ -568,8 +571,13 @@ RSpec.describe HTTParty::Request do
 
         it "calls block given to perform with each redirect" do
           @request = HTTParty::Request.new(Net::HTTP::Get, 'http://test.com/redirect', format: :xml)
-          FakeWeb.register_uri(:get, "http://test.com/redirect", status: [300, "REDIRECT"], location: "http://api.foo.com/v2")
-          FakeWeb.register_uri(:get, "http://api.foo.com/v2", body: "<hash><foo>bar</foo></hash>")
+          stub_request(:get, 'http://test.com/redirect')
+            .to_return(
+              status: [300, 'REDIRECT'],
+              headers: { location: 'http://api.foo.com/v2' }
+            )
+          stub_request(:get, 'http://api.foo.com/v2')
+            .to_return(body: '<hash><foo>bar</foo></hash>')
           body = ""
           response = @request.perform { |chunk| body += chunk }
           expect(body.length).to eq(27)
@@ -590,9 +598,18 @@ RSpec.describe HTTParty::Request do
 
         it "handles multiple redirects and relative location headers on different hosts" do
           @request = HTTParty::Request.new(Net::HTTP::Get, 'http://test.com/redirect', format: :xml)
-          FakeWeb.register_uri(:get, "http://test.com/redirect", status: [300, "REDIRECT"], location: "http://api.foo.com/v2")
-          FakeWeb.register_uri(:get, "http://api.foo.com/v2", status: [300, "REDIRECT"], location: "/v3")
-          FakeWeb.register_uri(:get, "http://api.foo.com/v3", body: "<hash><foo>bar</foo></hash>")
+          stub_request(:get, 'http://test.com/redirect')
+            .to_return(
+              status: [300, 'REDIRECT'],
+              headers: { location: "http://api.foo.com/v2" }
+            )
+          stub_request(:get, 'http://api.foo.com/v2')
+            .to_return(
+              status: [300, 'REDIRECT'],
+              headers: { location: '/v3' }
+            )
+          stub_request(:get, 'http://api.foo.com/v3')
+            .to_return(body: '<hash><foo>bar</foo></hash>')
           response = @request.perform
           expect(response.request.base_uri.to_s).to eq("http://api.foo.com")
           expect(response.request.path.to_s).to eq("/v3")
@@ -603,7 +620,13 @@ RSpec.describe HTTParty::Request do
 
         it "raises an error if redirect has duplicate location header" do
           @request = HTTParty::Request.new(Net::HTTP::Get, 'http://test.com/redirect', format: :xml)
-          FakeWeb.register_uri(:get, "http://test.com/redirect", status: [300, "REDIRECT"], location: ["http://api.foo.com/v2","http://api.foo.com/v2"])
+          stub_request(:get, 'http://test.com/redirect')
+            .to_return(
+              status: [300, 'REDIRECT'],
+              headers: {
+                location: ['http://api.foo.com/v2', 'http://api.foo.com/v2']
+              }
+            )
           expect {@request.perform}.to raise_error(HTTParty::DuplicateLocationHeader)
         end
 
@@ -613,8 +636,13 @@ RSpec.describe HTTParty::Request do
         end
 
         it "redirects including port" do
-          FakeWeb.register_uri(:get, "http://withport.com:3000/v1", status: [301, "Moved Permanently"], location: "http://withport.com:3000/v2")
-          FakeWeb.register_uri(:get, "http://withport.com:3000/v2", status: 200)
+          stub_request(:get, 'http://withport.com:3000/v1')
+            .to_return(
+              status: [301, 'Moved Permanently'],
+              headers: { location: 'http://withport.com:3000/v2' }
+            )
+          stub_request(:get, 'http://withport.com:3000/v2')
+            .to_return(status: 200)
           request = HTTParty::Request.new(Net::HTTP::Get, 'http://withport.com:3000/v1')
           response = request.perform
           expect(response.request.base_uri.to_s).to eq("http://withport.com:3000")
@@ -1230,19 +1258,19 @@ RSpec.describe HTTParty::Request do
   end
 
   context 'with Accept-Encoding header' do
-    it 'should disable content decoding if present' do 
+    it 'should disable content decoding if present' do
       request = HTTParty::Request.new(Net::HTTP::Get, 'http://api.foo.com/v1', headers:{'Accept-Encoding' => 'custom'})
       request.send(:setup_raw_request)
       expect(request.instance_variable_get(:@raw_request).decode_content).to eq(false)
     end
 
-    it 'should disable content decoding if present and lowercase' do 
+    it 'should disable content decoding if present and lowercase' do
       request = HTTParty::Request.new(Net::HTTP::Get, 'http://api.foo.com/v1', headers:{'accept-encoding' => 'custom'})
       request.send(:setup_raw_request)
       expect(request.instance_variable_get(:@raw_request).decode_content).to eq(false)
     end
 
-    it 'should disable content decoding if present' do 
+    it 'should disable content decoding if present' do
       request = HTTParty::Request.new(Net::HTTP::Get, 'http://api.foo.com/v1')
       request.send(:setup_raw_request)
       expect(request.instance_variable_get(:@raw_request).decode_content).to eq(true)

data/spec/httparty/ssl_spec.rb

@@ -3,11 +3,11 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 RSpec.describe HTTParty::Request do
   context "SSL certificate verification" do
     before do
-      FakeWeb.allow_net_connect = true
+      WebMock.allow_net_connect!
     end
 
     after do
-      FakeWeb.allow_net_connect = false
+      WebMock.disable_net_connect!
     end
 
     it "should fail when no trusted CA list is specified, by default" do

data/spec/httparty_spec.rb

@@ -333,7 +333,8 @@ RSpec.describe HTTParty do
 
     it "should be able parse response with custom parser" do
       @klass.parser parser
-      FakeWeb.register_uri(:get, 'http://twitter.com/statuses/public_timeline.xml', body: 'tweets')
+      stub_request(:get, 'http://twitter.com/statuses/public_timeline.xml')
+        .to_return(body: 'tweets')
       custom_parsed_response = @klass.get('http://twitter.com/statuses/public_timeline.xml')
       expect(custom_parsed_response[:sexy]).to eq(true)
     end
@@ -388,7 +389,7 @@ RSpec.describe HTTParty do
 
     it "should process a request with a uri instance parsed from the uri_adapter" do
       uri = 'http://foo.com/bar'
-      FakeWeb.register_uri(:get, uri, body: 'stuff')
+      stub_request(:get, uri).to_return(body: 'stuff')
       @klass.uri_adapter uri_adapter
       expect(@klass.get(uri).parsed_response).to eq('stuff')
     end
@@ -421,7 +422,7 @@ RSpec.describe HTTParty do
         expect(o[:connection_adapter_options]).to eq(connection_adapter_options)
         HTTParty::ConnectionAdapter.call(u, o)
       }.with(URI.parse(uri), kind_of(Hash))
-      FakeWeb.register_uri(:get, uri, body: 'stuff')
+      stub_request(:get, uri).to_return(body: 'stuff')
       @klass.connection_adapter connection_adapter, connection_adapter_options
       expect(@klass.get(uri).parsed_response).to eq('stuff')
     end
@@ -861,7 +862,7 @@ RSpec.describe HTTParty do
 
     it "should accept webcal URIs" do
       uri = 'http://google.com/'
-      FakeWeb.register_uri(:get, uri, body: 'stuff')
+      stub_request(:get, uri).to_return(body: 'stuff')
       uri = 'webcal://google.com/'
       expect do
         HTTParty.get(uri)

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@ require "simplecov"
 SimpleCov.start
 
 require "httparty"
-require "fakeweb"
+require 'webmock/rspec'
 
 def file_fixture(filename)
   open(File.join(File.dirname(__FILE__), 'fixtures', "#{filename}")).read
@@ -14,14 +14,6 @@ RSpec.configure do |config|
   config.include HTTParty::StubResponse
   config.include HTTParty::SSLTestHelper
 
-  config.before(:suite) do
-    FakeWeb.allow_net_connect = false
-  end
-
-  config.after(:suite) do
-    FakeWeb.allow_net_connect = true
-  end
-
   config.expect_with :rspec do |expectations|
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httparty
 version: !ruby/object:Gem::Version
-  version: 0.15.5
+  version: 0.15.6
 platform: ruby
 authors:
 - John Nunemaker
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-19 00:00:00.000000000 Z
+date: 2017-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_xml