rest-client 1.7.2 → 2.1.0

data/spec/unit/request_spec.rb

@@ -1,120 +1,206 @@
-require 'spec_helper'
+require_relative './_lib'
 
-describe RestClient::Request do
+describe RestClient::Request, :include_helpers do
   before do
     @request = RestClient::Request.new(:method => :put, :url => 'http://some/resource', :payload => 'payload')
 
     @uri = double("uri")
-    @uri.stub(:request_uri).and_return('/resource')
-    @uri.stub(:host).and_return('some')
-    @uri.stub(:port).and_return(80)
+    allow(@uri).to receive(:request_uri).and_return('/resource')
+    allow(@uri).to receive(:hostname).and_return('some')
+    allow(@uri).to receive(: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=)
-    @net.stub(:verify_callback=)
+
+    allow(Net::HTTP).to receive(:new).and_return(@net)
+
+    allow(@net).to receive(:start).and_yield(@http)
+    allow(@net).to receive(:use_ssl=)
+    allow(@net).to receive(:verify_mode=)
+    allow(@net).to receive(:verify_callback=)
     allow(@net).to receive(:ciphers=)
     allow(@net).to receive(:cert_store=)
     RestClient.log = nil
   end
 
-  it "accept */* mimetype, preferring xml" do
-    @request.default_headers[:accept].should eq '*/*; q=0.5, application/xml'
+  it "accept */* mimetype" do
+    expect(@request.default_headers[:accept]).to eq '*/*'
   end
 
-  describe "compression" do
+  it "processes a successful result" do
+    res = res_double
+    allow(res).to receive(:code).and_return("200")
+    allow(res).to receive(:body).and_return('body')
+    allow(res).to receive(:[]).with('content-encoding').and_return(nil)
+    expect(@request.send(:process_result, res, Time.now).body).to eq 'body'
+    expect(@request.send(:process_result, res, Time.now).to_s).to eq 'body'
+  end
 
-    it "decodes an uncompressed result body by passing it straight through" do
-      RestClient::Request.decode(nil, 'xyz').should eq 'xyz'
+  it "doesn't classify successful requests as failed" do
+    203.upto(207) do |code|
+      res = res_double
+      allow(res).to receive(:code).and_return(code.to_s)
+      allow(res).to receive(:body).and_return("")
+      allow(res).to receive(:[]).with('content-encoding').and_return(nil)
+      expect(@request.send(:process_result, res, Time.now)).to be_empty
     end
+  end
 
-    it "doesn't fail for nil bodies" do
-      RestClient::Request.decode('gzip', nil).should be_nil
+  describe '.normalize_url' do
+    it "adds http:// to the front of resources specified in the syntax example.com/resource" do
+      expect(@request.normalize_url('example.com/resource')).to eq 'http://example.com/resource'
     end
 
-
-    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 eq "i'm gziped\n"
+    it 'adds http:// to resources containing a colon' do
+      expect(@request.normalize_url('example.com:1234')).to eq 'http://example.com:1234'
     end
 
-    it "ingores gzip for empty bodies" do
-      RestClient::Request.decode('gzip', '').should be_empty
+    it 'does not add http:// to the front of https resources' do
+      expect(@request.normalize_url('https://example.com/resource')).to eq 'https://example.com/resource'
     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 eq "some deflated text"
+    it 'does not add http:// to the front of capital HTTP resources' do
+      expect(@request.normalize_url('HTTP://example.com/resource')).to eq 'HTTP://example.com/resource'
     end
-  end
 
-  it "processes a successful result" do
-    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 = 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
+    it 'does not add http:// to the front of capital HTTPS resources' do
+      expect(@request.normalize_url('HTTPS://example.com/resource')).to eq 'HTTPS://example.com/resource'
     end
-  end
 
-  it "parses a url into a URI object" do
-    URI.should_receive(:parse).with('http://example.com/resource')
-    @request.parse_url('http://example.com/resource')
-  end
-
-  it "adds http:// to the front of resources specified in the syntax example.com/resource" do
-    URI.should_receive(:parse).with('http://example.com/resource')
-    @request.parse_url('example.com/resource')
+    it 'raises with invalid URI' do
+      expect {
+        RestClient::Request.new(method: :get, url: 'http://a@b:c')
+      }.to raise_error(URI::InvalidURIError)
+      expect {
+        RestClient::Request.new(method: :get, url: 'http://::')
+      }.to raise_error(URI::InvalidURIError)
+    end
   end
 
   describe "user - password" do
     it "extracts the username and password when parsing http://user:password@example.com/" do
-      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 eq 'joe'
-      @request.password.should eq 'pass1'
+      @request.send(:parse_url_with_auth!, 'http://joe:pass1@example.com/resource')
+      expect(@request.user).to eq 'joe'
+      expect(@request.password).to eq 'pass1'
     end
 
     it "extracts with escaping the username and password when parsing http://user:password@example.com/" do
