httparty 0.13.1 → 0.13.2

data/lib/httparty/version.rb

@@ -1,3 +1,3 @@
 module HTTParty
-  VERSION = "0.13.1"
+  VERSION = "0.13.2"
 end

data/spec/httparty/connection_adapter_spec.rb

@@ -26,7 +26,7 @@ describe HTTParty::ConnectionAdapter do
     end
 
     it "sets the options" do
-      options = {:foo => :bar}
+      options = {foo: :bar}
       adapter = HTTParty::ConnectionAdapter.new(uri, options)
       adapter.options.should be options
     end
@@ -34,7 +34,7 @@ describe HTTParty::ConnectionAdapter do
 
   describe ".call" do
     it "generates an HTTParty::ConnectionAdapter instance with the given uri and options" do
-      HTTParty::ConnectionAdapter.should_receive(:new).with(@uri, @options).and_return(stub(:connection => nil))
+      HTTParty::ConnectionAdapter.should_receive(:new).with(@uri, @options).and_return(stub(connection: nil))
       HTTParty::ConnectionAdapter.call(@uri, @options)
     end
 
@@ -42,7 +42,7 @@ describe HTTParty::ConnectionAdapter do
       adapter = mock('Adapter')
       connection = mock('Connection')
       adapter.should_receive(:connection).and_return(connection)
-      HTTParty::ConnectionAdapter.stub(:new => adapter)
+      HTTParty::ConnectionAdapter.stub(new: adapter)
       HTTParty::ConnectionAdapter.call(@uri, @options).should be connection
     end
   end
@@ -76,7 +76,7 @@ describe HTTParty::ConnectionAdapter do
 
         context "should use the specified cert store, when one is given" do
           let(:custom_cert_store) { mock('custom_cert_store') }
-          let(:options) { {:cert_store => custom_cert_store} }
+          let(:options) { {cert_store: custom_cert_store} }
           it { should use_cert_store(custom_cert_store) }
         end
 
@@ -96,7 +96,7 @@ describe HTTParty::ConnectionAdapter do
 
 
         context "when ssl version is set" do
-          let(:options) { {:ssl_version => :TLSv1} }
+          let(:options) { {ssl_version: :TLSv1} }
 
           it "sets ssl version" do
             subject.ssl_version.should == :TLSv1
@@ -113,7 +113,7 @@ describe HTTParty::ConnectionAdapter do
       end
 
       context "specifying ciphers" do
-        let(:options) { {:ciphers => 'RC4-SHA' } }
+        let(:options) { {ciphers: 'RC4-SHA' } }
 
         it "should set the ciphers on the connection" do
           subject.ciphers.should == 'RC4-SHA'
@@ -122,10 +122,10 @@ describe HTTParty::ConnectionAdapter do
 
       context "when timeout is not set" do
         it "doesn't set the timeout" do
-          http = mock("http", :null_object => true)
+          http = mock("http", null_object: true)
           http.should_not_receive(:open_timeout=)
           http.should_not_receive(:read_timeout=)
-          Net::HTTP.stub(:new => http)
+          Net::HTTP.stub(new: http)
 
           adapter.connection
         end
@@ -133,20 +133,20 @@ describe HTTParty::ConnectionAdapter do
 
       context "when setting timeout" do
         context "to 5 seconds" do
-          let(:options) { {:timeout => 5} }
+          let(:options) { {timeout: 5} }
 
           its(:open_timeout) { should == 5 }
           its(:read_timeout) { should == 5 }
         end
 
         context "and timeout is a string" do
-          let(:options) { {:timeout => "five seconds"} }
+          let(:options) { {timeout: "five seconds"} }
 
           it "doesn't set the timeout" do
-            http = mock("http", :null_object => true)
+            http = mock("http", null_object: true)
             http.should_not_receive(:open_timeout=)
             http.should_not_receive(:read_timeout=)
-            Net::HTTP.stub(:new => http)
+            Net::HTTP.stub(new: http)
 
             adapter.connection
           end
@@ -154,57 +154,57 @@ describe HTTParty::ConnectionAdapter do
       end
 
       context "when timeout is not set and read_timeout is set to 6 seconds" do
-        let(:options) { {:read_timeout => 6} }
+        let(:options) { {read_timeout: 6} }
 
         its(:read_timeout) { should == 6 }
 
         it "should not set the open_timeout" do
-          http = mock("http", :null_object => true)
+          http = mock("http", null_object: true)
           http.should_not_receive(:open_timeout=)
-          Net::HTTP.stub(:new => http)
+          Net::HTTP.stub(new: http)
           adapter.connection
         end
       end
 
       context "when timeout is set and read_timeout is set to 6 seconds" do
