rest-client 1.6.1 → 1.6.14

data/spec/integration_spec.rb

@@ -1,7 +1,7 @@
 require File.join( File.dirname(File.expand_path(__FILE__)), 'base')
 
 require 'webmock/rspec'
-include WebMock
+include WebMock::API
 
 describe RestClient do
 
@@ -9,15 +9,15 @@ describe RestClient do
     body = 'abc'
     stub_request(:get, "www.example.com").to_return(:body => body, :status => 200)
     response = RestClient.get "www.example.com"
-    response.code.should == 200
-    response.body.should == body
+    response.code.should eq 200
+    response.body.should eq body
   end
 
   it "a simple request with gzipped content" do
     stub_request(:get, "www.example.com").with(:headers => { 'Accept-Encoding' => 'gzip, deflate' }).to_return(:body => "\037\213\b\b\006'\252H\000\003t\000\313T\317UH\257\312,HM\341\002\000G\242(\r\v\000\000\000", :status => 200,  :headers => { 'Content-Encoding' => 'gzip' } )
     response = RestClient.get "www.example.com"
-    response.code.should == 200
-    response.body.should == "i'm gziped\n"
+    response.code.should eq 200
+    response.body.should eq "i'm gziped\n"
   end
 
   it "a 404" do
@@ -27,10 +27,10 @@ describe RestClient do
       RestClient.get "www.example.com"
       raise
     rescue RestClient::ResourceNotFound => e
-      e.http_code.should == 404
-      e.response.code.should == 404
-      e.response.body.should == body
-      e.http_body.should == body
+      e.http_code.should eq 404
+      e.response.code.should eq 404
+      e.response.body.should eq body
+      e.http_body.should eq body
     end
   end
 

data/spec/payload_spec.rb

@@ -1,29 +1,30 @@
-require File.join( File.dirname(File.expand_path(__FILE__)), 'base')
+# encoding: binary
+require File.join(File.dirname(File.expand_path(__FILE__)), 'base')
 
 describe RestClient::Payload do
   context "A regular Payload" do
     it "should use standard enctype as default content-type" do
       RestClient::Payload::UrlEncoded.new({}).headers['Content-Type'].
-              should == 'application/x-www-form-urlencoded'
+          should eq 'application/x-www-form-urlencoded'
     end
 
     it "should form properly encoded params" do
       RestClient::Payload::UrlEncoded.new({:foo => 'bar'}).to_s.
-              should == "foo=bar"
+          should eq "foo=bar"
       ["foo=bar&baz=qux", "baz=qux&foo=bar"].should include(
-              RestClient::Payload::UrlEncoded.new({:foo => 'bar', :baz => 'qux'}).to_s)
+                                                        RestClient::Payload::UrlEncoded.new({:foo => 'bar', :baz => 'qux'}).to_s)
     end
 
     it "should escape parameters" do
       RestClient::Payload::UrlEncoded.new({'foo ' => 'bar'}).to_s.
-              should == "foo%20=bar"
+          should eq "foo%20=bar"
     end
 
     it "should properly handle hashes as parameter" do
-      RestClient::Payload::UrlEncoded.new({:foo => {:bar => 'baz' }}).to_s.
-              should == "foo[bar]=baz"
-      RestClient::Payload::UrlEncoded.new({:foo => {:bar => {:baz => 'qux' }}}).to_s.
-              should == "foo[bar][baz]=qux"
+      RestClient::Payload::UrlEncoded.new({:foo => {:bar => 'baz'}}).to_s.
+          should eq "foo[bar]=baz"
+      RestClient::Payload::UrlEncoded.new({:foo => {:bar => {:baz => 'qux'}}}).to_s.
+          should eq "foo[bar][baz]=qux"
     end
 
     it "should handle many attributes inside a hash" do
@@ -37,22 +38,27 @@ describe RestClient::Payload do
     end
 
     it "should handle attributes inside a an array inside an array inside an hash" do
-      parameters = RestClient::Payload::UrlEncoded.new({"foo" => [ [{"bar" => 'baz'}, {"bar" => 'qux'}]]}).to_s
+      parameters = RestClient::Payload::UrlEncoded.new({"foo" => [[{"bar" => 'baz'}, {"bar" => 'qux'}]]}).to_s
       parameters.should include("foo[bar]=baz", "foo[bar]=qux")
     end
 
     it "should form properly use symbols as parameters" do
       RestClient::Payload::UrlEncoded.new({:foo => :bar}).to_s.
-              should == "foo=bar"
-      RestClient::Payload::UrlEncoded.new({:foo => {:bar => :baz }}).to_s.
-              should == "foo[bar]=baz"
+          should eq "foo=bar"
+      RestClient::Payload::UrlEncoded.new({:foo => {:bar => :baz}}).to_s.
+          should eq "foo[bar]=baz"
     end
 
     it "should properly handle arrays as repeated parameters" do
       RestClient::Payload::UrlEncoded.new({:foo => ['bar']}).to_s.
-              should == "foo[]=bar"
+          should eq "foo[]=bar"
       RestClient::Payload::UrlEncoded.new({:foo => ['bar', 'baz']}).to_s.
-              should == "foo[]=bar&foo[]=baz"
+          should eq "foo[]=bar&foo[]=baz"
+    end
+
+    it 'should not close if stream already closed' do
+      p = RestClient::Payload::UrlEncoded.new({'foo ' => 'bar'})
+      3.times {p.close}
     end
 
   end
