Merge commit 'mattetti/master'

spec/couchrest/core/couchrest_spec.rb

@@ -191,7 +191,7 @@ describe CouchRest do
   describe "using a proxy for RestClient connections" do
     it "should set proxy url for RestClient" do
       CouchRest.proxy 'http://localhost:8888/'
-      proxy_uri = URI.parse(RestClient.proxy)
+      proxy_uri = URI.parse(HttpAbstraction.proxy)
       proxy_uri.host.should eql( 'localhost' )
       proxy_uri.port.should eql( 8888 )
       CouchRest.proxy nil

spec/couchrest/core/database_spec.rb

@@ -690,7 +690,7 @@ describe CouchRest::Database do
     
     it "should recreate a db even tho it doesn't exist" do
       @cr.databases.should_not include(@db2.name)
-      @db2.recreate!
+      begin @db2.recreate! rescue nil end
       @cr.databases.should include(@db2.name)
     end