-      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 eq 'joe '
-      @request.password.should eq 'pass1'
+      @request.send(:parse_url_with_auth!, 'http://joe%20:pass1@example.com/resource')
+      expect(@request.user).to eq 'joe '
+      expect(@request.password).to 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(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 eq 'beth'
-      @request.password.should eq 'pass2'
+      request = RestClient::Request.new(method: :get, url: 'http://example.com/resource', user: 'beth', password: 'pass2')
+      expect(request.user).to eq 'beth'
+      expect(request.password).to eq 'pass2'
+    end
+
+    it 'uses the username and password from the URL' do
+      request = RestClient::Request.new(method: :get, url: 'http://person:secret@example.com/resource')
+      expect(request.user).to eq 'person'
+      expect(request.password).to eq 'secret'
+    end
+
+    it 'overrides URL user/pass with explicit options' do
+      request = RestClient::Request.new(method: :get, url: 'http://person:secret@example.com/resource', user: 'beth', password: 'pass2')
+      expect(request.user).to eq 'beth'
+      expect(request.password).to eq 'pass2'
     end
   end
 
   it "correctly formats cookies provided to the constructor" do
-    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 eq({ 'Foo' => 'bar', 'Cookie' => 'session_id=1; user_id=someone'})
+    cookies_arr = [
+      HTTP::Cookie.new('session_id', '1', domain: 'example.com', path: '/'),
+      HTTP::Cookie.new('user_id', 'someone', domain: 'example.com', path: '/'),
+    ]
+
+    jar = HTTP::CookieJar.new
+    cookies_arr.each {|c| jar << c }
+
+    # test Hash, HTTP::CookieJar, and Array<HTTP::Cookie> modes
+    [
+      {session_id: '1', user_id: 'someone'},
+      jar,
+      cookies_arr
+    ].each do |cookies|
+      [true, false].each do |in_headers|
+        if in_headers
+          opts = {headers: {cookies: cookies}}
+        else
+          opts = {cookies: cookies}
+        end
+
+        request = RestClient::Request.new(method: :get, url: 'example.com', **opts)
+        expect(request).to receive(:default_headers).and_return({'Foo' => 'bar'})
+        expect(request.make_headers({})).to eq({'Foo' => 'bar', 'Cookie' => 'session_id=1; user_id=someone'})
+        expect(request.make_cookie_header).to eq 'session_id=1; user_id=someone'
+        expect(request.cookies).to eq({'session_id' => '1', 'user_id' => 'someone'})
+        expect(request.cookie_jar.cookies.length).to eq 2
+        expect(request.cookie_jar.object_id).not_to eq jar.object_id # make sure we dup it
+      end
+    end
+
+    # test with no cookies
+    request = RestClient::Request.new(method: :get, url: 'example.com')
+    expect(request).to receive(:default_headers).and_return({'Foo' => 'bar'})
+    expect(request.make_headers({})).to eq({'Foo' => 'bar'})
+    expect(request.make_cookie_header).to be_nil
+    expect(request.cookies).to eq({})
+    expect(request.cookie_jar.cookies.length).to eq 0
+  end
+
+  it 'strips out cookies set for a different domain name' do
+    jar = HTTP::CookieJar.new
+    jar << HTTP::Cookie.new('session_id', '1', domain: 'other.example.com', path: '/')
+    jar << HTTP::Cookie.new('user_id', 'someone', domain: 'other.example.com', path: '/')
+
+    request = RestClient::Request.new(method: :get, url: 'www.example.com', cookies: jar)
+    expect(request).to receive(:default_headers).and_return({'Foo' => 'bar'})
+    expect(request.make_headers({})).to eq({'Foo' => 'bar'})
+    expect(request.make_cookie_header).to eq nil
+    expect(request.cookies).to eq({})
+    expect(request.cookie_jar.cookies.length).to eq 2
+  end
+
+  it 'assumes default domain and path for cookies set by hash' do
+    request = RestClient::Request.new(method: :get, url: 'www.example.com', cookies: {'session_id' => '1'})
+    expect(request.cookie_jar.cookies.length).to eq 1
+
+    cookie = request.cookie_jar.cookies.first
+    expect(cookie).to be_a(HTTP::Cookie)
+    expect(cookie.domain).to eq('www.example.com')
+    expect(cookie.for_domain?).to be_truthy
+    expect(cookie.path).to eq('/')
+  end
+
+  it 'rejects or warns with contradictory cookie options' do
+    # same opt in two different places
+    expect {
+      RestClient::Request.new(method: :get, url: 'example.com',
+                              cookies: {bar: '456'},
+                              headers: {cookies: {foo: '123'}})
+    }.to raise_error(ArgumentError, /Cannot pass :cookies in Request.*headers/)
+
+    # :cookies opt and Cookie header
+    [
+      {cookies: {foo: '123'}, headers: {cookie: 'foo'}},
+      {cookies: {foo: '123'}, headers: {'Cookie' => 'foo'}},
+      {headers: {cookies: {foo: '123'}, cookie: 'foo'}},
+      {headers: {cookies: {foo: '123'}, 'Cookie' => 'foo'}},
+    ].each do |opts|
+      expect(fake_stderr {
+        RestClient::Request.new(method: :get, url: 'example.com', **opts)
+      }).to match(/warning: overriding "Cookie" header with :cookies option/)
+    end
   end
 
   it "does not escape or unescape cookies" do
     cookie = 'Foo%20:Bar%0A~'
     @request = RestClient::Request.new(:method => 'get', :url => 'example.com',
                                        :cookies => {:test => cookie})
-    @request.should_receive(:default_headers).and_return({'Foo' => 'bar'})
-    @request.make_headers({}).should eq({
+    expect(@request).to receive(:default_headers).and_return({'Foo' => 'bar'})
+    expect(@request.make_headers({})).to eq({
       'Foo' => 'bar',
       'Cookie' => "test=#{cookie}"
     })
@@ -124,244 +210,409 @@ describe RestClient::Request do
     # Cookie validity is something of a mess, but we should reject the worst of
     # the RFC 6265 (4.1.1) prohibited characters such as control characters.
 
-    ['', 'foo=bar', 'foo;bar', "foo\nbar"].each do |cookie_name|
-      lambda {
+    ['foo=bar', 'foo;bar', "foo\nbar"].each do |cookie_name|
+      expect {
         RestClient::Request.new(:method => 'get', :url => 'example.com',
                                 :cookies => {cookie_name => 'value'})
-      }.should raise_error(ArgumentError, /\AInvalid cookie name/)
+      }.to raise_error(ArgumentError, /\AInvalid cookie name/i)
     end
+
+    cookie_name = ''
+    expect {
+      RestClient::Request.new(:method => 'get', :url => 'example.com',
+                              :cookies => {cookie_name => 'value'})
+    }.to raise_error(ArgumentError, /cookie name cannot be empty/i)
   end
 
   it "rejects cookie values containing invalid characters" do
     # Cookie validity is something of a mess, but we should reject the worst of
     # the RFC 6265 (4.1.1) prohibited characters such as control characters.
 
-    ['foo,bar', 'foo;bar', "foo\nbar"].each do |cookie_value|
-      lambda {
+    ["foo\tbar", "foo\nbar"].each do |cookie_value|
+      expect {
         RestClient::Request.new(:method => 'get', :url => 'example.com',
                                 :cookies => {'test' => cookie_value})
-      }.should raise_error(ArgumentError, /\AInvalid cookie value/)
+      }.to raise_error(ArgumentError, /\AInvalid cookie value/i)
     end
   end
 
+  it 'warns when overriding existing headers via payload' do
+    expect(fake_stderr {
+      RestClient::Request.new(method: :post, url: 'example.com',
+                              payload: {'foo' => 1}, headers: {content_type: :json})
+    }).to match(/warning: Overriding "Content-Type" header/i)
+    expect(fake_stderr {
+      RestClient::Request.new(method: :post, url: 'example.com',
+                              payload: {'foo' => 1}, headers: {'Content-Type' => 'application/json'})
+    }).to match(/warning: Overriding "Content-Type" header/i)
+
+    expect(fake_stderr {
+      RestClient::Request.new(method: :post, url: 'example.com',
+                              payload: '123456', headers: {content_length: '20'})
+    }).to match(/warning: Overriding "Content-Length" header/i)
+    expect(fake_stderr {
+      RestClient::Request.new(method: :post, url: 'example.com',
+                              payload: '123456', headers: {'Content-Length' => '20'})
+    }).to match(/warning: Overriding "Content-Length" header/i)
+  end
+
+  it "does not warn when overriding user header with header derived from payload if those header values were identical" do
+    expect(fake_stderr {
+      RestClient::Request.new(method: :post, url: 'example.com',
+                              payload: {'foo' => '123456'}, headers: { 'Content-Type' => 'application/x-www-form-urlencoded' })
+    }).not_to match(/warning: Overriding "Content-Type" header/i)
+  end
+
+  it 'does not warn for a normal looking payload' do
+    expect(fake_stderr {
+      RestClient::Request.new(method: :post, url: 'example.com', payload: 'payload')
+      RestClient::Request.new(method: :post, url: 'example.com', payload: 'payload', headers: {content_type: :json})
+      RestClient::Request.new(method: :post, url: 'example.com', payload: {'foo' => 'bar'})
+    }).to eq ''
+  end
+
   it "uses netrc credentials" do
-    URI.stub(:parse).and_return(double('uri', :user => nil, :password => nil, :host => 'example.com'))
-    Netrc.stub(:read).and_return('example.com' => ['a', 'b'])
-    @request.parse_url_with_auth('http://example.com/resource')
-    @request.user.should eq 'a'
-    @request.password.should eq 'b'
+    expect(Netrc).to receive(:read).and_return('example.com' => ['a', 'b'])
+    request = RestClient::Request.new(:method => :put, :url => 'http://example.com/', :payload => 'payload')
+    expect(request.user).to eq 'a'
+    expect(request.password).to eq 'b'
   end
 
   it "uses credentials in the url in preference to netrc" do
-    URI.stub(:parse).and_return(double('uri', :user => 'joe%20', :password => 'pass1', :host => 'example.com'))
-    Netrc.stub(:read).and_return('example.com' => ['a', 'b'])
-    @request.parse_url_with_auth('http://joe%20:pass1@example.com/resource')
-    @request.user.should eq 'joe '
-    @request.password.should eq 'pass1'
+    allow(Netrc).to receive(:read).and_return('example.com' => ['a', 'b'])
+    request = RestClient::Request.new(:method => :put, :url =>  'http://joe%20:pass1@example.com/', :payload => 'payload')
+    expect(request.user).to eq 'joe '
+    expect(request.password).to eq 'pass1'
   end
 
   it "determines the Net::HTTP class to instantiate by the method name" do
-    @request.net_http_request_class(:put).should eq Net::HTTP::Put
+    expect(@request.net_http_request_class(:put)).to eq Net::HTTP::Put
   end
 
   describe "user headers" do
     it "merges user headers with the default headers" do
-      @request.should_receive(:default_headers).and_return({ :accept => '*/*; q=0.5, application/xml', :accept_encoding => 'gzip, deflate' })
+      expect(@request).to receive(:default_headers).and_return({:accept => '*/*'})
       headers = @request.make_headers("Accept" => "application/json", :accept_encoding => 'gzip')
-      headers.should have_key "Accept-Encoding"
-      headers["Accept-Encoding"].should eq "gzip"
-      headers.should have_key "Accept"
-      headers["Accept"].should eq "application/json"
+      expect(headers).to have_key "Accept-Encoding"
+      expect(headers["Accept-Encoding"]).to eq "gzip"
+      expect(headers).to have_key "Accept"
+      expect(headers["Accept"]).to 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' })
+      expect(@request).to receive(:default_headers).and_return({ '1' => '2' })
       headers = @request.make_headers('1' => '3')
-      headers.should have_key('1')
-      headers['1'].should eq '3'
+      expect(headers).to have_key('1')
+      expect(headers['1']).to eq '3'
     end
 
     it "converts user headers to string before calling CGI::unescape which fails on non string values" do
-      @request.should_receive(:default_headers).and_return({ '1' => '2' })
+      expect(@request).to receive(:default_headers).and_return({ '1' => '2' })
       headers = @request.make_headers('1' => 3)
-      headers.should have_key('1')
-      headers['1'].should eq '3'
+      expect(headers).to have_key('1')
+      expect(headers['1']).to eq '3'
     end
   end
 
   describe "header symbols" do
 
     it "converts header symbols from :content_type to 'Content-Type'" do
-      @request.should_receive(:default_headers).and_return({})
+      expect(@request).to receive(:default_headers).and_return({})
       headers = @request.make_headers(:content_type => 'abc')
-      headers.should have_key('Content-Type')
-      headers['Content-Type'].should eq 'abc'
+      expect(headers).to have_key('Content-Type')
+      expect(headers['Content-Type']).to eq 'abc'
     end
 
     it "converts content-type from extension to real content-type" do
-      @request.should_receive(:default_headers).and_return({})
+      expect(@request).to receive(:default_headers).and_return({})
       headers = @request.make_headers(:content_type => 'json')
-      headers.should have_key('Content-Type')
-      headers['Content-Type'].should eq 'application/json'
+      expect(headers).to have_key('Content-Type')
+      expect(headers['Content-Type']).to eq 'application/json'
     end
 
     it "converts accept from extension(s) to real content-type(s)" do
-      @request.should_receive(:default_headers).and_return({})
+      expect(@request).to receive(:default_headers).and_return({})
       headers = @request.make_headers(:accept => 'json, mp3')
-      headers.should have_key('Accept')
-      headers['Accept'].should eq 'application/json, audio/mpeg'
+      expect(headers).to have_key('Accept')
+      expect(headers['Accept']).to eq 'application/json, audio/mpeg'
 
-      @request.should_receive(:default_headers).and_return({})
+      expect(@request).to receive(:default_headers).and_return({})
       headers = @request.make_headers(:accept => :json)
-      headers.should have_key('Accept')
-      headers['Accept'].should eq 'application/json'
+      expect(headers).to have_key('Accept')
+      expect(headers['Accept']).to eq 'application/json'
     end
 
     it "only convert symbols in header" do
-      @request.should_receive(:default_headers).and_return({})
+      expect(@request).to receive(:default_headers).and_return({})
       headers = @request.make_headers({:foo_bar => 'value', "bar_bar" => 'value'})
-      headers['Foo-Bar'].should eq 'value'
-      headers['bar_bar'].should eq 'value'
+      expect(headers['Foo-Bar']).to eq 'value'
+      expect(headers['bar_bar']).to eq 'value'
     end
 
     it "converts header values to strings" do
-      @request.make_headers('A' => 1)['A'].should eq '1'
+      expect(@request.make_headers('A' => 1)['A']).to 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 = 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))
+    expect(@request).to receive(:net_http_request_class).with('put').and_return(klass)
+    expect(klass).to receive(:new).and_return('result')
+    expect(@request).to receive(:transmit).with(@request.uri, 'result', kind_of(RestClient::Payload::Base))
+    @request.execute
+  end
+
+  it "IPv6: executes by constructing the Net::HTTP object, headers, and payload and calling transmit" do
+    @request = RestClient::Request.new(:method => :put, :url => 'http://[::1]/some/resource', :payload => 'payload')
+    klass = double("net:http class")
+    expect(@request).to receive(:net_http_request_class).with('put').and_return(klass)
+
+    if RUBY_VERSION >= "2.0.0"
+      expect(klass).to receive(:new).with(kind_of(URI), kind_of(Hash)).and_return('result')
+    else
+      expect(klass).to receive(:new).with(kind_of(String), kind_of(Hash)).and_return('result')
+    end
+
+    expect(@request).to receive(:transmit)
     @request.execute
   end
 
+  # TODO: almost none of these tests should actually call transmit, which is
+  # part of the private API
+
   it "transmits the request with Net::HTTP" do
-    @http.should_receive(:request).with('req', 'payload')
-    @request.should_receive(:process_result)
-    @request.transmit(@uri, 'req', 'payload')
+    expect(@http).to receive(:request).with('req', 'payload')
+    expect(@request).to receive(:process_result)
+    @request.send(:transmit, @uri, 'req', 'payload')
   end
 
+  # TODO: most of these payload tests are historical relics that actually
+  # belong in payload_spec.rb. Or we need new tests that actually cover the way
+  # that Request#initialize or Request#execute uses the payload.
   describe "payload" do
     it "sends nil payloads" do
-      @http.should_receive(:request).with('req', nil)
-      @request.should_receive(:process_result)
-      @request.stub(:response_log)
-      @request.transmit(@uri, 'req', nil)
+      expect(@http).to receive(:request).with('req', nil)
+      expect(@request).to receive(:process_result)
+      allow(@request).to receive(:response_log)
+      @request.send(:transmit, @uri, 'req', nil)
     end
 
     it "passes non-hash payloads straight through" do
-      @request.process_payload("x").should eq "x"
+      expect(RestClient::Payload.generate("x").to_s).to eq "x"
     end
 
     it "converts a hash payload to urlencoded data" do
-      @request.process_payload(:a => 'b c+d').should eq "a=b%20c%2Bd"
+      expect(RestClient::Payload.generate(:a => 'b c+d').to_s).to eq "a=b+c%2Bd"
     end
 
     it "accepts nested hashes in payload" do
-      payload = @request.process_payload(:user => { :name => 'joe', :location => { :country => 'USA', :state => 'CA' }})
-      payload.should include('user[name]=joe')
-      payload.should include('user[location][country]=USA')
-      payload.should include('user[location][state]=CA')
+      payload = RestClient::Payload.generate(:user => { :name => 'joe', :location => { :country => 'USA', :state => 'CA' }}).to_s
+      expect(payload).to include('user[name]=joe')
+      expect(payload).to include('user[location][country]=USA')
+      expect(payload).to include('user[location][state]=CA')
     end
   end
 
   it "set urlencoded content_type header on hash payloads" do
-    @request.process_payload(:a => 1)
-    @request.headers[:content_type].should eq 'application/x-www-form-urlencoded'
+    req = RestClient::Request.new(method: :post, url: 'http://some/resource', payload: {a: 1})
+    expect(req.processed_headers.fetch('Content-Type')).to eq 'application/x-www-form-urlencoded'
   end
 
   describe "credentials" do
     it "sets up the credentials prior to the request" do
-      @http.stub(:request)
+      allow(@http).to receive(:request)
 
-      @request.stub(:process_result)
-      @request.stub(:response_log)
+      allow(@request).to receive(:process_result)
+      allow(@request).to receive(:response_log)
 
-      @request.stub(:user).and_return('joe')
-      @request.stub(:password).and_return('mypass')
-      @request.should_receive(:setup_credentials).with('req')
+      allow(@request).to receive(:user).and_return('joe')
+      allow(@request).to receive(:password).and_return('mypass')
+      expect(@request).to receive(:setup_credentials).with('req')
 
-      @request.transmit(@uri, 'req', nil)
+      @request.send(:transmit, @uri, 'req', nil)
     end
 
     it "does not attempt to send any credentials if user is nil" do
-      @request.stub(:user).and_return(nil)
+      allow(@request).to receive(:user).and_return(nil)
       req = double("request")
-      req.should_not_receive(:basic_auth)
-      @request.setup_credentials(req)
+      expect(req).not_to receive(:basic_auth)
+      @request.send(: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')
+      allow(@request).to receive(:user).and_return('joe')
+      allow(@request).to receive(:password).and_return('mypass')
       req = double("request")
-      req.should_receive(:basic_auth).with('joe', 'mypass')
-      @request.setup_credentials(req)
+      expect(req).to receive(:basic_auth).with('joe', 'mypass')
+      @request.send(:setup_credentials, req)
+    end
+
+    it "does not attempt to send credentials if Authorization header is set" do
+      ['Authorization', 'authorization', 'auTHORization', :authorization].each do |authorization|
+        headers = {authorization => 'Token abc123'}
+        request = RestClient::Request.new(method: :get, url: 'http://some/resource', headers: headers, user: 'joe', password: 'mypass')
+        req = double("net::http request")
+        expect(req).not_to receive(:basic_auth)
+        request.send(:setup_credentials, req)
+      end
     end
   end
 
   it "catches EOFError and shows the more informative ServerBrokeConnection" do
-    @http.stub(:request).and_raise(EOFError)
-    lambda { @request.transmit(@uri, 'req', nil) }.should raise_error(RestClient::ServerBrokeConnection)
+    allow(@http).to receive(:request).and_raise(EOFError)
+    expect { @request.send(:transmit, @uri, 'req', nil) }.to raise_error(RestClient::ServerBrokeConnection)
   end
 
   it "catches OpenSSL::SSL::SSLError and raise it back without more informative message" do
-    @http.stub(:request).and_raise(OpenSSL::SSL::SSLError)
-    lambda { @request.transmit(@uri, 'req', nil) }.should raise_error(OpenSSL::SSL::SSLError)
+    allow(@http).to receive(:request).and_raise(OpenSSL::SSL::SSLError)
+    expect { @request.send(:transmit, @uri, 'req', nil) }.to raise_error(OpenSSL::SSL::SSLError)
+  end
+
+  it "catches Timeout::Error and raise the more informative ReadTimeout" do
+    allow(@http).to receive(:request).and_raise(Timeout::Error)
+    expect { @request.send(:transmit, @uri, 'req', nil) }.to raise_error(RestClient::Exceptions::ReadTimeout)
+  end
+
+  it "catches Errno::ETIMEDOUT and raise the more informative ReadTimeout" do
+    allow(@http).to receive(:request).and_raise(Errno::ETIMEDOUT)
+    expect { @request.send(:transmit, @uri, 'req', nil) }.to raise_error(RestClient::Exceptions::ReadTimeout)
   end
 
-  it "catches Timeout::Error and raise the more informative RequestTimeout" do
-    @http.stub(:request).and_raise(Timeout::Error)
-    lambda { @request.transmit(@uri, 'req', nil) }.should raise_error(RestClient::RequestTimeout)
+  it "catches Net::ReadTimeout and raises RestClient's ReadTimeout",
+     :if => defined?(Net::ReadTimeout) do
+    allow(@http).to receive(:request).and_raise(Net::ReadTimeout)
+    expect { @request.send(:transmit, @uri, 'req', nil) }.to raise_error(RestClient::Exceptions::ReadTimeout)
   end
 
-  it "catches Timeout::Error and raise the more informative RequestTimeout" do
-    @http.stub(:request).and_raise(Errno::ETIMEDOUT)
-    lambda { @request.transmit(@uri, 'req', nil) }.should raise_error(RestClient::RequestTimeout)
+  it "catches Net::OpenTimeout and raises RestClient's OpenTimeout",
+     :if => defined?(Net::OpenTimeout) do
+    allow(@http).to receive(:request).and_raise(Net::OpenTimeout)
+    expect { @request.send(:transmit, @uri, 'req', nil) }.to raise_error(RestClient::Exceptions::OpenTimeout)
   end
 
+  it "uses correct error message for ReadTimeout",
+     :if => defined?(Net::ReadTimeout) do
+    allow(@http).to receive(:request).and_raise(Net::ReadTimeout)
+    expect { @request.send(:transmit, @uri, 'req', nil) }.to raise_error(RestClient::Exceptions::ReadTimeout, 'Timed out reading data from server')
+  end
+
+  it "uses correct error message for OpenTimeout",
+     :if => defined?(Net::OpenTimeout) do
+    allow(@http).to receive(:request).and_raise(Net::OpenTimeout)
+    expect { @request.send(:transmit, @uri, 'req', nil) }.to raise_error(RestClient::Exceptions::OpenTimeout, 'Timed out connecting to server')
+  end
+
+
   it "class method execute wraps constructor" do
     req = double("rest request")
-    RestClient::Request.should_receive(:new).with(1 => 2).and_return(req)
-    req.should_receive(:execute)
+    expect(RestClient::Request).to receive(:new).with(1 => 2).and_return(req)
+    expect(req).to receive(:execute)
     RestClient::Request.execute(1 => 2)
   end
 
   describe "exception" do
     it "raises Unauthorized when the response is 401" do
-      res = double('response', :code => '401', :[] => ['content-encoding' => ''], :body => '' )
-      lambda { @request.process_result(res) }.should raise_error(RestClient::Unauthorized)
+      res = res_double(:code => '401', :[] => ['content-encoding' => ''], :body => '' )
+      expect { @request.send(:process_result, res, Time.now) }.to raise_error(RestClient::Unauthorized)
     end
 
     it "raises ResourceNotFound when the response is 404" do
-      res = double('response', :code => '404', :[] => ['content-encoding' => ''], :body => '' )
-      lambda { @request.process_result(res) }.should raise_error(RestClient::ResourceNotFound)
+      res = res_double(:code => '404', :[] => ['content-encoding' => ''], :body => '' )
+      expect { @request.send(:process_result, res, Time.now) }.to raise_error(RestClient::ResourceNotFound)
     end
 
     it "raises RequestFailed otherwise" do
-      res = double('response', :code => '500', :[] => ['content-encoding' => ''], :body => '' )
-      lambda { @request.process_result(res) }.should raise_error(RestClient::InternalServerError)
+      res = res_double(:code => '500', :[] => ['content-encoding' => ''], :body => '' )
+      expect { @request.send(:process_result, res, Time.now) }.to raise_error(RestClient::InternalServerError)
     end
   end
 
   describe "block usage" do
     it "returns what asked to" do
-      res = double('response', :code => '401', :[] => ['content-encoding' => ''], :body => '' )
-      @request.process_result(res){|response, request| "foo"}.should eq "foo"
+      res = res_double(:code => '401', :[] => ['content-encoding' => ''], :body => '' )
+      expect(@request.send(:process_result, res, Time.now){|response, request| "foo"}).to eq "foo"
     end
   end
 
   describe "proxy" do
+    before do
+      # unstub Net::HTTP creation since we need to test it
+      allow(Net::HTTP).to receive(:new).and_call_original
+
+      @proxy_req = RestClient::Request.new(:method => :put, :url => 'http://some/resource', :payload => 'payload')
+    end
+
     it "creates a proxy class if a proxy url is given" do
-      RestClient.stub(:proxy).and_return("http://example.com/")
-      @request.net_http_class.proxy_class?.should be_true
+      allow(RestClient).to receive(:proxy).and_return("http://example.com/")
+      allow(RestClient).to receive(:proxy_set?).and_return(true)
+      expect(@proxy_req.net_http_object('host', 80).proxy?).to be true
+    end
+
+    it "creates a proxy class with the correct address if a IPv6 proxy url is given" do
+      allow(RestClient).to receive(:proxy).and_return("http://[::1]/")
+      allow(RestClient).to receive(:proxy_set?).and_return(true)
+      expect(@proxy_req.net_http_object('host', 80).proxy?).to be true
+      expect(@proxy_req.net_http_object('host', 80).proxy_address).to eq('::1')
     end
 
     it "creates a non-proxy class if a proxy url is not given" do
-      @request.net_http_class.proxy_class?.should be_false
+      expect(@proxy_req.net_http_object('host', 80).proxy?).to be_falsey
+    end
+
+    it "disables proxy on a per-request basis" do
+      allow(RestClient).to receive(:proxy).and_return('http://example.com')
+      allow(RestClient).to receive(:proxy_set?).and_return(true)
+      expect(@proxy_req.net_http_object('host', 80).proxy?).to be true
+
+      disabled_req = RestClient::Request.new(:method => :put, :url => 'http://some/resource', :payload => 'payload', :proxy => nil)
+      expect(disabled_req.net_http_object('host', 80).proxy?).to be_falsey
+    end
+
+    it "sets proxy on a per-request basis" do
+      expect(@proxy_req.net_http_object('some', 80).proxy?).to be_falsey
+
+      req = RestClient::Request.new(:method => :put, :url => 'http://some/resource', :payload => 'payload', :proxy => 'http://example.com')
+      expect(req.net_http_object('host', 80).proxy?).to be true
+    end
+
+    it "overrides proxy from environment", if: RUBY_VERSION >= '2.0' do
+      allow(ENV).to receive(:[]).with("http_proxy").and_return("http://127.0.0.1")
+      allow(ENV).to receive(:[]).with("no_proxy").and_return(nil)
+      allow(ENV).to receive(:[]).with("NO_PROXY").and_return(nil)
+      allow(Netrc).to receive(:read).and_return({})
+
+      req = RestClient::Request.new(:method => :put, :url => 'http://some/resource', :payload => 'payload')
+      obj = req.net_http_object('host', 80)
+      expect(obj.proxy?).to be true
+      expect(obj.proxy_address).to eq '127.0.0.1'
+
+      # test original method .proxy?
+      req = RestClient::Request.new(:method => :put, :url => 'http://some/resource', :payload => 'payload', :proxy => nil)
+      obj = req.net_http_object('host', 80)
+      expect(obj.proxy?).to be_falsey
+
+      # stub RestClient.proxy_set? to peek into implementation
+      allow(RestClient).to receive(:proxy_set?).and_return(true)
+      req = RestClient::Request.new(:method => :put, :url => 'http://some/resource', :payload => 'payload')
+      obj = req.net_http_object('host', 80)
+      expect(obj.proxy?).to be_falsey
+
+      # test stubbed Net::HTTP.new
+      req = RestClient::Request.new(:method => :put, :url => 'http://some/resource', :payload => 'payload', :proxy => nil)
+      expect(Net::HTTP).to receive(:new).with('host', 80, nil, nil, nil, nil)
+      req.net_http_object('host', 80)
+    end
+
+    it "overrides global proxy with per-request proxy" do
+      allow(RestClient).to receive(:proxy).and_return('http://example.com')
+      allow(RestClient).to receive(:proxy_set?).and_return(true)
+      obj = @proxy_req.net_http_object('host', 80)
+      expect(obj.proxy?).to be true
+      expect(obj.proxy_address).to eq 'example.com'
+
+      req = RestClient::Request.new(:method => :put, :url => 'http://some/resource', :payload => 'payload', :proxy => 'http://127.0.0.1/')
+      expect(req.net_http_object('host', 80).proxy?).to be true
+      expect(req.net_http_object('host', 80).proxy_address).to eq('127.0.0.1')
     end
   end
 
@@ -369,177 +620,231 @@ describe RestClient::Request do
   describe "logging" do
     it "logs a get request" do
       log = RestClient.log = []
-      RestClient::Request.new(:method => :get, :url => 'http://url').log_request
-      log[0].should eq %Q{RestClient.get "http://url", "Accept"=>"*/*; q=0.5, application/xml", "Accept-Encoding"=>"gzip, deflate"\n}
+      RestClient::Request.new(:method => :get, :url => 'http://url', :headers => {:user_agent => 'rest-client'}).log_request
+      expect(log[0]).to eq %Q{RestClient.get "http://url", "Accept"=>"*/*", "User-Agent"=>"rest-client"\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 eq %Q{RestClient.post "http://url", "foo", "Accept"=>"*/*; q=0.5, application/xml", "Accept-Encoding"=>"gzip, deflate", "Content-Length"=>"3"\n}
+      RestClient::Request.new(:method => :post, :url => 'http://url', :payload => 'foo', :headers => {:user_agent => 'rest-client'}).log_request
+      expect(log[0]).to eq %Q{RestClient.post "http://url", "foo", "Accept"=>"*/*", "Content-Length"=>"3", "User-Agent"=>"rest-client"\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 eq %Q{RestClient.post "http://url", 1000 byte(s) length, "Accept"=>"*/*; q=0.5, application/xml", "Accept-Encoding"=>"gzip, deflate", "Content-Length"=>"1000"\n}
+      RestClient::Request.new(:method => :post, :url => 'http://url', :payload => ('x' * 1000), :headers => {:user_agent => 'rest-client'}).log_request
+      expect(log[0]).to eq %Q{RestClient.post "http://url", 1000 byte(s) length, "Accept"=>"*/*", "Content-Length"=>"1000", "User-Agent"=>"rest-client"\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 eq %Q{RestClient.get "http://url", "Accept"=>"text/plain", "Accept-Encoding"=>"gzip, deflate"\n}
+      RestClient::Request.new(:method => :get, :url => 'http://url', :headers => { :accept => 'text/plain', :user_agent => 'rest-client' }).log_request
+      expect(log[0]).to eq %Q{RestClient.get "http://url", "Accept"=>"text/plain", "User-Agent"=>"rest-client"\n}
     end
 
     it "logs a response including the status code, content type, and result body size in bytes" do
       log = RestClient.log = []
-      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 eq "# => 200 OK | text/html 4 bytes\n"
+      res = res_double(code: '200', class: Net::HTTPOK, body: 'abcd')
+      allow(res).to receive(:[]).with('Content-type').and_return('text/html')
+      response = response_from_res_double(res, @request)
+      response.log_response
+      expect(log).to eq ["# => 200 OK | text/html 4 bytes, 1.00s\n"]
     end
 
     it "logs a response with a nil Content-type" do
       log = RestClient.log = []
-      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 eq "# => 200 OK |  4 bytes\n"
+      res = res_double(code: '200', class: Net::HTTPOK, body: 'abcd')
+      allow(res).to receive(:[]).with('Content-type').and_return(nil)
+      response = response_from_res_double(res, @request)
+      response.log_response
+      expect(log).to eq ["# => 200 OK |  4 bytes, 1.00s\n"]
     end
 
     it "logs a response with a nil body" do
       log = RestClient.log = []
-      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 eq "# => 200 OK | text/html 0 bytes\n"
+      res = res_double(code: '200', class: Net::HTTPOK, body: nil)
+      allow(res).to receive(:[]).with('Content-type').and_return('text/html; charset=utf-8')
+      response = response_from_res_double(res, @request)
+      response.log_response
+      expect(log).to eq ["# => 200 OK | text/html 0 bytes, 1.00s\n"]
+    end
+
+    it 'does not log request password' do
+      log = RestClient.log = []
+      RestClient::Request.new(:method => :get, :url => 'http://user:password@url', :headers => {:user_agent => 'rest-client'}).log_request
+      expect(log[0]).to eq %Q{RestClient.get "http://user:REDACTED@url", "Accept"=>"*/*", "User-Agent"=>"rest-client"\n}
+    end
+
+    it 'logs to a passed logger, if provided' do
+      logger = double('logger', '<<' => true)
+      expect(logger).to receive(:<<)
+      RestClient::Request.new(:method => :get, :url => 'http://user:password@url', log: logger).log_request
     end
   end
 
   it "strips the charset from the response content type" do
     log = RestClient.log = []
-    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 eq "# => 200 OK | text/html 4 bytes\n"
+    res = res_double(code: '200', class: Net::HTTPOK, body: 'abcd')
+    allow(res).to receive(:[]).with('Content-type').and_return('text/html; charset=utf-8')
+    response = response_from_res_double(res, @request)
+    response.log_response
+    expect(log).to eq ["# => 200 OK | text/html 4 bytes, 1.00s\n"]
   end
 
   describe "timeout" do
     it "does not set timeouts if not specified" do
       @request = RestClient::Request.new(:method => :put, :url => 'http://some/resource', :payload => 'payload')
-      @http.stub(:request)
-      @request.stub(:process_result)
-      @request.stub(:response_log)
+      allow(@http).to receive(:request)
+      allow(@request).to receive(:process_result)
+      allow(@request).to receive(:response_log)
 
-      @net.should_not_receive(:read_timeout=)
-      @net.should_not_receive(:open_timeout=)
+      expect(@net).not_to receive(:read_timeout=)
+      expect(@net).not_to receive(:open_timeout=)
 
-      @request.transmit(@uri, 'req', nil)
+      @request.send(:transmit, @uri, 'req', nil)
     end
 
-    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)
+    it 'sets read_timeout' do
+      @request = RestClient::Request.new(:method => :put, :url => 'http://some/resource', :payload => 'payload', :read_timeout => 123)
+      allow(@http).to receive(:request)
+      allow(@request).to receive(:process_result)
+      allow(@request).to receive(:response_log)
 
-      @net.should_receive(:read_timeout=).with(123)
+      expect(@net).to receive(:read_timeout=).with(123)
 
-      @request.transmit(@uri, 'req', nil)
+      @request.send(:transmit, @uri, 'req', nil)
     end
 
-    it "set open_timeout" do
+    it "sets 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)
+      allow(@http).to receive(:request)
+      allow(@request).to receive(:process_result)
+      allow(@request).to receive(:response_log)
+
+      expect(@net).to receive(:open_timeout=).with(123)
+
+      @request.send(:transmit, @uri, 'req', nil)
+    end
+
+    it 'sets both timeouts with :timeout' do
+      @request = RestClient::Request.new(:method => :put, :url => 'http://some/resource', :payload => 'payload', :timeout => 123)
+      allow(@http).to receive(:request)
+      allow(@request).to receive(:process_result)
+      allow(@request).to receive(:response_log)
 
-      @net.should_receive(:open_timeout=).with(123)
+      expect(@net).to receive(:open_timeout=).with(123)
+      expect(@net).to receive(:read_timeout=).with(123)
 
-      @request.transmit(@uri, 'req', nil)
+      @request.send(:transmit, @uri, 'req', nil)
     end
 
+    it 'supersedes :timeout with open/read_timeout' do
+      @request = RestClient::Request.new(:method => :put, :url => 'http://some/resource', :payload => 'payload', :timeout => 123, :open_timeout => 34, :read_timeout => 56)
+      allow(@http).to receive(:request)
+      allow(@request).to receive(:process_result)
+      allow(@request).to receive(:response_log)
+
+      expect(@net).to receive(:open_timeout=).with(34)
+      expect(@net).to receive(:read_timeout=).with(56)
+
+      @request.send(:transmit, @uri, 'req', nil)
+    end
+
+
     it "disable timeout by setting it to nil" do
-      @request = RestClient::Request.new(:method => :put, :url => 'http://some/resource', :payload => 'payload', :timeout => nil, :open_timeout => nil)
-      @http.stub(:request)
-      @request.stub(:process_result)
-      @request.stub(:response_log)
+      @request = RestClient::Request.new(:method => :put, :url => 'http://some/resource', :payload => 'payload', :read_timeout => nil, :open_timeout => nil)
+      allow(@http).to receive(:request)
+      allow(@request).to receive(:process_result)
+      allow(@request).to receive(:response_log)
+
+      expect(@net).to receive(:read_timeout=).with(nil)
+      expect(@net).to receive(:open_timeout=).with(nil)
+
+      @request.send(:transmit, @uri, 'req', nil)
+    end
+
+    it 'deprecated: warns when disabling timeout by setting it to -1' do
+      @request = RestClient::Request.new(:method => :put, :url => 'http://some/resource', :payload => 'payload', :read_timeout => -1)
+      allow(@http).to receive(:request)
+      allow(@request).to receive(:process_result)
+      allow(@request).to receive(:response_log)
 
-      @net.should_receive(:read_timeout=).with(nil)
-      @net.should_receive(:open_timeout=).with(nil)
+      expect(@net).to receive(:read_timeout=).with(nil)
 
-      @request.transmit(@uri, 'req', nil)
+      expect(fake_stderr {
+        @request.send(:transmit, @uri, 'req', nil)
+      }).to match(/^Deprecated: .*timeout.* nil instead of -1$/)
     end
 
     it "deprecated: disable timeout by setting it to -1" do
-      @request = RestClient::Request.new(:method => :put, :url => 'http://some/resource', :payload => 'payload', :timeout => -1, :open_timeout => -1)
-      @http.stub(:request)
-      @request.stub(:process_result)
-      @request.stub(:response_log)
+      @request = RestClient::Request.new(:method => :put, :url => 'http://some/resource', :payload => 'payload', :read_timeout => -1, :open_timeout => -1)
+      allow(@http).to receive(:request)
+      allow(@request).to receive(:process_result)
+      allow(@request).to receive(:response_log)
 
-      @request.should_receive(:warn)
-      @net.should_receive(:read_timeout=).with(nil)
+      expect(@request).to receive(:warn)
+      expect(@net).to receive(:read_timeout=).with(nil)
 
-      @request.should_receive(:warn)
-      @net.should_receive(:open_timeout=).with(nil)
+      expect(@request).to receive(:warn)
+      expect(@net).to receive(:open_timeout=).with(nil)
 
-      @request.transmit(@uri, 'req', nil)
+      @request.send(:transmit, @uri, 'req', nil)
     end
   end
 
   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)
-      @net.should_receive(:use_ssl=).with(true)
-      @http.stub(:request)
-      @request.stub(:process_result)
-      @request.stub(:response_log)
-      @request.transmit(@uri, 'req', 'payload')
+      allow(@uri).to receive(:is_a?).with(URI::HTTPS).and_return(true)
+      expect(@net).to receive(:use_ssl=).with(true)
+      allow(@http).to receive(:request)
+      allow(@request).to receive(:process_result)
+      allow(@request).to receive(:response_log)
+      @request.send(:transmit, @uri, 'req', 'payload')
     end
 
     it "should default to verifying ssl certificates" do
-      @request.verify_ssl.should eq OpenSSL::SSL::VERIFY_PEER
+      expect(@request.verify_ssl).to eq OpenSSL::SSL::VERIFY_PEER
     end
 
     it "should have expected values for VERIFY_PEER and VERIFY_NONE" do
-      OpenSSL::SSL::VERIFY_NONE.should eq(0)
-      OpenSSL::SSL::VERIFY_PEER.should eq(1)
+      expect(OpenSSL::SSL::VERIFY_NONE).to eq(0)
+      expect(OpenSSL::SSL::VERIFY_PEER).to eq(1)
     end
 
     it "should set net.verify_mode to OpenSSL::SSL::VERIFY_NONE if verify_ssl is false" do
       @request = RestClient::Request.new(:method => :put, :verify_ssl => false, :url => 'http://some/resource', :payload => 'payload')
-      @net.should_receive(:verify_mode=).with(OpenSSL::SSL::VERIFY_NONE)
-      @http.stub(:request)
-      @request.stub(:process_result)
-      @request.stub(:response_log)
-      @request.transmit(@uri, 'req', 'payload')
+      expect(@net).to receive(:verify_mode=).with(OpenSSL::SSL::VERIFY_NONE)
+      allow(@http).to receive(:request)
+      allow(@request).to receive(:process_result)
+      allow(@request).to receive(:response_log)
+      @request.send(: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)
-      @request.transmit(@uri, 'req', 'payload')
+      expect(@net).not_to receive(:verify_mode=).with(OpenSSL::SSL::VERIFY_NONE)
+      allow(@http).to receive(:request)
+      allow(@request).to receive(:process_result)
+      allow(@request).to receive(:response_log)
+      @request.send(:transmit, @uri, 'req', 'payload')
     end
 
     it "should set net.verify_mode to OpenSSL::SSL::VERIFY_PEER if verify_ssl is true" do
       @request = RestClient::Request.new(:method => :put, :url => 'https://some/resource', :payload => 'payload', :verify_ssl => true)
-      @net.should_receive(:verify_mode=).with(OpenSSL::SSL::VERIFY_PEER)
-      @http.stub(:request)
-      @request.stub(:process_result)
-      @request.stub(:response_log)
-      @request.transmit(@uri, 'req', 'payload')
+      expect(@net).to receive(:verify_mode=).with(OpenSSL::SSL::VERIFY_PEER)
+      allow(@http).to receive(:request)
+      allow(@request).to receive(:process_result)
+      allow(@request).to receive(:response_log)
+      @request.send(:transmit, @uri, 'req', 'payload')
     end
 
     it "should set net.verify_mode to OpenSSL::SSL::VERIFY_PEER if verify_ssl is not given" do
       @request = RestClient::Request.new(:method => :put, :url => 'https://some/resource', :payload => 'payload')
-      @net.should_receive(:verify_mode=).with(OpenSSL::SSL::VERIFY_PEER)
-      @http.stub(:request)
-      @request.stub(:process_result)
-      @request.stub(:response_log)
-      @request.transmit(@uri, 'req', 'payload')
+      expect(@net).to receive(:verify_mode=).with(OpenSSL::SSL::VERIFY_PEER)
+      allow(@http).to receive(:request)
+      allow(@request).to receive(:process_result)
+      allow(@request).to receive(:response_log)
+      @request.send(:transmit, @uri, 'req', 'payload')
     end
 
     it "should set net.verify_mode to the passed value if verify_ssl is an OpenSSL constant" do
@@ -548,15 +853,15 @@ describe RestClient::Request do
                                           :url => 'https://some/resource',
                                           :payload => 'payload',
                                           :verify_ssl => mode )
-      @net.should_receive(:verify_mode=).with(mode)
-      @http.stub(:request)
-      @request.stub(:process_result)
-      @request.stub(:response_log)
-      @request.transmit(@uri, 'req', 'payload')
+      expect(@net).to receive(:verify_mode=).with(mode)
+      allow(@http).to receive(:request)
+      allow(@request).to receive(:process_result)
+      allow(@request).to receive(:response_log)
+      @request.send(:transmit, @uri, 'req', 'payload')
     end
 
     it "should default to not having an ssl_client_cert" do
-      @request.ssl_client_cert.should be(nil)
+      expect(@request.ssl_client_cert).to be(nil)
     end
 
     it "should set the ssl_version if provided" do
@@ -566,11 +871,11 @@ describe RestClient::Request do
         :payload => 'payload',
         :ssl_version => "TLSv1"
       )
-      @net.should_receive(:ssl_version=).with("TLSv1")
-      @http.stub(:request)
-      @request.stub(:process_result)
-      @request.stub(:response_log)
-      @request.transmit(@uri, 'req', 'payload')
+      expect(@net).to receive(:ssl_version=).with("TLSv1")
+      allow(@http).to receive(:request)
+      allow(@request).to receive(:process_result)
+      allow(@request).to receive(:response_log)
+      @request.send(:transmit, @uri, 'req', 'payload')
     end
 
     it "should not set the ssl_version if not provided" do
@@ -579,11 +884,11 @@ describe RestClient::Request do
         :url => 'https://some/resource',
         :payload => 'payload'
       )
