rest-client 1.6.7 → 1.8.0

data/spec/{resource_spec.rb → unit/resource_spec.rb}

@@ -1,7 +1,4 @@
-require File.join( File.dirname(File.expand_path(__FILE__)), 'base')
-
-require 'webmock/rspec'
-include WebMock
+require 'spec_helper'
 
 describe RestClient::Resource do
   before do
@@ -51,83 +48,82 @@ describe RestClient::Resource do
 
   it "is backwards compatible with previous constructor" do
     @resource = RestClient::Resource.new('http://some/resource', 'user', 'pass')
-    @resource.user.should == 'user'
-    @resource.password.should == 'pass'
+    @resource.user.should eq 'user'
+    @resource.password.should eq 'pass'
   end
 
   it "concatenates urls, inserting a slash when it needs one" do
-    @resource.concat_urls('http://example.com', 'resource').should == 'http://example.com/resource'
+    @resource.concat_urls('http://example.com', 'resource').should eq 'http://example.com/resource'
   end
 
   it "concatenates urls, using no slash if the first url ends with a slash" do
-    @resource.concat_urls('http://example.com/', 'resource').should == 'http://example.com/resource'
+    @resource.concat_urls('http://example.com/', 'resource').should eq 'http://example.com/resource'
   end
 
   it "concatenates urls, using no slash if the second url starts with a slash" do
-    @resource.concat_urls('http://example.com', '/resource').should == 'http://example.com/resource'
+    @resource.concat_urls('http://example.com', '/resource').should eq 'http://example.com/resource'
   end
 
   it "concatenates even non-string urls, :posts + 1 => 'posts/1'" do
-    @resource.concat_urls(:posts, 1).should == 'posts/1'
+    @resource.concat_urls(:posts, 1).should eq 'posts/1'
   end
 
   it "offers subresources via []" do
     parent = RestClient::Resource.new('http://example.com')
-    parent['posts'].url.should == 'http://example.com/posts'
+    parent['posts'].url.should eq 'http://example.com/posts'
   end
 
   it "transports options to subresources" do
     parent = RestClient::Resource.new('http://example.com', :user => 'user', :password => 'password')
-    parent['posts'].user.should == 'user'
-    parent['posts'].password.should == 'password'
+    parent['posts'].user.should eq 'user'
+    parent['posts'].password.should eq 'password'
   end
 
   it "passes a given block to subresources" do
-    block = Proc.new{|r| r}
+    block = proc {|r| r}
     parent = RestClient::Resource.new('http://example.com', &block)
-    parent['posts'].block.should == block
+    parent['posts'].block.should eq block
   end
 
   it "the block should be overrideable" do
-    block1 = Proc.new{|r| r}
-    block2 = Proc.new{|r| r}
+    block1 = proc {|r| r}
+    block2 = proc {|r| }
     parent = RestClient::Resource.new('http://example.com', &block1)
-    # parent['posts', &block2].block.should == block2 # ruby 1.9 syntax
-    parent.send(:[], 'posts', &block2).block.should == block2
+    # parent['posts', &block2].block.should eq block2 # ruby 1.9 syntax
+    parent.send(:[], 'posts', &block2).block.should eq block2
+    parent.send(:[], 'posts', &block2).block.should_not eq block1
   end
 
   it "the block should be overrideable in ruby 1.9 syntax" do
-    block = Proc.new{|r| r}
-    parent = RestClient::Resource.new('http://example.com', &block)
-    r19_syntax = %q{
-      parent['posts', &->(r){r}].block.should_not == block
-    }
-    if is_ruby_19?
-      eval(r19_syntax)
-    end
+    block1 = proc {|r| r}
+    block2 = ->(r) {}
+
+    parent = RestClient::Resource.new('http://example.com', &block1)
+    parent['posts', &block2].block.should eq block2
+    parent['posts', &block2].block.should_not eq block1
   end
 
   it "prints its url with to_s" do
-    RestClient::Resource.new('x').to_s.should == 'x'
+    RestClient::Resource.new('x').to_s.should eq 'x'
   end
 
   describe 'block' do
     it 'can use block when creating the resource' do
       stub_request(:get, 'www.example.com').to_return(:body => '', :status => 404)
       resource = RestClient::Resource.new('www.example.com') { |response, request| 'foo' }
-      resource.get.should == 'foo'
+      resource.get.should eq 'foo'
     end
 
     it 'can use block when executing the resource' do
       stub_request(:get, 'www.example.com').to_return(:body => '', :status => 404)
       resource = RestClient::Resource.new('www.example.com')