@@ -60,13 +66,18 @@ describe RestClient::Payload do
   context "A multipart Payload" do
     it "should use standard enctype as default content-type" do
       m = RestClient::Payload::Multipart.new({})
-      m.stub!(:boundary).and_return(123)
-      m.headers['Content-Type'].should == 'multipart/form-data; boundary=123'
+      m.stub(:boundary).and_return(123)
+      m.headers['Content-Type'].should eq 'multipart/form-data; boundary=123'
+    end
+
+    it 'should not error on close if stream already closed' do
+      m = RestClient::Payload::Multipart.new(:file => File.new(File.join(File.dirname(File.expand_path(__FILE__)), 'master_shake.jpg')))
+      3.times {m.close}
     end
 
     it "should form properly separated multipart data" do
       m = RestClient::Payload::Multipart.new([[:bar, "baz"], [:foo, "bar"]])
-      m.to_s.should == <<-EOS
+      m.to_s.should eq <<-EOS
 --#{m.boundary}\r
 Content-Disposition: form-data; name="bar"\r
 \r
@@ -81,7 +92,7 @@ bar\r
 
     it "should not escape parameters names" do
       m = RestClient::Payload::Multipart.new([["bar ", "baz"]])
-      m.to_s.should == <<-EOS
+      m.to_s.should eq <<-EOS
 --#{m.boundary}\r
 Content-Disposition: form-data; name="bar "\r
 \r
@@ -93,12 +104,12 @@ baz\r
     it "should form properly separated multipart data" do
       f = File.new(File.dirname(__FILE__) + "/master_shake.jpg")
       m = RestClient::Payload::Multipart.new({:foo => f})
-      m.to_s.should == <<-EOS
+      m.to_s.should eq <<-EOS
 --#{m.boundary}\r
 Content-Disposition: form-data; name="foo"; filename="master_shake.jpg"\r
 Content-Type: image/jpeg\r
 \r
-#{IO.read(f.path)}\r
+#{File.open(f.path, 'rb'){|bin| bin.read}}\r
 --#{m.boundary}--\r
       EOS
     end
@@ -106,12 +117,12 @@ Content-Type: image/jpeg\r
     it "should ignore the name attribute when it's not set" do
       f = File.new(File.dirname(__FILE__) + "/master_shake.jpg")
       m = RestClient::Payload::Multipart.new({nil => f})
-      m.to_s.should == <<-EOS
+      m.to_s.should eq <<-EOS
 --#{m.boundary}\r
 Content-Disposition: form-data; filename="master_shake.jpg"\r
 Content-Type: image/jpeg\r
 \r
-#{IO.read(f.path)}\r
+#{File.open(f.path, 'rb'){|bin| bin.read}}\r
 --#{m.boundary}--\r
       EOS
     end
@@ -121,19 +132,19 @@ Content-Type: image/jpeg\r
       f.instance_eval "def content_type; 'text/plain'; end"
       f.instance_eval "def original_filename; 'foo.txt'; end"
       m = RestClient::Payload::Multipart.new({:foo => f})
-      m.to_s.should == <<-EOS
+      m.to_s.should eq <<-EOS
 --#{m.boundary}\r
 Content-Disposition: form-data; name="foo"; filename="foo.txt"\r
 Content-Type: text/plain\r
 \r
-#{IO.read(f.path)}\r
+#{File.open(f.path, 'rb'){|bin| bin.read}}\r
 --#{m.boundary}--\r
       EOS
     end
 
     it "should handle hash in hash parameters" do
       m = RestClient::Payload::Multipart.new({:bar => {:baz => "foo"}})
-      m.to_s.should == <<-EOS
+      m.to_s.should eq <<-EOS
 --#{m.boundary}\r
 Content-Disposition: form-data; name="bar[baz]"\r
 \r
@@ -145,12 +156,12 @@ foo\r
       f.instance_eval "def content_type; 'text/plain'; end"
       f.instance_eval "def original_filename; 'foo.txt'; end"
       m = RestClient::Payload::Multipart.new({:foo => {:bar => f}})
-      m.to_s.should == <<-EOS
+      m.to_s.should eq <<-EOS
 --#{m.boundary}\r
 Content-Disposition: form-data; name="foo[bar]"; filename="foo.txt"\r
 Content-Type: text/plain\r
 \r
-#{IO.read(f.path)}\r
+#{File.open(f.path, 'rb'){|bin| bin.read}}\r
 --#{m.boundary}--\r
       EOS
     end
@@ -161,23 +172,23 @@ Content-Type: text/plain\r
     it "should properly determine the size of file payloads" do
       f = File.new(File.dirname(__FILE__) + "/master_shake.jpg")
       payload = RestClient::Payload.generate(f)
-      payload.size.should == 22_545
-      payload.length.should == 22_545
+      payload.size.should eq 76_988
+      payload.length.should eq 76_988
     end
 
     it "should properly determine the size of other kinds of streaming payloads" do
       s = StringIO.new 'foo'
       payload = RestClient::Payload.generate(s)
-      payload.size.should == 3
-      payload.length.should == 3
+      payload.size.should eq 3
+      payload.length.should eq 3
 
       begin
         f = Tempfile.new "rest-client"
         f.write 'foo bar'
 
         payload = RestClient::Payload.generate(f)