-      @net.should_not_receive(:ssl_version=).with("TLSv1")
-      @http.stub(:request)
-      @request.stub(:process_result)
-      @request.stub(:response_log)
-      @request.transmit(@uri, 'req', 'payload')
+      expect(@net).not_to receive(:ssl_version=).with("TLSv1")
+      allow(@http).to receive(:request)
+      allow(@request).to receive(:process_result)
+      allow(@request).to receive(:response_log)
+      @request.send(:transmit, @uri, 'req', 'payload')
     end
 
     it "should set the ssl_ciphers if provided" do
@@ -594,11 +899,11 @@ describe RestClient::Request do
         :payload => 'payload',
         :ssl_ciphers => ciphers
       )
-      @net.should_receive(:ciphers=).with(ciphers)
-      @http.stub(:request)
-      @request.stub(:process_result)
-      @request.stub(:response_log)
-      @request.transmit(@uri, 'req', 'payload')
+      expect(@net).to receive(:ciphers=).with(ciphers)
+      allow(@http).to receive(:request)
+      allow(@request).to receive(:process_result)
+      allow(@request).to receive(:response_log)
+      @request.send(:transmit, @uri, 'req', 'payload')
     end
 
     it "should not set the ssl_ciphers if set to nil" do
@@ -608,61 +913,11 @@ describe RestClient::Request do
         :payload => 'payload',
         :ssl_ciphers => nil,
       )