-      resource.get { |response, request| 'foo' }.should == 'foo'
+      resource.get { |response, request| 'foo' }.should eq 'foo'
     end
 
     it 'execution block override resource block' do
       stub_request(:get, 'www.example.com').to_return(:body => '', :status => 404)
       resource = RestClient::Resource.new('www.example.com') { |response, request| 'foo' }
-      resource.get { |response, request| 'bar' }.should == 'bar'
+      resource.get { |response, request| 'bar' }.should eq 'bar'
     end
 
   end

data/spec/{response_spec.rb → unit/response_spec.rb}

@@ -1,65 +1,65 @@
-require File.join( File.dirname(File.expand_path(__FILE__)), 'base')
-
-require 'webmock/rspec'
-include WebMock
+require 'spec_helper'
 
 describe RestClient::Response do
   before do
-    @net_http_res = mock('net http response', :to_hash => {"Status" => ["200 OK"]}, :code => 200)
-    @request = mock('http request', :user => nil, :password => nil)
-    @response = RestClient::Response.create('abc', @net_http_res, {})
+    @net_http_res = double('net http response', :to_hash => {"Status" => ["200 OK"]}, :code => 200)
+    @example_url = 'http://example.com'
+    @request = double('http request', :user => nil, :password => nil, :url => @example_url)
+    @response = RestClient::Response.create('abc', @net_http_res, {}, @request)
   end
 
   it "behaves like string" do
-    @response.should.to_s == 'abc'
-    @response.to_str.should == 'abc'
-    @response.to_i.should == 200
+    @response.to_s.should eq 'abc'
+    @response.to_str.should eq 'abc'
+    @response.to_i.should eq 200
   end
 
   it "accepts nil strings and sets it to empty for the case of HEAD" do
-    RestClient::Response.create(nil, @net_http_res, {}).should.to_s == ""
+    RestClient::Response.create(nil, @net_http_res, {}, @request).to_s.should eq ""
   end
 
   it "test headers and raw headers" do
-    @response.raw_headers["Status"][0].should == "200 OK"
-    @response.headers[:status].should == "200 OK"
+    @response.raw_headers["Status"][0].should eq "200 OK"
+    @response.headers[:status].should eq "200 OK"
   end
 
   describe "cookie processing" do
     it "should correctly deal with one Set-Cookie header with one cookie inside" do
-      net_http_res = mock('net http response', :to_hash => {"etag" => ["\"e1ac1a2df945942ef4cac8116366baad\""], "set-cookie" => ["main_page=main_page_no_rewrite; path=/; expires=Tue, 20-Jan-2015 15:03:14 GMT"]})
-      response = RestClient::Response.create('abc', net_http_res, {})
-      response.headers[:set_cookie].should == ["main_page=main_page_no_rewrite; path=/; expires=Tue, 20-Jan-2015 15:03:14 GMT"]
-      response.cookies.should == { "main_page" => "main_page_no_rewrite" }
+      header_val = "main_page=main_page_no_rewrite; path=/; expires=Sat, 10-Jan-2037 15:03:14 GMT".freeze
+
+      net_http_res = double('net http response', :to_hash => {"etag" => ["\"e1ac1a2df945942ef4cac8116366baad\""], "set-cookie" => [header_val]})
+      response = RestClient::Response.create('abc', net_http_res, {}, @request)
+      response.headers[:set_cookie].should eq [header_val]
+      response.cookies.should eq({ "main_page" => "main_page_no_rewrite" })
     end
 
     it "should correctly deal with multiple cookies [multiple Set-Cookie headers]" do