-        payload.size.should == 7
-        payload.length.should == 7
+        payload.size.should eq 7
+        payload.length.should eq 7
       ensure
         f.close
       end
@@ -202,11 +213,16 @@ Content-Type: text/plain\r
       RestClient::Payload.generate("data").should be_kind_of(RestClient::Payload::Base)
     end
 
-    it "should recognize nested multipart payloads" do
+    it "should recognize nested multipart payloads in hashes" do
       f = File.new(File.dirname(__FILE__) + "/master_shake.jpg")
       RestClient::Payload.generate({"foo" => {"file" => f}}).should be_kind_of(RestClient::Payload::Multipart)
     end
 
+    it "should recognize nested multipart payloads in arrays" do
+      f = File.new(File.dirname(__FILE__) + "/master_shake.jpg")
+      RestClient::Payload.generate({"foo" => [f]}).should be_kind_of(RestClient::Payload::Multipart)
+    end
+
     it "should recognize file payloads that can be streamed" do
       f = File.new(File.dirname(__FILE__) + "/master_shake.jpg")
       RestClient::Payload.generate(f).should be_kind_of(RestClient::Payload::Streamed)
@@ -215,5 +231,14 @@ Content-Type: text/plain\r
     it "should recognize other payloads that can be streamed" do
       RestClient::Payload.generate(StringIO.new('foo')).should be_kind_of(RestClient::Payload::Streamed)
     end
+
+    # hashery gem introduces Hash#read convenience method. Existence of #read method used to determine of content is streameable :/
+    it "shouldn't treat hashes as streameable" do
+      RestClient::Payload.generate({"foo" => 'bar'}).should be_kind_of(RestClient::Payload::UrlEncoded)
+    end
+  end
+
+  class HashMapForTesting < Hash
+    alias :read :[]
   end
 end

data/spec/raw_response_spec.rb

@@ -2,16 +2,16 @@ require File.join( File.dirname(File.expand_path(__FILE__)), 'base')
 
 describe RestClient::RawResponse do
   before do
-    @tf = mock("Tempfile", :read => "the answer is 42", :open => true)
-    @net_http_res = mock('net http response')
+    @tf = double("Tempfile", :read => "the answer is 42", :open => true)
+    @net_http_res = double('net http response')
     @response = RestClient::RawResponse.new(@tf, @net_http_res, {})
   end
 
   it "behaves like string" do
-    @response.to_s.should == 'the answer is 42'
+    @response.to_s.should eq 'the answer is 42'
   end
 
   it "exposes a Tempfile" do
-    @response.file.should == @tf
+    @response.file.should eq @tf
   end
 end

data/spec/request2_spec.rb

@@ -1,17 +1,35 @@
 require File.join( File.dirname(File.expand_path(__FILE__)), 'base')
 
 require 'webmock/rspec'
-include WebMock
+include WebMock::API
 
 describe RestClient::Request do
 
   it "manage params for get requests" do
     stub_request(:get, 'http://some/resource?a=b&c=d').with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate', 'Foo'=>'bar'}).to_return(:body => 'foo', :status => 200)
-    RestClient::Request.execute(:url => 'http://some/resource', :method => :get, :headers => {:foo => :bar, :params => {:a => :b, 'c' => 'd'}}).body.should == 'foo'
+    RestClient::Request.execute(:url => 'http://some/resource', :method => :get, :headers => {:foo => :bar, :params => {:a => :b, 'c' => 'd'}}).body.should eq 'foo'
 
     stub_request(:get, 'http://some/resource').with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate', 'Foo'=>'bar', 'params' => 'a'}).to_return(:body => 'foo', :status => 200)
-    RestClient::Request.execute(:url => 'http://some/resource', :method => :get, :headers => {:foo => :bar, :params => :a}).body.should == 'foo'
+    RestClient::Request.execute(:url => 'http://some/resource', :method => :get, :headers => {:foo => :bar, :params => :a}).body.should eq 'foo'
   end
 
-end
+  it "can use a block to process response" do
+    response_value = nil
+    block = Proc.new do |http_response|
+      response_value = http_response.body
+    end
+    stub_request(:get, 'http://some/resource?a=b&c=d').with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate', 'Foo'=>'bar'}).to_return(:body => 'foo', :status => 200)
+    RestClient::Request.execute(:url => 'http://some/resource', :method => :get, :headers => {:foo => :bar, :params => {:a => :b, 'c' => 'd'}}, :block_response => block)
+    response_value.should eq "foo"
+  end
+
+  it 'closes payload if not nil' do
+    test_file = File.new(File.join( File.dirname(File.expand_path(__FILE__)), 'master_shake.jpg'))
 
+    stub_request(:post, 'http://some/resource').with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate'}).to_return(:body => 'foo', :status => 200)
+    RestClient::Request.execute(:url => 'http://some/resource', :method => :post, :payload => {:file => test_file})
+
+    test_file.closed?.should be_true
+  end
+
+end

data/spec/request_spec.rb

@@ -1,34 +1,34 @@
 require File.join( File.dirname(File.expand_path(__FILE__)), 'base')
 
 require 'webmock/rspec'
