httparty 0.16.4 → 0.17.0

data/spec/httparty/request_spec.rb

@@ -505,50 +505,72 @@ RSpec.describe HTTParty::Request do
     end
 
     if "".respond_to?(:encoding)
+      context 'when body has ascii-8bit encoding' do
+        let(:response) { stub_response "Content".force_encoding('ascii-8bit') }
 
-      let(:response_charset) {
-        @request.send(:get_charset)
-      }
+        it "processes charset in content type properly" do
+          response.initialize_http_header("Content-Type" => "text/plain;charset = utf-8")
+          resp = @request.perform
 
-      it "should process charset in content type properly" do
-        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
-        expect(resp.body.encoding).to eq(Encoding.find("UTF-8"))
-      end
+          expect(resp.body.encoding).to eq(Encoding.find("UTF-8"))
+        end
 
-      it "should process charset in content type properly if it has a different case" do
-        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
-        expect(resp.body.encoding).to eq(Encoding.find("UTF-8"))
-      end
+        it "processes charset in content type properly if it has a different case" do
+          response.initialize_http_header("Content-Type" => "text/plain;CHARSET = utf-8")
+          resp = @request.perform
 
-      it "should process quoted charset in content type properly" do
-        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
-        expect(resp.body.encoding).to eq(Encoding.find("UTF-8"))
+          expect(resp.body.encoding).to eq(Encoding.find("UTF-8"))
+        end
+
+        it "processes quoted charset in content type properly" do
+          response.initialize_http_header("Content-Type" => "text/plain;charset = \"utf-8\"")
+          resp = @request.perform
+
+          expect(resp.body.encoding).to eq(Encoding.find("UTF-8"))
+        end
+
+        context 'when stubed body is frozen' do
+          let(:response) do
+            stub_response "Content".force_encoding('ascii-8bit').freeze
+          end
+
+          it 'processes frozen body correctly' do
+            response.initialize_http_header("Content-Type" => "text/plain;charset = utf-8")
+            resp = @request.perform
+
+            expect(resp.body.encoding).to eq(Encoding.find("UTF-8"))
+          end
+        end
       end
 
       it "should process response with a nil body" do
         response = stub_response nil
         response.initialize_http_header("Content-Type" => "text/html;charset=UTF-8")
         resp = @request.perform
+
         expect(resp.body).to be_nil
       end
 
-      it "should process utf-16 charset with little endian bom correctly" do
-        @request.options[:assume_utf16_is_big_endian] = true
+      context 'when assume_utf16_is_big_endian is true' do
+        before { @request.options[:assume_utf16_is_big_endian] = true }
 
-        response = stub_response "\xFF\xFEC\x00o\x00n\x00t\x00e\x00n\x00t\x00"
-        response.initialize_http_header("Content-Type" => "text/plain;charset = utf-16")
-        resp = @request.perform
-        expect(response_charset).to_not be_empty
-        expect(resp.body.encoding).to eq(Encoding.find("UTF-16LE"))
+        it "should process utf-16 charset with little endian bom correctly" do
+          response = stub_response "\xFF\xFEC\x00o\x00n\x00t\x00e\x00n\x00t\x00"
+
+          response.initialize_http_header("Content-Type" => "text/plain;charset = utf-16")
+          resp = @request.perform
+
+          expect(resp.body.encoding).to eq(Encoding.find("UTF-16LE"))
+        end
+
+        it 'processes stubbed frozen body correctly' do
+          response = stub_response "\xFF\xFEC\x00o\x00n\x00t\x00e\x00n\x00t\x00".freeze
+
+          response.initialize_http_header("Content-Type" => "text/plain;charset = utf-16")
+          resp = @request.perform
+
+          expect(resp.body.encoding).to eq(Encoding.find("UTF-16LE"))
+        end
       end
 
       it "should process utf-16 charset with big endian bom correctly" do
@@ -557,7 +579,7 @@ RSpec.describe HTTParty::Request do
         response = stub_response "\xFE\xFF\x00C\x00o\x00n\x00t\x00e\x00n\x00t"
         response.initialize_http_header("Content-Type" => "text/plain;charset = utf-16")
         resp = @request.perform
-        expect(response_charset).to_not be_empty
+
         expect(resp.body.encoding).to eq(Encoding.find("UTF-16BE"))
       end
 
@@ -567,7 +589,7 @@ RSpec.describe HTTParty::Request do
         response = stub_response "C\x00o\x00n\x00t\x00e\x00n\x00t\x00"
         response.initialize_http_header("Content-Type" => "text/plain;charset = utf-16")
         resp = @request.perform