-        let(:options) { {:timeout => 5, :read_timeout => 6} }
+        let(:options) { {timeout: 5, read_timeout: 6} }
 
         its(:open_timeout) { should == 5 }
         its(:read_timeout) { should == 6 }
 
         it "should override the timeout option" do
-          http = mock("http", :null_object => true)
+          http = mock("http", null_object: true)
           http.should_receive(:open_timeout=)
           http.should_receive(:read_timeout=).twice
-          Net::HTTP.stub(:new => http)
+          Net::HTTP.stub(new: http)
           adapter.connection
         end
       end
 
       context "when timeout is not set and open_timeout is set to 7 seconds" do
-        let(:options) { {:open_timeout => 7} }
+        let(:options) { {open_timeout: 7} }
 
         its(:open_timeout) { should == 7 }
 
         it "should not set the read_timeout" do
-          http = mock("http", :null_object => true)
+          http = mock("http", null_object: true)
           http.should_not_receive(:read_timeout=)
-          Net::HTTP.stub(:new => http)
+          Net::HTTP.stub(new: http)
           adapter.connection
         end
       end
 
       context "when timeout is set and open_timeout is set to 7 seconds" do
-        let(:options) { {:timeout => 5, :open_timeout => 7} }
+        let(:options) { {timeout: 5, open_timeout: 7} }
 
         its(:open_timeout) { should == 7 }
         its(:read_timeout) { should == 5 }
 
         it "should override the timeout option" do
-          http = mock("http", :null_object => true)
+          http = mock("http", null_object: true)
           http.should_receive(:open_timeout=).twice
           http.should_receive(:read_timeout=)
-          Net::HTTP.stub(:new => http)
+          Net::HTTP.stub(new: http)
           adapter.connection
         end
       end
@@ -212,11 +212,11 @@ describe HTTParty::ConnectionAdapter do
       context "when debug_output" do
         let(:http) { Net::HTTP.new(uri) }
         before do
-          Net::HTTP.stub(:new => http)
+          Net::HTTP.stub(new: http)
         end
 
         context "is set to $stderr" do
-          let(:options) { {:debug_output => $stderr} }
+          let(:options) { {debug_output: $stderr} }
           it "has debug output set" do
             http.should_receive(:set_debug_output).with($stderr)
             adapter.connection
@@ -232,7 +232,7 @@ describe HTTParty::ConnectionAdapter do
       end
 
       context 'when providing proxy address and port' do
-        let(:options) { {:http_proxyaddr => '1.2.3.4', :http_proxyport => 8080} }
+        let(:options) { {http_proxyaddr: '1.2.3.4', http_proxyport: 8080} }
 
         it { should be_a_proxy }
         its(:proxy_address) { should == '1.2.3.4' }
@@ -240,8 +240,8 @@ 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
           its(:proxy_user) { should == 'user' }
           its(:proxy_pass) { should == 'pass' }
@@ -259,7 +259,7 @@ describe HTTParty::ConnectionAdapter do
       end
 
       context 'when providing a local bind address and port' do
-        let(:options) { {:local_host => "127.0.0.1", :local_port => 12345 } }
+        let(:options) { {local_host: "127.0.0.1", local_port: 12345 } }
 
         its(:local_host) { should == '127.0.0.1' }
         its(:local_port) { should == 12345 }
@@ -267,7 +267,7 @@ describe HTTParty::ConnectionAdapter do
 
       context "when providing PEM certificates" do
         let(:pem) { :pem_contents }
-        let(:options) { {:pem => pem, :pem_password => "password"} }
+        let(:options) { {pem: pem, pem_password: "password"} }
 
         context "when scheme is https" do
           let(:uri) { URI 'https://google.com' }
@@ -279,7 +279,7 @@ describe HTTParty::ConnectionAdapter do
             OpenSSL::PKey::RSA.should_receive(:new).with(pem, "password").and_return(key)
           end
 
-          it "uses the provided PEM certificate " do
+          it "uses the provided PEM certificate" do
             subject.cert.should == cert
             subject.key.should == key
           end
@@ -287,6 +287,14 @@ describe HTTParty::ConnectionAdapter do
           it "will verify the certificate" do
             subject.verify_mode.should == OpenSSL::SSL::VERIFY_PEER
           end
+          
+          context "when options include verify_peer=false" do
+            let(:options) { {pem: pem, pem_password: "password", verify_peer: false} }
+            
+            it "should not verify the certificate" do
+              subject.verify_mode.should == OpenSSL::SSL::VERIFY_NONE
+            end
+          end
         end
 
         context "when scheme is not https" do
@@ -294,7 +302,7 @@ describe HTTParty::ConnectionAdapter do
           let(:http) { Net::HTTP.new(uri) }
 
           before do