-include WebMock
+include WebMock::API
 
 describe RestClient::Request do
   before do
     @request = RestClient::Request.new(:method => :put, :url => 'http://some/resource', :payload => 'payload')
 
-    @uri = mock("uri")
-    @uri.stub!(:request_uri).and_return('/resource')
-    @uri.stub!(:host).and_return('some')
-    @uri.stub!(:port).and_return(80)
-
-    @net = mock("net::http base")
-    @http = mock("net::http connection")
-    Net::HTTP.stub!(:new).and_return(@net)
-    @net.stub!(:start).and_yield(@http)
-    @net.stub!(:use_ssl=)
-    @net.stub!(:verify_mode=)
+    @uri = double("uri")
+    @uri.stub(:request_uri).and_return('/resource')
+    @uri.stub(:host).and_return('some')
+    @uri.stub(:port).and_return(80)
+
+    @net = double("net::http base")
+    @http = double("net::http connection")
+    Net::HTTP.stub(:new).and_return(@net)
+    @net.stub(:start).and_yield(@http)
+    @net.stub(:use_ssl=)
+    @net.stub(:verify_mode=)
     RestClient.log = nil
   end
 
   it "accept */* mimetype, preferring xml" do
-    @request.default_headers[:accept].should == '*/*; q=0.5, application/xml'
+    @request.default_headers[:accept].should eq '*/*; q=0.5, application/xml'
   end
 
   describe "compression" do
 
     it "decodes an uncompressed result body by passing it straight through" do
-      RestClient::Request.decode(nil, 'xyz').should == 'xyz'
+      RestClient::Request.decode(nil, 'xyz').should eq 'xyz'
     end
 
     it "doesn't fail for nil bodies" do
@@ -37,7 +37,7 @@ describe RestClient::Request do
 
 
     it "decodes a gzip body" do
-      RestClient::Request.decode('gzip', "\037\213\b\b\006'\252H\000\003t\000\313T\317UH\257\312,HM\341\002\000G\242(\r\v\000\000\000").should == "i'm gziped\n"
+      RestClient::Request.decode('gzip', "\037\213\b\b\006'\252H\000\003t\000\313T\317UH\257\312,HM\341\002\000G\242(\r\v\000\000\000").should eq "i'm gziped\n"
     end
 
     it "ingores gzip for empty bodies" do
@@ -45,25 +45,25 @@ describe RestClient::Request do
     end
 
     it "decodes a deflated body" do
-      RestClient::Request.decode('deflate', "x\234+\316\317MUHIM\313I,IMQ(I\255(\001\000A\223\006\363").should == "some deflated text"
+      RestClient::Request.decode('deflate', "x\234+\316\317MUHIM\313I,IMQ(I\255(\001\000A\223\006\363").should eq "some deflated text"
     end
   end
 
   it "processes a successful result" do
-    res = mock("result")
-    res.stub!(:code).and_return("200")
-    res.stub!(:body).and_return('body')
-    res.stub!(:[]).with('content-encoding').and_return(nil)
-    @request.process_result(res).body.should == 'body'
-    @request.process_result(res).to_s.should == 'body'
+    res = double("result")
+    res.stub(:code).and_return("200")
+    res.stub(:body).and_return('body')
+    res.stub(:[]).with('content-encoding').and_return(nil)
+    @request.process_result(res).body.should eq 'body'
+    @request.process_result(res).to_s.should eq 'body'
   end
 
   it "doesn't classify successful requests as failed" do
     203.upto(207) do |code|
-      res = mock("result")
-      res.stub!(:code).and_return(code.to_s)
-      res.stub!(:body).and_return("")
-      res.stub!(:[]).with('content-encoding').and_return(nil)
+      res = double("result")
+      res.stub(:code).and_return(code.to_s)
+      res.stub(:body).and_return("")
+      res.stub(:[]).with('content-encoding').and_return(nil)
       @request.process_result(res).should be_empty
     end
   end
@@ -80,37 +80,37 @@ describe RestClient::Request do
 
   describe "user - password" do
     it "extracts the username and password when parsing http://user:password@example.com/" do
-      URI.stub!(:parse).and_return(mock('uri', :user => 'joe', :password => 'pass1'))
+      URI.stub(:parse).and_return(double('uri', :user => 'joe', :password => 'pass1'))
       @request.parse_url_with_auth('http://joe:pass1@example.com/resource')
-      @request.user.should == 'joe'
-      @request.password.should == 'pass1'
+      @request.user.should eq 'joe'
+      @request.password.should eq 'pass1'
     end
 
     it "extracts with escaping the username and password when parsing http://user:password@example.com/" do
-      URI.stub!(:parse).and_return(mock('uri', :user => 'joe%20', :password => 'pass1'))
+      URI.stub(:parse).and_return(double('uri', :user => 'joe%20', :password => 'pass1'))
       @request.parse_url_with_auth('http://joe%20:pass1@example.com/resource')
-      @request.user.should == 'joe '
-      @request.password.should == 'pass1'
+      @request.user.should eq 'joe '
+      @request.password.should eq 'pass1'
     end
 
     it "doesn't overwrite user and password (which may have already been set by the Resource constructor) if there is no user/password in the url" do
