Merge branch 'master' of git://github.com/jchris/couchrest

* 'master' of git://github.com/jchris/couchrest:
  dcnstrct says Timeout::Error is the constant we probably mean
  fixed db spec

lib/couchrest/monkeypatches.rb

@@ -37,7 +37,7 @@ if RUBY_VERSION.to_f < 1.9
         if IO.select([@io], nil, nil, @read_timeout)
           @rbuf << @io.read_nonblock(65536)
         else
-          raise Timeout::TimeoutError
+          raise Timeout::Error
         end
       end
     end

spec/couchrest/core/database_spec.rb

@@ -312,8 +312,9 @@ describe CouchRest::Database do
         }
       }
       @db.save_doc(doc)
+      doc['_rev'].should_not be_nil
       doc['field'] << 'another value'
-      @db.save_doc(doc).should be_true
+      @db.save_doc(doc)["ok"].should be_true
     end
     
     it 'should be there' do