-      @net.should_not_receive(:ciphers=)
-      @http.stub(:request)
-      @request.stub(:process_result)
-      @request.stub(:response_log)
-      @request.transmit(@uri, 'req', 'payload')
-    end
-
-    it "should override ssl_ciphers with better defaults with weak default ciphers" do
-      stub_const(
-        '::OpenSSL::SSL::SSLContext::DEFAULT_PARAMS',
-        {
-          :ssl_version=>"SSLv23",
-          :verify_mode=>1,
-          :ciphers=>"ALL:!ADH:!EXPORT:!SSLv2:RC4+RSA:+HIGH:+MEDIUM:+LOW",
-          :options=>-2147480577,
-        }
-      )
-
-      @request = RestClient::Request.new(
-        :method => :put,
-        :url => 'https://some/resource',
-        :payload => 'payload',
-      )
-
-      @net.should_receive(:ciphers=).with(RestClient::Request::DefaultCiphers)
-
-      @http.stub(:request)
-      @request.stub(:process_result)
-      @request.stub(:response_log)
-      @request.transmit(@uri, 'req', 'payload')
-    end
-
-    it "should not override ssl_ciphers with better defaults with different default ciphers" do
-      stub_const(
-        '::OpenSSL::SSL::SSLContext::DEFAULT_PARAMS',
-        {
-          :ssl_version=>"SSLv23",
-          :verify_mode=>1,
-          :ciphers=>"HIGH:!aNULL:!eNULL:!EXPORT:!LOW:!MEDIUM:!SSLv2",
-          :options=>-2147480577,
-        }
-      )
-
-      @request = RestClient::Request.new(
-        :method => :put,
-        :url => 'https://some/resource',
-        :payload => 'payload',
-      )
-
-      @net.should_not_receive(:ciphers=)
-
-      @http.stub(:request)
-      @request.stub(:process_result)
-      @request.stub(:response_log)
-      @request.transmit(@uri, 'req', 'payload')
+      expect(@net).not_to receive(:ciphers=)
+      allow(@http).to receive(:request)
+      allow(@request).to receive(:process_result)
+      allow(@request).to receive(:response_log)
+      @request.send(:transmit, @uri, 'req', 'payload')
     end
 
     it "should set the ssl_client_cert if provided" do