-        expect(response_charset).to_not be_empty
+
         expect(resp.body.encoding).to eq(Encoding.find("UTF-16LE"))
       end
 
@@ -575,9 +597,9 @@ 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
+
         # 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")
         expect(resp.body.encoding).to eq("Content".encoding)
       end
@@ -586,7 +608,7 @@ RSpec.describe HTTParty::Request do
         response = stub_response "Content"
         response.initialize_http_header("Content-Type" => "text/plain")
         resp = @request.perform
-        expect(response_charset).to be_nil
+
         expect(resp.body).to eq("Content")
         expect(resp.body.encoding).to eq("Content".encoding)
       end

data/spec/httparty/{fragment_with_response_spec.rb → response_fragment_spec.rb}

@@ -1,14 +1,17 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '../spec_helper'))
 
-RSpec.describe HTTParty::FragmentWithResponse do
+RSpec.describe HTTParty::ResponseFragment do
   it "access to fragment" do
-    fragment = HTTParty::FragmentWithResponse.new("chunk", nil)
+    fragment = HTTParty::ResponseFragment.new("chunk", nil, nil)
     expect(fragment).to eq("chunk")
   end
+
   it "has access to delegators" do
     response = double(code: '200')
-    fragment = HTTParty::FragmentWithResponse.new("chunk", response)
+    connection = double
+    fragment = HTTParty::ResponseFragment.new("chunk", response, connection)
     expect(fragment.code).to eq(200)
     expect(fragment.http_response).to eq response
+    expect(fragment.connection).to eq connection
   end
 end

data/spec/httparty/response_spec.rb

@@ -39,10 +39,16 @@ RSpec.describe HTTParty::Response do
     it "should set code" do
       expect(@response.code).to eq(@response_object.code)
     end
-
+        
     it "should set code as an Integer" do
       expect(@response.code).to be_a(Integer)
     end
+    
+    it "should set http_version" do
+      unparseable_body = lambda { raise "Unparseable" }
+      unparseable_response = HTTParty::Response.new(@request_object, @response_object, unparseable_body)
+      expect(unparseable_response.http_version).to eq(@response_object.http_version)
+    end
 
     context 'when raise_on is supplied' do
       let(:request) { HTTParty::Request.new(Net::HTTP::Get, '/', raise_on: [404]) }

data/spec/httparty/ssl_spec.rb

@@ -3,11 +3,11 @@ require 'spec_helper'
 RSpec.describe HTTParty::Request do
   context "SSL certificate verification" do
     before do
-      WebMock.allow_net_connect!
+      WebMock.disable!
     end
 
     after do
-      WebMock.disable_net_connect!
+      WebMock.enable!
     end
 
     it "should fail when no trusted CA list is specified, by default" do
@@ -70,5 +70,13 @@ RSpec.describe HTTParty::Request do
         ssl_verify_test(:ssl_ca_path, ".", "bogushost.crt")
       end.to raise_error(OpenSSL::SSL::SSLError)
     end
+
+    it "should provide the certificate used by the server via peer_cert" do
+      peer_cert = nil
+      ssl_verify_test(:ssl_ca_file, "ca.crt", "server.crt") do |response|
+        peer_cert ||= response.connection.peer_cert
+      end
+      expect(peer_cert).to be_a OpenSSL::X509::Certificate
+    end
   end
 end

data/spec/httparty_spec.rb

@@ -329,6 +329,10 @@ RSpec.describe HTTParty do
       @klass.default_timeout 0.5
       expect(@klass.default_options[:timeout]).to eq(0.5)
     end
+
+    it "should raise an exception if unsupported type provided" do
+      expect { @klass.default_timeout "0.5" }.to raise_error ArgumentError
+    end
   end
 
   describe "debug_output" do
@@ -837,6 +841,22 @@ RSpec.describe HTTParty do
       ).to eq(nil)
     end
 
+    context 'when streaming body' do
+      let(:chunk) { 'Content'.force_encoding('ascii-8bit') }
+      let(:options) { { stream_body: true } }
+      before do
+        stub_chunked_http_response_with([chunk], options) do |response|
+          allow(response).to receive(:[]).with('content-type').and_return('text/plain; charset = "utf-8"')
+        end
+      end
+
+      specify do
+        HTTParty.get('http://www.google.com', options) do |fragment|
+          expect(fragment.encoding).to eq(Encoding.find("UTF-8"))
+        end
+      end
+    end
+
     it "should be able parse response type json automatically" do
       stub_http_response_with('twitter.json')
       tweets = HTTParty.get('http://twitter.com/statuses/public_timeline.json')

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require "simplecov"
 SimpleCov.start
+require 'pry'
 
 require "httparty"
 require 'webmock/rspec'