-            Net::HTTP.stub(:new => http)
+            Net::HTTP.stub(new: http)
             OpenSSL::X509::Certificate.should_not_receive(:new).with(pem)
             OpenSSL::PKey::RSA.should_not_receive(:new).with(pem, "password")
             http.should_not_receive(:cert=)
@@ -310,11 +318,11 @@ describe HTTParty::ConnectionAdapter do
 
       context "when providing PKCS12 certificates" do
         let(:p12) { :p12_contents }
-        let(:options) { {:p12 => p12, :p12_password => "password"} }
+        let(:options) { {p12: p12, p12_password: "password"} }
 
         context "when scheme is https" do
           let(:uri) { URI 'https://google.com' }
-          let(:pkcs12) { mock("OpenSSL::PKCS12", :certificate => cert, :key => key) }
+          let(:pkcs12) { mock("OpenSSL::PKCS12", certificate: cert, key: key) }
           let(:cert) { mock("OpenSSL::X509::Certificate") }
           let(:key) { mock("OpenSSL::PKey::RSA") }
 
@@ -330,6 +338,14 @@ describe HTTParty::ConnectionAdapter do
           it "will verify the certificate" do
             subject.verify_mode.should == OpenSSL::SSL::VERIFY_PEER
           end
+          
+          context "when options include verify_peer=false" do
+            let(:options) { {p12: p12, p12_password: "password", verify_peer: false} }
+            
+            it "should not verify the certificate" do
+              subject.verify_mode.should == OpenSSL::SSL::VERIFY_NONE
+            end
+          end
         end
 
         context "when scheme is not https" do
@@ -337,7 +353,7 @@ describe HTTParty::ConnectionAdapter do
           let(:http) { Net::HTTP.new(uri) }
 
           before do
-            Net::HTTP.stub(:new => http)
+            Net::HTTP.stub(new: http)
             OpenSSL::PKCS12.new.should_not_receive(:new).with(p12, "password")
             http.should_not_receive(:cert=)
             http.should_not_receive(:key=)

data/spec/httparty/cookie_hash_spec.rb

@@ -8,14 +8,14 @@ describe HTTParty::CookieHash do
   describe "#add_cookies" do
     describe "with a hash" do
       it "should add new key/value pairs to the hash" do
-        @cookie_hash.add_cookies(:foo => "bar")
-        @cookie_hash.add_cookies(:rofl => "copter")
+        @cookie_hash.add_cookies(foo: "bar")
+        @cookie_hash.add_cookies(rofl: "copter")
         @cookie_hash.length.should eql(2)
       end
 
       it "should overwrite any existing key" do
-        @cookie_hash.add_cookies(:foo => "bar")
-        @cookie_hash.add_cookies(:foo => "copter")
+        @cookie_hash.add_cookies(foo: "bar")
+        @cookie_hash.add_cookies(foo: "copter")
         @cookie_hash.length.should eql(1)
         @cookie_hash[:foo].should eql("copter")
       end
@@ -57,8 +57,8 @@ describe HTTParty::CookieHash do
   # a hardcoded string was randomly failing.
   describe "#to_cookie_string" do
     before(:each) do
-      @cookie_hash.add_cookies(:foo => "bar")
-      @cookie_hash.add_cookies(:rofl => "copter")
+      @cookie_hash.add_cookies(foo: "bar")
+      @cookie_hash.add_cookies(rofl: "copter")
       @s = @cookie_hash.to_cookie_string
     end
 
@@ -69,13 +69,13 @@ describe HTTParty::CookieHash do
     end
 
     it "should not include client side only cookies" do