@@ -672,11 +927,11 @@ describe RestClient::Request do
               :payload => 'payload',
               :ssl_client_cert => "whatsupdoc!"
       )
-      @net.should_receive(:cert=).with("whatsupdoc!")
-      @http.stub(:request)
-      @request.stub(:process_result)
-      @request.stub(:response_log)
-      @request.transmit(@uri, 'req', 'payload')
+      expect(@net).to receive(:cert=).with("whatsupdoc!")
+      allow(@http).to receive(:request)
+      allow(@request).to receive(:process_result)
+      allow(@request).to receive(:response_log)
+      @request.send(:transmit, @uri, 'req', 'payload')
     end
 
     it "should not set the ssl_client_cert if it is not provided" do
@@ -685,15 +940,15 @@ describe RestClient::Request do
               :url => 'https://some/resource',
               :payload => 'payload'
       )
-      @net.should_not_receive(:cert=)
-      @http.stub(:request)
-      @request.stub(:process_result)
-      @request.stub(:response_log)
-      @request.transmit(@uri, 'req', 'payload')
+      expect(@net).not_to receive(:cert=)
+      allow(@http).to receive(:request)
+      allow(@request).to receive(:process_result)
+      allow(@request).to receive(:response_log)
+      @request.send(:transmit, @uri, 'req', 'payload')
     end
 
     it "should default to not having an ssl_client_key" do