-      net_http_res = mock('net http response', :to_hash => {"etag" => ["\"e1ac1a2df945942ef4cac8116366baad\""], "set-cookie" => ["main_page=main_page_no_rewrite; path=/; expires=Tue, 20-Jan-2015 15:03:14 GMT", "remember_me=; path=/; expires=Thu, 01-Jan-1970 00:00:00 GMT", "user=somebody; path=/; expires=Thu, 01-Jan-1970 00:00:00 GMT"]})
-      response = RestClient::Response.create('abc', net_http_res, {})
-      response.headers[:set_cookie].should == ["main_page=main_page_no_rewrite; path=/; expires=Tue, 20-Jan-2015 15:03:14 GMT", "remember_me=; path=/; expires=Thu, 01-Jan-1970 00:00:00 GMT", "user=somebody; path=/; expires=Thu, 01-Jan-1970 00:00:00 GMT"]
-      response.cookies.should == {
-              "main_page" => "main_page_no_rewrite",
-              "remember_me" => "",
-              "user" => "somebody"
-      }
+      net_http_res = double('net http response', :to_hash => {"etag" => ["\"e1ac1a2df945942ef4cac8116366baad\""], "set-cookie" => ["main_page=main_page_no_rewrite; path=/; expires=Sat, 10-Jan-2037 15:03:14 GMT", "remember_me=; path=/; expires=Sat, 10-Jan-2037 00:00:00 GMT", "user=somebody; path=/; expires=Sat, 10-Jan-2037 00:00:00 GMT"]})
+      response = RestClient::Response.create('abc', net_http_res, {}, @request)
+      response.headers[:set_cookie].should eq ["main_page=main_page_no_rewrite; path=/; expires=Sat, 10-Jan-2037 15:03:14 GMT", "remember_me=; path=/; expires=Sat, 10-Jan-2037 00:00:00 GMT", "user=somebody; path=/; expires=Sat, 10-Jan-2037 00:00:00 GMT"]
+      response.cookies.should eq({
+        "main_page" => "main_page_no_rewrite",
+        "remember_me" => "",
+        "user" => "somebody"
+      })
     end
 
     it "should correctly deal with multiple cookies [one Set-Cookie header with multiple cookies]" do
-      net_http_res = mock('net http response', :to_hash => {"etag" => ["\"e1ac1a2df945942ef4cac8116366baad\""], "set-cookie" => ["main_page=main_page_no_rewrite; path=/; expires=Tue, 20-Jan-2015 15:03:14 GMT, remember_me=; path=/; expires=Thu, 01-Jan-1970 00:00:00 GMT, user=somebody; path=/; expires=Thu, 01-Jan-1970 00:00:00 GMT"]})
-      response = RestClient::Response.create('abc', net_http_res, {})
-      response.cookies.should == {
-              "main_page" => "main_page_no_rewrite",
-              "remember_me" => "",
-              "user" => "somebody"
-      }
+      net_http_res = double('net http response', :to_hash => {"etag" => ["\"e1ac1a2df945942ef4cac8116366baad\""], "set-cookie" => ["main_page=main_page_no_rewrite; path=/; expires=Sat, 10-Jan-2037 15:03:14 GMT, remember_me=; path=/; expires=Sat, 10-Jan-2037 00:00:00 GMT, user=somebody; path=/; expires=Sat, 10-Jan-2037 00:00:00 GMT"]})
+      response = RestClient::Response.create('abc', net_http_res, {}, @request)
+      response.cookies.should eq({
+        "main_page" => "main_page_no_rewrite",
+        "remember_me" => "",
+        "user" => "somebody"
+      })
     end
   end
 
   describe "exceptions processing" do
     it "should return itself for normal codes" do
       (200..206).each do |code|
-        net_http_res = mock('net http response', :code => '200')
-        response = RestClient::Response.create('abc', net_http_res, {})
+        net_http_res = double('net http response', :code => '200')
+        response = RestClient::Response.create('abc', net_http_res, {}, @request)
         response.return! @request
       end
     end
@@ -67,8 +67,8 @@ describe RestClient::Response do
     it "should throw an exception for other codes" do
       RestClient::Exceptions::EXCEPTIONS_MAP.each_key do |code|
         unless (200..207).include? code
-          net_http_res = mock('net http response', :code => code.to_i)
-          response = RestClient::Response.create('abc', net_http_res, {})
+          net_http_res = double('net http response', :code => code.to_i)
+          response = RestClient::Response.create('abc', net_http_res, {}, @request)
           lambda { response.return!}.should raise_error
         end
       end
@@ -77,86 +77,92 @@ describe RestClient::Response do
   end
 
   describe "redirection" do
-    
+
     it "follows a redirection when the request is a get" do
       stub_request(:get, 'http://some/resource').to_return(:body => '', :status => 301, :headers => {'Location' => 'http://new/resource'})
       stub_request(:get, 'http://new/resource').to_return(:body => 'Foo')
-      RestClient::Request.execute(:url => 'http://some/resource', :method => :get).body.should == 'Foo'
+      RestClient::Request.execute(:url => 'http://some/resource', :method => :get).body.should eq 'Foo'
     end
 
     it "follows a redirection and keep the parameters" do
       stub_request(:get, 'http://foo:bar@some/resource').with(:headers => {'Accept' => 'application/json'}).to_return(:body => '', :status => 301, :headers => {'Location' => 'http://new/resource'})
       stub_request(:get, 'http://foo:bar@new/resource').with(:headers => {'Accept' => 'application/json'}).to_return(:body => 'Foo')