-      @cookie_hash.add_cookies(:path => "/")
+      @cookie_hash.add_cookies(path: "/")
       @s = @cookie_hash.to_cookie_string
       @s.should_not match(/path=\//)
     end
 
     it "should not include client side only cookies even when attributes use camal case" do
-      @cookie_hash.add_cookies(:Path => "/")
+      @cookie_hash.add_cookies(Path: "/")
       @s = @cookie_hash.to_cookie_string
       @s.should_not match(/Path=\//)
     end

data/spec/httparty/logger/apache_logger_spec.rb

@@ -1,26 +1,41 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
 
 describe HTTParty::Logger::ApacheLogger do
+  let(:subject) { described_class.new(logger_double, :info) }
+  let(:logger_double) { double('Logger') }
+  let(:request_double) { double('Request', http_method: Net::HTTP::Get, path: "http://my.domain.com/my_path") }
+  let(:request_time) { Time.new.strftime("%Y-%m-%d %H:%M:%S %z") }
+
+  before do
+    subject.current_time = request_time
+    logger_double.should_receive(:info).with(log_message)
+  end
+
   describe "#format" do
-    it "formats a response in a style that resembles apache's access log" do
-      request_time = Time.new.strftime("%Y-%m-%d %H:%M:%S %z")
-      log_message = "[HTTParty] [#{request_time}] 302 \"GET http://my.domain.com/my_path\" - "
+    let(:log_message) { "[HTTParty] [#{request_time}] 302 \"GET http://my.domain.com/my_path\" - " }
 
-      request_double  = double(
-        :http_method => Net::HTTP::Get,
-        :path => "http://my.domain.com/my_path"
-      )
+    it "formats a response in a style that resembles apache's access log" do
       response_double = double(
-        :code => 302,
-        :[]   => nil
+        code: 302,
+        :[] => nil
       )
 
-      logger_double = double
-      logger_double.should_receive(:info).with(log_message)
-
-      subject = described_class.new(logger_double, :info)
-      subject.current_time = request_time
       subject.format(request_double, response_double)
     end
+
+    context 'when there is a parsed response' do
+      let(:log_message) { "[HTTParty] [#{request_time}] 200 \"GET http://my.domain.com/my_path\" 512 "}
+
+      it "can handle the Content-Length header" do
+        # Simulate a parsed response that is an array, where accessing a string key will raise an error. See Issue #299.
+        response_double = double(
+            code: 200,
+            headers: { 'Content-Length' => 512 }
+        )
+        response_double.stub(:[]).with('Content-Length').and_raise(TypeError.new('no implicit conversion of String into Integer'))
+
+        subject.format(request_double, response_double)
+      end
+    end
   end
 end

data/spec/httparty/net_digest_auth_spec.rb

@@ -75,6 +75,17 @@ describe Net::HTTPHeader::DigestAuthenticator do
     end
   end
 
+  context "when quality of protection (qop) is unquoted" do
+    before do
+      @digest = setup_digest({
+        'www-authenticate' => 'Digest realm="myhost@testrealm.com", nonce="NONCE", qop=auth',
+      })
+    end
+
+    it "should still set qop" do
+      authorization_header.should include(%Q(qop="auth"))
+    end
+  end
 
   context "with unspecified quality of protection (qop)" do
     before do

data/spec/httparty/parser_spec.rb

@@ -9,14 +9,14 @@ describe HTTParty::Parser do
 
   describe ".call" do
     it "generates an HTTParty::Parser instance with the given body and format" do
-      HTTParty::Parser.should_receive(:new).with('body', :plain).and_return(stub(:parse => nil))
+      HTTParty::Parser.should_receive(:new).with('body', :plain).and_return(stub(parse: nil))
       HTTParty::Parser.call('body', :plain)
     end
 
     it "calls #parse on the parser" do
       parser = mock('Parser')
       parser.should_receive(:parse)
-      HTTParty::Parser.stub(:new => parser)
+      HTTParty::Parser.stub(new: parser)
       parser = HTTParty::Parser.call('body', :plain)
     end
   end
@@ -52,12 +52,12 @@ describe HTTParty::Parser do
 
   describe ".supports_format?" do
     it "returns true for a supported format" do
-      HTTParty::Parser.stub(:supported_formats => [:json])
+      HTTParty::Parser.stub(supported_formats: [:json])
       HTTParty::Parser.supports_format?(:json).should be_true
     end
 
     it "returns false for an unsupported format" do
-      HTTParty::Parser.stub(:supported_formats => [])
+      HTTParty::Parser.stub(supported_formats: [])
       HTTParty::Parser.supports_format?(:json).should be_false
     end
   end
@@ -68,33 +68,33 @@ describe HTTParty::Parser do
     end
 
     it "attempts to parse supported formats" do
-      @parser.stub(:supports_format? => true)
+      @parser.stub(supports_format?: true)
       @parser.should_receive(:parse_supported_format)
       @parser.parse
     end
 
     it "returns the unparsed body when the format is unsupported" do
-      @parser.stub(:supports_format? => false)
+      @parser.stub(supports_format?: false)
       @parser.parse.should == @parser.body
     end
 
     it "returns nil for an empty body" do
-      @parser.stub(:body => '')
+      @parser.stub(body: '')
       @parser.parse.should be_nil
     end
 
     it "returns nil for a nil body" do
-      @parser.stub(:body => nil)
+      @parser.stub(body: nil)
       @parser.parse.should be_nil
     end
 
     it "returns nil for a 'null' body" do
-      @parser.stub(:body => "null")
+      @parser.stub(body: "null")
       @parser.parse.should be_nil
     end
 
     it "returns nil for a body with spaces only" do
-      @parser.stub(:body => "   ")
+      @parser.stub(body: "   ")
       @parser.parse.should be_nil
     end
   end