-      @request.ssl_client_key.should be(nil)
+      expect(@request.ssl_client_key).to be(nil)
     end
 
     it "should set the ssl_client_key if provided" do
@@ -703,11 +958,11 @@ describe RestClient::Request do
               :payload => 'payload',
               :ssl_client_key => "whatsupdoc!"
       )
-      @net.should_receive(:key=).with("whatsupdoc!")
-      @http.stub(:request)
-      @request.stub(:process_result)
-      @request.stub(:response_log)
-      @request.transmit(@uri, 'req', 'payload')
+      expect(@net).to receive(:key=).with("whatsupdoc!")
+      allow(@http).to receive(:request)
+      allow(@request).to receive(:process_result)
+      allow(@request).to receive(:response_log)
+      @request.send(:transmit, @uri, 'req', 'payload')
     end
 
     it "should not set the ssl_client_key if it is not provided" do
@@ -716,15 +971,15 @@ describe RestClient::Request do
               :url => 'https://some/resource',
               :payload => 'payload'
       )
-      @net.should_not_receive(:key=)
-      @http.stub(:request)
-      @request.stub(:process_result)
-      @request.stub(:response_log)
-      @request.transmit(@uri, 'req', 'payload')
+      expect(@net).not_to receive(:key=)
+      allow(@http).to receive(:request)
+      allow(@request).to receive(:process_result)
+      allow(@request).to receive(:response_log)
+      @request.send(:transmit, @uri, 'req', 'payload')
     end
 
     it "should default to not having an ssl_ca_file" do
