Merge commit 'mattetti/master'

2009-06-11 21:18:37 -07:00 · 2009-06-11 21:18:37 -07:00 · fc18b47800
commit fc18b47800
parent 1c6e073b47 c18567f8fc
7 changed files with 52 additions and 23 deletions
--- a/lib/couchrest/core/document.rb
+++ b/lib/couchrest/core/document.rb
@ -68,7 +68,7 @@ module CouchRest
    # Returns the CouchDB uri for the document
    def uri(append_rev = false)
      return nil if new?
-      couch_uri = "http://#{database.uri}/#{CGI.escape(id)}"
+      couch_uri = "http://#{database.root}/#{CGI.escape(id)}"
      if append_rev == true
        couch_uri << "?rev=#{rev}"
      elsif append_rev.kind_of?(Integer)