-      RestClient::Request.execute(:url => 'http://some/resource', :method => :get, :user => 'foo', :password => 'bar', :headers => {:accept => :json}).body.should == 'Foo'
+      RestClient::Request.execute(:url => 'http://some/resource', :method => :get, :user => 'foo', :password => 'bar', :headers => {:accept => :json}).body.should eq 'Foo'
     end
 
     it "follows a redirection and keep the cookies" do
-      stub_request(:get, 'http://some/resource').to_return(:body => '', :status => 301, :headers => {'Set-Cookie' => CGI::Cookie.new('Foo', 'Bar'), 'Location' => 'http://new/resource', })
-      stub_request(:get, 'http://new/resource').with(:headers => {'Cookie' => 'Foo=Bar'}).to_return(:body => 'Qux')
-      RestClient::Request.execute(:url => 'http://some/resource', :method => :get).body.should == 'Qux'
+      stub_request(:get, 'http://some/resource').to_return(:body => '', :status => 301, :headers => {'Set-Cookie' => 'Foo=Bar', 'Location' => 'http://some/new_resource', })
+      stub_request(:get, 'http://some/new_resource').with(:headers => {'Cookie' => 'Foo=Bar'}).to_return(:body => 'Qux')
+      RestClient::Request.execute(:url => 'http://some/resource', :method => :get).body.should eq 'Qux'
+    end
+
+    it 'does not keep cookies across domains' do
+      stub_request(:get, 'http://some/resource').to_return(:body => '', :status => 301, :headers => {'Set-Cookie' => 'Foo=Bar', 'Location' => 'http://new/resource', })
+      stub_request(:get, 'http://new/resource').with(:headers => {'Cookie' => ''}).to_return(:body => 'Qux')
+      RestClient::Request.execute(:url => 'http://some/resource', :method => :get).body.should eq 'Qux'
     end
 
     it "doesn't follow a 301 when the request is a post" do
-      net_http_res = mock('net http response', :code => 301)
-      response = RestClient::Response.create('abc', net_http_res, {:method => :post})
+      net_http_res = double('net http response', :code => 301)
+      response = RestClient::Response.create('abc', net_http_res, {:method => :post}, @request)
       lambda { response.return!(@request)}.should raise_error(RestClient::MovedPermanently)
     end
 
     it "doesn't follow a 302 when the request is a post" do
-      net_http_res = mock('net http response', :code => 302)
-      response = RestClient::Response.create('abc', net_http_res, {:method => :post})
+      net_http_res = double('net http response', :code => 302)
+      response = RestClient::Response.create('abc', net_http_res, {:method => :post}, @request)
       lambda { response.return!(@request)}.should raise_error(RestClient::Found)
     end
 
     it "doesn't follow a 307 when the request is a post" do
-      net_http_res = mock('net http response', :code => 307)
-      response = RestClient::Response.create('abc', net_http_res, {:method => :post})
+      net_http_res = double('net http response', :code => 307)
+      response = RestClient::Response.create('abc', net_http_res, {:method => :post}, @request)
       lambda { response.return!(@request)}.should raise_error(RestClient::TemporaryRedirect)
     end
 
     it "doesn't follow a redirection when the request is a put" do
-      net_http_res = mock('net http response', :code => 301)
-      response = RestClient::Response.create('abc', net_http_res, {:method => :put})
+      net_http_res = double('net http response', :code => 301)
+      response = RestClient::Response.create('abc', net_http_res, {:method => :put}, @request)
       lambda { response.return!(@request)}.should raise_error(RestClient::MovedPermanently)
     end
 
     it "follows a redirection when the request is a post and result is a 303" do
       stub_request(:put, 'http://some/resource').to_return(:body => '', :status => 303, :headers => {'Location' => 'http://new/resource'})
       stub_request(:get, 'http://new/resource').to_return(:body => 'Foo')
-      RestClient::Request.execute(:url => 'http://some/resource', :method => :put).body.should == 'Foo'
+      RestClient::Request.execute(:url => 'http://some/resource', :method => :put).body.should eq 'Foo'
     end
 
     it "follows a redirection when the request is a head" do
       stub_request(:head, 'http://some/resource').to_return(:body => '', :status => 301, :headers => {'Location' => 'http://new/resource'})
       stub_request(:head, 'http://new/resource').to_return(:body => 'Foo')