-      @request.ssl_ca_file.should be(nil)
+      expect(@request.ssl_ca_file).to be(nil)
     end
 
     it "should set the ssl_ca_file if provided" do
@@ -734,12 +989,12 @@ describe RestClient::Request do
               :payload => 'payload',
               :ssl_ca_file => "Certificate Authority File"
       )
-      @net.should_receive(:ca_file=).with("Certificate Authority File")
-      @net.should_not_receive(:cert_store=)
-      @http.stub(:request)
-      @request.stub(:process_result)
-      @request.stub(:response_log)
-      @request.transmit(@uri, 'req', 'payload')
+      expect(@net).to receive(:ca_file=).with("Certificate Authority File")
+      expect(@net).not_to receive(:cert_store=)
+      allow(@http).to receive(:request)
+      allow(@request).to receive(:process_result)
+      allow(@request).to receive(:response_log)
+      @request.send(:transmit, @uri, 'req', 'payload')
     end
 
     it "should not set the ssl_ca_file if it is not provided" do
@@ -748,15 +1003,15 @@ describe RestClient::Request do
               :url => 'https://some/resource',
               :payload => 'payload'
       )
-      @net.should_not_receive(:ca_file=)
-      @http.stub(:request)
-      @request.stub(:process_result)
-      @request.stub(:response_log)
-      @request.transmit(@uri, 'req', 'payload')
+      expect(@net).not_to receive(:ca_file=)
+      allow(@http).to receive(:request)
+      allow(@request).to receive(:process_result)
+      allow(@request).to receive(:response_log)
+      @request.send(:transmit, @uri, 'req', 'payload')
     end
 
     it "should default to not having an ssl_ca_path" do
-      @request.ssl_ca_path.should be(nil)
+      expect(@request.ssl_ca_path).to be(nil)
     end
 
     it "should set the ssl_ca_path if provided" do
@@ -766,12 +1021,12 @@ describe RestClient::Request do
               :payload => 'payload',
               :ssl_ca_path => "Certificate Authority Path"
       )
-      @net.should_receive(:ca_path=).with("Certificate Authority Path")
-      @net.should_not_receive(:cert_store=)
-      @http.stub(:request)
-      @request.stub(:process_result)
-      @request.stub(:response_log)
-      @request.transmit(@uri, 'req', 'payload')
+      expect(@net).to receive(:ca_path=).with("Certificate Authority Path")
+      expect(@net).not_to receive(:cert_store=)
+      allow(@http).to receive(:request)
+      allow(@request).to receive(:process_result)
+      allow(@request).to receive(:response_log)
+      @request.send(:transmit, @uri, 'req', 'payload')
     end
 
     it "should not set the ssl_ca_path if it is not provided" do
@@ -780,11 +1035,11 @@ describe RestClient::Request do
               :url => 'https://some/resource',
               :payload => 'payload'
       )
-      @net.should_not_receive(:ca_path=)
-      @http.stub(:request)
-      @request.stub(:process_result)
-      @request.stub(:response_log)
-      @request.transmit(@uri, 'req', 'payload')
+      expect(@net).not_to receive(:ca_path=)
+      allow(@http).to receive(:request)
+      allow(@request).to receive(:process_result)
+      allow(@request).to receive(:response_log)
+      @request.send(:transmit, @uri, 'req', 'payload')
     end
 
     it "should set the ssl_cert_store if provided" do