-      URI.stub!(:parse).and_return(mock('uri', :user => nil, :password => nil))
+      URI.stub(:parse).and_return(double('uri', :user => nil, :password => nil))
       @request = RestClient::Request.new(:method => 'get', :url => 'example.com', :user => 'beth', :password => 'pass2')
       @request.parse_url_with_auth('http://example.com/resource')
-      @request.user.should == 'beth'
-      @request.password.should == 'pass2'
+      @request.user.should eq 'beth'
+      @request.password.should eq 'pass2'
     end
   end
 
   it "correctly formats cookies provided to the constructor" do
-    URI.stub!(:parse).and_return(mock('uri', :user => nil, :password => nil))
+    URI.stub(:parse).and_return(double('uri', :user => nil, :password => nil))
     @request = RestClient::Request.new(:method => 'get', :url => 'example.com', :cookies => {:session_id => '1', :user_id => "someone" })
     @request.should_receive(:default_headers).and_return({'Foo' => 'bar'})
-    @request.make_headers({}).should == { 'Foo' => 'bar', 'Cookie' => 'session_id=1;user_id=someone'}
+    @request.make_headers({}).should eq({ 'Foo' => 'bar', 'Cookie' => 'session_id=1; user_id=someone'})
   end
 
   it "determines the Net::HTTP class to instantiate by the method name" do
-    @request.net_http_request_class(:put).should == Net::HTTP::Put
+    @request.net_http_request_class(:put).should eq Net::HTTP::Put
   end
 
   describe "user headers" do
@@ -118,16 +118,16 @@ describe RestClient::Request do
       @request.should_receive(:default_headers).and_return({ :accept => '*/*; q=0.5, application/xml', :accept_encoding => 'gzip, deflate' })
       headers = @request.make_headers("Accept" => "application/json", :accept_encoding => 'gzip')
       headers.should have_key "Accept-Encoding"
-      headers["Accept-Encoding"].should == "gzip"
+      headers["Accept-Encoding"].should eq "gzip"
       headers.should have_key "Accept"
-      headers["Accept"].should == "application/json"
+      headers["Accept"].should eq "application/json"
     end
 
     it "prefers the user header when the same header exists in the defaults" do
       @request.should_receive(:default_headers).and_return({ '1' => '2' })
       headers = @request.make_headers('1' => '3')
       headers.should have_key('1')
-      headers['1'].should == '3'
+      headers['1'].should eq '3'
     end
   end
 
@@ -137,43 +137,43 @@ describe RestClient::Request do
       @request.should_receive(:default_headers).and_return({})
       headers = @request.make_headers(:content_type => 'abc')
       headers.should have_key('Content-Type')
-      headers['Content-Type'].should == 'abc'
+      headers['Content-Type'].should eq 'abc'
     end
 
     it "converts content-type from extension to real content-type" do
       @request.should_receive(:default_headers).and_return({})
       headers = @request.make_headers(:content_type => 'json')
       headers.should have_key('Content-Type')
-      headers['Content-Type'].should == 'application/json'
+      headers['Content-Type'].should eq 'application/json'
     end
 
     it "converts accept from extension(s) to real content-type(s)" do
       @request.should_receive(:default_headers).and_return({})
       headers = @request.make_headers(:accept => 'json, mp3')
       headers.should have_key('Accept')
-      headers['Accept'].should == 'application/json, audio/mpeg'
+      headers['Accept'].should eq 'application/json, audio/mpeg'
 
       @request.should_receive(:default_headers).and_return({})
       headers = @request.make_headers(:accept => :json)
       headers.should have_key('Accept')
-      headers['Accept'].should == 'application/json'
+      headers['Accept'].should eq 'application/json'
     end
 
     it "only convert symbols in header" do
       @request.should_receive(:default_headers).and_return({})
       headers = @request.make_headers({:foo_bar => 'value', "bar_bar" => 'value'})
-      headers['Foo-Bar'].should == 'value'
-      headers['bar_bar'].should == 'value'
+      headers['Foo-Bar'].should eq 'value'
+      headers['bar_bar'].should eq 'value'
     end
 
     it "converts header values to strings" do
-      @request.make_headers('A' => 1)['A'].should == '1'
+      @request.make_headers('A' => 1)['A'].should eq '1'
     end
   end
 
   it "executes by constructing the Net::HTTP object, headers, and payload and calling transmit" do
     @request.should_receive(:parse_url_with_auth).with('http://some/resource').and_return(@uri)
-    klass = mock("net:http class")
+    klass = double("net:http class")
     @request.should_receive(:net_http_request_class).with(:put).and_return(klass)
     klass.should_receive(:new).and_return('result')
     @request.should_receive(:transmit).with(@uri, 'result', kind_of(RestClient::Payload::Base))
@@ -190,16 +190,16 @@ describe RestClient::Request do
     it "sends nil payloads" do
       @http.should_receive(:request).with('req', nil)
       @request.should_receive(:process_result)
-      @request.stub!(:response_log)
+      @request.stub(:response_log)
       @request.transmit(@uri, 'req', nil)
     end
 
     it "passes non-hash payloads straight through" do
-      @request.process_payload("x").should == "x"
+      @request.process_payload("x").should eq "x"
     end
 
     it "converts a hash payload to urlencoded data" do
-      @request.process_payload(:a => 'b c+d').should == "a=b%20c%2Bd"
+      @request.process_payload(:a => 'b c+d').should eq "a=b%20c%2Bd"
     end
 
     it "accepts nested hashes in payload" do