-      RestClient::Request.execute(:url => 'http://some/resource', :method => :head).body.should == 'Foo'
+      RestClient::Request.execute(:url => 'http://some/resource', :method => :head).body.should eq 'Foo'
     end
 
     it "handles redirects with relative paths" do
       stub_request(:get, 'http://some/resource').to_return(:body => '', :status => 301, :headers => {'Location' => 'index'})
       stub_request(:get, 'http://some/index').to_return(:body => 'Foo')
-      RestClient::Request.execute(:url => 'http://some/resource', :method => :get).body.should == 'Foo'
+      RestClient::Request.execute(:url => 'http://some/resource', :method => :get).body.should eq 'Foo'
     end
 
     it "handles redirects with relative path and query string" do
       stub_request(:get, 'http://some/resource').to_return(:body => '', :status => 301, :headers => {'Location' => 'index?q=1'})
       stub_request(:get, 'http://some/index?q=1').to_return(:body => 'Foo')
-      RestClient::Request.execute(:url => 'http://some/resource', :method => :get).body.should == 'Foo'
+      RestClient::Request.execute(:url => 'http://some/resource', :method => :get).body.should eq 'Foo'
     end
 
     it "follow a redirection when the request is a get and the response is in the 30x range" do
       stub_request(:get, 'http://some/resource').to_return(:body => '', :status => 301, :headers => {'Location' => 'http://new/resource'})
       stub_request(:get, 'http://new/resource').to_return(:body => 'Foo')
-      RestClient::Request.execute(:url => 'http://some/resource', :method => :get).body.should == 'Foo'
+      RestClient::Request.execute(:url => 'http://some/resource', :method => :get).body.should eq 'Foo'
     end
-    
+
     it "follows no more than 10 redirections before raising error" do
       stub_request(:get, 'http://some/redirect-1').to_return(:body => '', :status => 301, :headers => {'Location' => 'http://some/redirect-2'})
       stub_request(:get, 'http://some/redirect-2').to_return(:body => '', :status => 301, :headers => {'Location' => 'http://some/redirect-2'})
       lambda { RestClient::Request.execute(:url => 'http://some/redirect-1', :method => :get) }.should raise_error(RestClient::MaxRedirectsReached)
       WebMock.should have_requested(:get, 'http://some/redirect-2').times(10)
     end
-    
+
     it "follows no more than max_redirects redirections, if specified" do
       stub_request(:get, 'http://some/redirect-1').to_return(:body => '', :status => 301, :headers => {'Location' => 'http://some/redirect-2'})
       stub_request(:get, 'http://some/redirect-2').to_return(:body => '', :status => 301, :headers => {'Location' => 'http://some/redirect-2'})

data/spec/{restclient_spec.rb → unit/restclient_spec.rb}

@@ -1,4 +1,4 @@
-require File.join( File.dirname(File.expand_path(__FILE__)), 'base')
+require 'spec_helper'
 
 describe RestClient do
   describe "API" do
@@ -63,11 +63,17 @@ describe RestClient do
 
     it "append the log to the requested filename" do
       RestClient.log = '/tmp/restclient.log'
-      f = mock('file handle')
+      f = double('file handle')
       File.should_receive(:open).with('/tmp/restclient.log', 'a').and_yield(f)
       f.should_receive(:puts).with('xyz')
       RestClient.log << 'xyz'
     end
   end
 
+  describe 'version' do
+    it 'has a version ~> 1.8.0.alpha' do
+      ver = Gem::Version.new(RestClient.version)
+      Gem::Requirement.new('~> 1.8.0.alpha').should be_satisfied_by(ver)
+    end
+  end
 end

data/spec/unit/windows/root_certs_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe 'RestClient::Windows::RootCerts',
+         :if => RestClient::Platform.windows? do
+  let(:x509_store) { RestClient::Windows::RootCerts.instance.to_a }
+
+  it 'should return at least one X509 certificate' do
+    expect(x509_store.to_a).to have_at_least(1).items
+  end
+
+  it 'should return an X509 certificate with a subject' do
+    x509 = x509_store.first
+
+    expect(x509.subject.to_s).to match(/CN=.*/)
+  end
+
+  it 'should return X509 certificate objects' do
+    x509_store.each do |cert|
+      cert.should be_a(OpenSSL::X509::Certificate)
+    end
+  end
+end