@@ -797,13 +1052,13 @@ describe RestClient::Request do
               :payload => 'payload',
               :ssl_cert_store => store
       )
-      @net.should_receive(:cert_store=).with(store)
-      @net.should_not_receive(:ca_path=)
-      @net.should_not_receive(:ca_file=)
-      @http.stub(:request)
-      @request.stub(:process_result)
-      @request.stub(:response_log)
-      @request.transmit(@uri, 'req', 'payload')
+      expect(@net).to receive(:cert_store=).with(store)
+      expect(@net).not_to receive(:ca_path=)
+      expect(@net).not_to receive(:ca_file=)
+      allow(@http).to receive(:request)
+      allow(@request).to receive(:process_result)
+      allow(@request).to receive(:response_log)
+      @request.send(:transmit, @uri, 'req', 'payload')
     end
 
     it "should by default set the ssl_cert_store if no CA info is provided" do
@@ -812,13 +1067,13 @@ describe RestClient::Request do
               :url => 'https://some/resource',
               :payload => 'payload'
       )
-      @net.should_receive(:cert_store=)
-      @net.should_not_receive(:ca_path=)
-      @net.should_not_receive(:ca_file=)
-      @http.stub(:request)
-      @request.stub(:process_result)
-      @request.stub(:response_log)
-      @request.transmit(@uri, 'req', 'payload')
+      expect(@net).to receive(:cert_store=)
+      expect(@net).not_to receive(:ca_path=)
+      expect(@net).not_to receive(:ca_file=)
+      allow(@http).to receive(:request)
+      allow(@request).to receive(:process_result)
+      allow(@request).to receive(:response_log)
+      @request.send(:transmit, @uri, 'req', 'payload')
     end
 
     it "should not set the ssl_cert_store if it is set falsy" do
@@ -828,11 +1083,11 @@ describe RestClient::Request do
               :payload => 'payload',
               :ssl_cert_store => nil,
       )
-      @net.should_not_receive(:cert_store=)
-      @http.stub(:request)
-      @request.stub(:process_result)
-      @request.stub(:response_log)
-      @request.transmit(@uri, 'req', 'payload')
+      expect(@net).not_to receive(:cert_store=)
+      allow(@http).to receive(:request)
+      allow(@request).to receive(:process_result)
+      allow(@request).to receive(:response_log)
+      @request.send(:transmit, @uri, 'req', 'payload')
     end
 
     it "should not set the ssl_verify_callback by default" do
@@ -841,11 +1096,11 @@ describe RestClient::Request do
               :url => 'https://some/resource',
               :payload => 'payload',
       )
-      @net.should_not_receive(:verify_callback=)
-      @http.stub(:request)
-      @request.stub(:process_result)
-      @request.stub(:response_log)
-      @request.transmit(@uri, 'req', 'payload')
+      expect(@net).not_to receive(:verify_callback=)
+      allow(@http).to receive(:request)
+      allow(@request).to receive(:process_result)
+      allow(@request).to receive(:response_log)
+      @request.send(:transmit, @uri, 'req', 'payload')
     end
 
     it "should set the ssl_verify_callback if passed" do
@@ -856,7 +1111,7 @@ describe RestClient::Request do
               :payload => 'payload',
               :ssl_verify_callback => callback,
       )
-      @net.should_receive(:verify_callback=).with(callback)
+      expect(@net).to receive(:verify_callback=).with(callback)
 
       # we'll read cert_store on jruby
       # https://github.com/jruby/jruby/issues/597
@@ -864,10 +1119,10 @@ describe RestClient::Request do
         allow(@net).to receive(:cert_store)
       end
 
-      @http.stub(:request)
-      @request.stub(:process_result)
-      @request.stub(:response_log)
-      @request.transmit(@uri, 'req', 'payload')
+      allow(@http).to receive(:request)
+      allow(@request).to receive(:process_result)
+      allow(@request).to receive(:response_log)
+      @request.send(:transmit, @uri, 'req', 'payload')
     end
 
     # </ssl>
@@ -880,11 +1135,11 @@ describe RestClient::Request do
             :payload => 'payload'
     )
     net_http_res = Net::HTTPNoContent.new("", "204", "No Content")
-    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 eq 204
+    allow(net_http_res).to receive(:read_body).and_return(nil)
+    expect(@http).to receive(:request).and_return(net_http_res)
+    response = @request.send(:transmit, @uri, 'req', 'payload')
+    expect(response).not_to be_nil
+    expect(response.code).to eq 204
   end
 
   describe "raw response" do
@@ -892,14 +1147,92 @@ describe RestClient::Request do
       @request = RestClient::Request.new(:method => "get", :url => "example.com", :raw_response => true)
 
       tempfile = double("tempfile")
-      tempfile.should_receive(:binmode)
-      tempfile.stub(:open)
-      tempfile.stub(:close)
-      Tempfile.should_receive(:new).with("rest-client").and_return(tempfile)
+      expect(tempfile).to receive(:binmode)
+      allow(tempfile).to receive(:open)
+      allow(tempfile).to receive(:close)
+      expect(Tempfile).to receive(:new).with("rest-client.").and_return(tempfile)
 
       net_http_res = Net::HTTPOK.new(nil, "200", "body")
-      net_http_res.stub(:read_body).and_return("body")
-      @request.fetch_body(net_http_res)
+      allow(net_http_res).to receive(:read_body).and_return("body")
+      received_tempfile = @request.send(:fetch_body_to_tempfile, net_http_res)
+      expect(received_tempfile).to eq tempfile
+    end
+  end
+
+  describe 'payloads' do
+    it 'should accept string payloads' do
+      payload = 'Foo'
+      @request = RestClient::Request.new(method: :get, url: 'example.com', :payload => payload)
+      expect(@request).to receive(:process_result)
+      expect(@http).to receive(:request).with('req', payload)
+      @request.send(:transmit, @uri, 'req', payload)
+    end
+
+    it 'should accept streaming IO payloads' do
+      payload = StringIO.new('streamed')
+
+      @request = RestClient::Request.new(method: :get, url: 'example.com', :payload => payload)
+      expect(@request).to receive(:process_result)
+
+      @get = double('net::http::get')
+      expect(@get).to receive(:body_stream=).with(instance_of(RestClient::Payload::Streamed))
+
+      allow(@request.net_http_request_class(:GET)).to receive(:new).and_return(@get)
+      expect(@http).to receive(:request).with(@get, nil)
+      @request.execute
+    end
+  end
+
+  describe 'constructor' do
+    it 'should reject valid URIs with no hostname' do
+      expect(URI.parse('http:///').hostname).to be_nil
+
+      expect {
+        RestClient::Request.new(method: :get, url: 'http:///')
+      }.to raise_error(URI::InvalidURIError, /\Abad URI/)
+    end
+
+    it 'should reject invalid URIs' do
+      expect {
+        RestClient::Request.new(method: :get, url: 'http://::')
+      }.to raise_error(URI::InvalidURIError)
+    end
+  end
+
+  describe 'process_url_params' do
+    it 'should handle basic URL params' do
+      expect(@request.process_url_params('https://example.com/foo', params: {key1: 123, key2: 'abc'})).
+        to eq 'https://example.com/foo?key1=123&key2=abc'
+
+      expect(@request.process_url_params('https://example.com/foo', params: {'key1' => 123})).
+        to eq 'https://example.com/foo?key1=123'
+
+      expect(@request.process_url_params('https://example.com/path',
+                                  params: {foo: 'one two', bar: 'three + four == seven'})).
+        to eq 'https://example.com/path?foo=one+two&bar=three+%2B+four+%3D%3D+seven'
+    end
+
+    it 'should combine with & when URL params already exist' do
+      expect(@request.process_url_params('https://example.com/path?foo=1', params: {bar: 2})).
+        to eq 'https://example.com/path?foo=1&bar=2'
+    end
+
+    it 'should handle complex nested URL params per Rack / Rails conventions' do
+      expect(@request.process_url_params('https://example.com/', params: {
+        foo: [1,2,3],
+        null: nil,
+        falsy: false,
+        math: '2+2=4',
+        nested: {'key + escaped' => 'value + escaped', other: [], arr: [1,2]},
+      })).to eq 'https://example.com/?foo[]=1&foo[]=2&foo[]=3&null&falsy=false&math=2%2B2%3D4' \
+                   '&nested[key+%2B+escaped]=value+%2B+escaped&nested[other]' \
+                   '&nested[arr][]=1&nested[arr][]=2'
+    end
+
+    it 'should handle ParamsArray objects' do
+      expect(@request.process_url_params('https://example.com/',
+        params: RestClient::ParamsArray.new([[:foo, 1], [:foo, 2]])
+      )).to eq 'https://example.com/?foo=1&foo=2'
     end
   end
 end