@@ -212,45 +212,45 @@ describe RestClient::Request do
 
   it "set urlencoded content_type header on hash payloads" do
     @request.process_payload(:a => 1)
-    @request.headers[:content_type].should == 'application/x-www-form-urlencoded'
+    @request.headers[:content_type].should eq 'application/x-www-form-urlencoded'
   end
 
   describe "credentials" do
     it "sets up the credentials prior to the request" do
-      @http.stub!(:request)
-      @request.stub!(:process_result)
-      @request.stub!(:response_log)
+      @http.stub(:request)
+      @request.stub(:process_result)
+      @request.stub(:response_log)
 
-      @request.stub!(:user).and_return('joe')
-      @request.stub!(:password).and_return('mypass')
+      @request.stub(:user).and_return('joe')
+      @request.stub(:password).and_return('mypass')
       @request.should_receive(:setup_credentials).with('req')
 
       @request.transmit(@uri, 'req', nil)
     end
 
     it "does not attempt to send any credentials if user is nil" do
-      @request.stub!(:user).and_return(nil)
-      req = mock("request")
+      @request.stub(:user).and_return(nil)
+      req = double("request")
       req.should_not_receive(:basic_auth)
       @request.setup_credentials(req)
     end
 
     it "setup credentials when there's a user" do
-      @request.stub!(:user).and_return('joe')
-      @request.stub!(:password).and_return('mypass')
-      req = mock("request")
+      @request.stub(:user).and_return('joe')
+      @request.stub(:password).and_return('mypass')
+      req = double("request")
       req.should_receive(:basic_auth).with('joe', 'mypass')
       @request.setup_credentials(req)
     end
   end
 
   it "catches EOFError and shows the more informative ServerBrokeConnection" do
-    @http.stub!(:request).and_raise(EOFError)
+    @http.stub(:request).and_raise(EOFError)
     lambda { @request.transmit(@uri, 'req', nil) }.should raise_error(RestClient::ServerBrokeConnection)
   end
 
   it "class method execute wraps constructor" do
-    req = mock("rest request")
+    req = double("rest request")
     RestClient::Request.should_receive(:new).with(1 => 2).and_return(req)
     req.should_receive(:execute)
     RestClient::Request.execute(1 => 2)
@@ -258,36 +258,36 @@ describe RestClient::Request do
 
   describe "exception" do
     it "raises Unauthorized when the response is 401" do
-      res = mock('response', :code => '401', :[] => ['content-encoding' => ''], :body => '' )
+      res = double('response', :code => '401', :[] => ['content-encoding' => ''], :body => '' )
       lambda { @request.process_result(res) }.should raise_error(RestClient::Unauthorized)
     end
 
     it "raises ResourceNotFound when the response is 404" do
-      res = mock('response', :code => '404', :[] => ['content-encoding' => ''], :body => '' )
+      res = double('response', :code => '404', :[] => ['content-encoding' => ''], :body => '' )
       lambda { @request.process_result(res) }.should raise_error(RestClient::ResourceNotFound)
     end
 
     it "raises RequestFailed otherwise" do
-      res = mock('response', :code => '500', :[] => ['content-encoding' => ''], :body => '' )
+      res = double('response', :code => '500', :[] => ['content-encoding' => ''], :body => '' )
       lambda { @request.process_result(res) }.should raise_error(RestClient::InternalServerError)
     end
   end
 
   describe "block usage" do
     it "returns what asked to" do
-      res = mock('response', :code => '401', :[] => ['content-encoding' => ''], :body => '' )
-      @request.process_result(res){|response, request| "foo"}.should == "foo"
+      res = double('response', :code => '401', :[] => ['content-encoding' => ''], :body => '' )
+      @request.process_result(res){|response, request| "foo"}.should eq "foo"
     end
   end
 
   describe "proxy" do
     it "creates a proxy class if a proxy url is given" do
-      RestClient.stub!(:proxy).and_return("http://example.com/")
-      @request.net_http_class.should include(Net::HTTP::ProxyDelta)
+      RestClient.stub(:proxy).and_return("http://example.com/")
+      @request.net_http_class.proxy_class?.should be_true
     end
 
     it "creates a non-proxy class if a proxy url is not given" do
-      @request.net_http_class.should_not include(Net::HTTP::ProxyDelta)
+      @request.net_http_class.proxy_class?.should be_false
     end
   end
 
@@ -296,66 +296,66 @@ describe RestClient::Request do
     it "logs a get request" do
       log = RestClient.log = []
       RestClient::Request.new(:method => :get, :url => 'http://url').log_request
-      log[0].should == %Q{RestClient.get "http://url", "Accept"=>"*/*; q=0.5, application/xml", "Accept-Encoding"=>"gzip, deflate"\n}
+      log[0].should eq %Q{RestClient.get "http://url", "Accept"=>"*/*; q=0.5, application/xml", "Accept-Encoding"=>"gzip, deflate"\n}
     end
 
     it "logs a post request with a small payload" do
       log = RestClient.log = []
       RestClient::Request.new(:method => :post, :url => 'http://url', :payload => 'foo').log_request