data/spec/support/ssl_test_helper.rb

@@ -2,7 +2,7 @@ require 'pathname'
 
 module HTTParty
   module SSLTestHelper
-    def ssl_verify_test(mode, ca_basename, server_cert_filename, options = {})
+    def ssl_verify_test(mode, ca_basename, server_cert_filename, options = {}, &block)
       options = {
         format:  :json,
         timeout: 30
@@ -24,9 +24,9 @@ module HTTParty
         if mode
           ca_path = File.expand_path("../../fixtures/ssl/generated/#{ca_basename}", __FILE__)
           raise ArgumentError.new("#{ca_path} does not exist") unless File.exist?(ca_path)
-          return HTTParty.get("https://localhost:#{test_server.port}/", options)
+          return HTTParty.get("https://localhost:#{test_server.port}/", options, &block)
         else
-          return HTTParty.get("https://localhost:#{test_server.port}/", options)
+          return HTTParty.get("https://localhost:#{test_server.port}/", options, &block)
         end
       ensure
         test_server.stop if test_server
@@ -39,7 +39,7 @@ module HTTParty
 
       test_server.start
 
-      HTTParty.get("https://localhost:#{test_server.port}/", options)
+      HTTParty.get("https://localhost:#{test_server.port}/", options, &block)
     ensure
       test_server.stop if test_server
     end

data/spec/support/stub_response.rb

@@ -19,6 +19,7 @@ module HTTParty
       def response.read_body(&block)
         @body || chunked_data.each(&block)
       end
+      yield(response) if block_given?
 
       http_request = HTTParty::Request.new(Net::HTTP::Get, 'http://localhost', options)
       allow(http_request).to receive_message_chain(:http, :request).and_yield(response).and_return(response)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httparty
 version: !ruby/object:Gem::Version
-  version: 0.16.4
+  version: 0.17.0
 platform: ruby
 authors:
 - John Nunemaker
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-05 00:00:00.000000000 Z
+date: 2019-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_xml
@@ -76,6 +76,7 @@ files:
 - examples/microsoft_graph.rb
 - examples/multipart.rb
 - examples/nokogiri_html_parser.rb
+- examples/peer_cert.rb
 - examples/rescue_json.rb
 - examples/rubyurl.rb
 - examples/stackexchange.rb
@@ -102,7 +103,6 @@ files:
 - lib/httparty/connection_adapter.rb
 - lib/httparty/cookie_hash.rb
 - lib/httparty/exceptions.rb
-- lib/httparty/fragment_with_response.rb
 - lib/httparty/hash_conversions.rb
 - lib/httparty/logger/apache_formatter.rb
 - lib/httparty/logger/curl_formatter.rb
@@ -116,6 +116,8 @@ files:
 - lib/httparty/request/multipart_boundary.rb
 - lib/httparty/response.rb
 - lib/httparty/response/headers.rb
+- lib/httparty/response_fragment.rb
+- lib/httparty/text_encoder.rb
 - lib/httparty/utils.rb
 - lib/httparty/version.rb
 - script/release
@@ -138,7 +140,6 @@ files:
 - spec/httparty/connection_adapter_spec.rb
 - spec/httparty/cookie_hash_spec.rb
 - spec/httparty/exception_spec.rb
-- spec/httparty/fragment_with_response_spec.rb
 - spec/httparty/hash_conversions_spec.rb
 - spec/httparty/logger/apache_formatter_spec.rb
 - spec/httparty/logger/curl_formatter_spec.rb
@@ -148,6 +149,7 @@ files:
 - spec/httparty/parser_spec.rb
 - spec/httparty/request/body_spec.rb
 - spec/httparty/request_spec.rb
+- spec/httparty/response_fragment_spec.rb
 - spec/httparty/response_spec.rb
 - spec/httparty/ssl_spec.rb
 - spec/httparty_spec.rb
@@ -215,7 +217,6 @@ test_files:
 - spec/httparty/connection_adapter_spec.rb
 - spec/httparty/cookie_hash_spec.rb
 - spec/httparty/exception_spec.rb
-- spec/httparty/fragment_with_response_spec.rb
 - spec/httparty/hash_conversions_spec.rb
 - spec/httparty/logger/apache_formatter_spec.rb
 - spec/httparty/logger/curl_formatter_spec.rb
@@ -225,6 +226,7 @@ test_files:
 - spec/httparty/parser_spec.rb
 - spec/httparty/request/body_spec.rb
 - spec/httparty/request_spec.rb
+- spec/httparty/response_fragment_spec.rb
 - spec/httparty/response_spec.rb
 - spec/httparty/ssl_spec.rb
 - spec/httparty_spec.rb