-      log[0].should == %Q{RestClient.post "http://url", "foo", "Accept"=>"*/*; q=0.5, application/xml", "Accept-Encoding"=>"gzip, deflate", "Content-Length"=>"3"\n}
+      log[0].should eq %Q{RestClient.post "http://url", "foo", "Accept"=>"*/*; q=0.5, application/xml", "Accept-Encoding"=>"gzip, deflate", "Content-Length"=>"3"\n}
     end
 
     it "logs a post request with a large payload" do
       log = RestClient.log = []
       RestClient::Request.new(:method => :post, :url => 'http://url', :payload => ('x' * 1000)).log_request
-      log[0].should == %Q{RestClient.post "http://url", 1000 byte(s) length, "Accept"=>"*/*; q=0.5, application/xml", "Accept-Encoding"=>"gzip, deflate", "Content-Length"=>"1000"\n}
+      log[0].should eq %Q{RestClient.post "http://url", 1000 byte(s) length, "Accept"=>"*/*; q=0.5, application/xml", "Accept-Encoding"=>"gzip, deflate", "Content-Length"=>"1000"\n}
     end
 
     it "logs input headers as a hash" do
       log = RestClient.log = []
       RestClient::Request.new(:method => :get, :url => 'http://url', :headers => { :accept => 'text/plain' }).log_request
-      log[0].should == %Q{RestClient.get "http://url", "Accept"=>"text/plain", "Accept-Encoding"=>"gzip, deflate"\n}
+      log[0].should eq %Q{RestClient.get "http://url", "Accept"=>"text/plain", "Accept-Encoding"=>"gzip, deflate"\n}
     end
 
     it "logs a response including the status code, content type, and result body size in bytes" do
       log = RestClient.log = []
-      res = mock('result', :code => '200', :class => Net::HTTPOK, :body => 'abcd')
-      res.stub!(:[]).with('Content-type').and_return('text/html')
+      res = double('result', :code => '200', :class => Net::HTTPOK, :body => 'abcd')
+      res.stub(:[]).with('Content-type').and_return('text/html')
       @request.log_response res
-      log[0].should == "# => 200 OK | text/html 4 bytes\n"
+      log[0].should eq "# => 200 OK | text/html 4 bytes\n"
     end
 
     it "logs a response with a nil Content-type" do
       log = RestClient.log = []
-      res = mock('result', :code => '200', :class => Net::HTTPOK, :body => 'abcd')
-      res.stub!(:[]).with('Content-type').and_return(nil)
+      res = double('result', :code => '200', :class => Net::HTTPOK, :body => 'abcd')
+      res.stub(:[]).with('Content-type').and_return(nil)
       @request.log_response res
-      log[0].should == "# => 200 OK |  4 bytes\n"
+      log[0].should eq "# => 200 OK |  4 bytes\n"
     end
 
     it "logs a response with a nil body" do
       log = RestClient.log = []
-      res = mock('result', :code => '200', :class => Net::HTTPOK, :body => nil)
-      res.stub!(:[]).with('Content-type').and_return('text/html; charset=utf-8')
+      res = double('result', :code => '200', :class => Net::HTTPOK, :body => nil)
+      res.stub(:[]).with('Content-type').and_return('text/html; charset=utf-8')
       @request.log_response res
-      log[0].should == "# => 200 OK | text/html 0 bytes\n"
+      log[0].should eq "# => 200 OK | text/html 0 bytes\n"
     end
   end
 
   it "strips the charset from the response content type" do
     log = RestClient.log = []
-    res = mock('result', :code => '200', :class => Net::HTTPOK, :body => 'abcd')
-    res.stub!(:[]).with('Content-type').and_return('text/html; charset=utf-8')
+    res = double('result', :code => '200', :class => Net::HTTPOK, :body => 'abcd')
+    res.stub(:[]).with('Content-type').and_return('text/html; charset=utf-8')
     @request.log_response res
-    log[0].should == "# => 200 OK | text/html 4 bytes\n"
+    log[0].should eq "# => 200 OK | text/html 4 bytes\n"
   end
 
   describe "timeout" do
     it "set read_timeout" do
       @request = RestClient::Request.new(:method => :put, :url => 'http://some/resource', :payload => 'payload', :timeout => 123)
-      @http.stub!(:request)
-      @request.stub!(:process_result)
-      @request.stub!(:response_log)
+      @http.stub(:request)
+      @request.stub(:process_result)
+      @request.stub(:response_log)
 
       @net.should_receive(:read_timeout=).with(123)
 
@@ -364,9 +364,9 @@ describe RestClient::Request do
 
     it "set open_timeout" do
       @request = RestClient::Request.new(:method => :put, :url => 'http://some/resource', :payload => 'payload', :open_timeout => 123)
-      @http.stub!(:request)
-      @request.stub!(:process_result)
-      @request.stub!(:response_log)
+      @http.stub(:request)
+      @request.stub(:process_result)
+      @request.stub(:response_log)
 
       @net.should_receive(:open_timeout=).with(123)
 
@@ -376,32 +376,32 @@ describe RestClient::Request do
 
   describe "ssl" do
     it "uses SSL when the URI refers to a https address" do
-      @uri.stub!(:is_a?).with(URI::HTTPS).and_return(true)
+      @uri.stub(:is_a?).with(URI::HTTPS).and_return(true)
       @net.should_receive(:use_ssl=).with(true)
-      @http.stub!(:request)
-      @request.stub!(:process_result)
-      @request.stub!(:response_log)
+      @http.stub(:request)
+      @request.stub(:process_result)
+      @request.stub(:response_log)
       @request.transmit(@uri, 'req', 'payload')
     end
 
     it "should default to not verifying ssl certificates" do
-      @request.verify_ssl.should == false
+      @request.verify_ssl.should eq false
     end
 
     it "should set net.verify_mode to OpenSSL::SSL::VERIFY_NONE if verify_ssl is false" do
       @net.should_receive(:verify_mode=).with(OpenSSL::SSL::VERIFY_NONE)
-      @http.stub!(:request)
-      @request.stub!(:process_result)
-      @request.stub!(:response_log)
+      @http.stub(:request)
+      @request.stub(:process_result)
+      @request.stub(:response_log)
       @request.transmit(@uri, 'req', 'payload')
     end
 
     it "should not set net.verify_mode to OpenSSL::SSL::VERIFY_NONE if verify_ssl is true" do
       @request = RestClient::Request.new(:method => :put, :url => 'https://some/resource', :payload => 'payload', :verify_ssl => true)
       @net.should_not_receive(:verify_mode=).with(OpenSSL::SSL::VERIFY_NONE)
-      @http.stub!(:request)
-      @request.stub!(:process_result)
-      @request.stub!(:response_log)
+      @http.stub(:request)
+      @request.stub(:process_result)
+      @request.stub(:response_log)
       @request.transmit(@uri, 'req', 'payload')
     end
 
@@ -412,10 +412,9 @@ describe RestClient::Request do
                                           :payload => 'payload',
                                           :verify_ssl => mode )
       @net.should_receive(:verify_mode=).with(mode)
-      @net.should_receive(:verify_callback=)
-      @http.stub!(:request)
-      @request.stub!(:process_result)
-      @request.stub!(:response_log)
+      @http.stub(:request)
+      @request.stub(:process_result)
+      @request.stub(:response_log)
       @request.transmit(@uri, 'req', 'payload')
     end
 
@@ -431,9 +430,9 @@ describe RestClient::Request do
               :ssl_client_cert => "whatsupdoc!"
       )
       @net.should_receive(:cert=).with("whatsupdoc!")
-      @http.stub!(:request)
-      @request.stub!(:process_result)
-      @request.stub!(:response_log)
+      @http.stub(:request)
+      @request.stub(:process_result)
+      @request.stub(:response_log)
       @request.transmit(@uri, 'req', 'payload')
     end
 
@@ -444,9 +443,9 @@ describe RestClient::Request do
               :payload => 'payload'
       )
       @net.should_not_receive(:cert=).with("whatsupdoc!")
-      @http.stub!(:request)
-      @request.stub!(:process_result)
-      @request.stub!(:response_log)
+      @http.stub(:request)
+      @request.stub(:process_result)
+      @request.stub(:response_log)
       @request.transmit(@uri, 'req', 'payload')
     end
 
@@ -462,9 +461,9 @@ describe RestClient::Request do
               :ssl_client_key => "whatsupdoc!"
       )
       @net.should_receive(:key=).with("whatsupdoc!")
-      @http.stub!(:request)
-      @request.stub!(:process_result)
-      @request.stub!(:response_log)
+      @http.stub(:request)
+      @request.stub(:process_result)
+      @request.stub(:response_log)
       @request.transmit(@uri, 'req', 'payload')
     end
 
@@ -475,9 +474,9 @@ describe RestClient::Request do
               :payload => 'payload'
       )
       @net.should_not_receive(:key=).with("whatsupdoc!")
-      @http.stub!(:request)
-      @request.stub!(:process_result)
-      @request.stub!(:response_log)
+      @http.stub(:request)
+      @request.stub(:process_result)
+      @request.stub(:response_log)
       @request.transmit(@uri, 'req', 'payload')
     end
 
@@ -493,9 +492,9 @@ describe RestClient::Request do
               :ssl_ca_file => "Certificate Authority File"
       )
       @net.should_receive(:ca_file=).with("Certificate Authority File")
-      @http.stub!(:request)
-      @request.stub!(:process_result)
-      @request.stub!(:response_log)
+      @http.stub(:request)
+      @request.stub(:process_result)
+      @request.stub(:response_log)
       @request.transmit(@uri, 'req', 'payload')
     end
 
@@ -506,9 +505,9 @@ describe RestClient::Request do
               :payload => 'payload'
       )
       @net.should_not_receive(:ca_file=).with("Certificate Authority File")
-      @http.stub!(:request)
-      @request.stub!(:process_result)
-      @request.stub!(:response_log)
+      @http.stub(:request)
+      @request.stub(:process_result)
+      @request.stub(:response_log)
       @request.transmit(@uri, 'req', 'payload')
     end
   end
@@ -520,10 +519,10 @@ describe RestClient::Request do
             :payload => 'payload'
     )
     net_http_res = Net::HTTPNoContent.new("", "204", "No Content")
-    net_http_res.stub!(:read_body).and_return(nil)
+    net_http_res.stub(:read_body).and_return(nil)
     @http.should_receive(:request).and_return(@request.fetch_body(net_http_res))
     response = @request.transmit(@uri, 'req', 'payload')
     response.should_not be_nil
-    response.code.should == 204
+    response.code.should eq 204
   end
 end