From b5d6baaf11ff86b9fd9f4d20da815eff60e42234 Mon Sep 17 00:00:00 2001 From: Julien Sanchez Date: Mon, 12 Oct 2009 19:55:02 +0800 Subject: [PATCH] Save on Document & ExtendedDocument crashed if bulk - document#save expects to receive {"ok" => true} even with bulk mode - ExtendedDocument#save_without_callbacks reverted to previous code (expecting result["ok"] as in create_without_callbacks) --- lib/couchrest/core/database.rb | 2 +- lib/couchrest/more/extended_document.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/couchrest/core/database.rb b/lib/couchrest/core/database.rb index 2fb722a..96c4a0d 100644 --- a/lib/couchrest/core/database.rb +++ b/lib/couchrest/core/database.rb @@ -145,7 +145,7 @@ module CouchRest end if bulk @bulk_save_cache << doc - return bulk_save if @bulk_save_cache.length >= @bulk_save_cache_limit + bulk_save if @bulk_save_cache.length >= @bulk_save_cache_limit return {"ok" => true} # Compatibility with Document#save elsif !bulk && @bulk_save_cache.length > 0 bulk_save diff --git a/lib/couchrest/more/extended_document.rb b/lib/couchrest/more/extended_document.rb index 351c344..f33481d 100644 --- a/lib/couchrest/more/extended_document.rb +++ b/lib/couchrest/more/extended_document.rb @@ -238,7 +238,7 @@ module CouchRest set_unique_id if new? && self.respond_to?(:set_unique_id) result = database.save_doc(self, bulk) mark_as_saved - true + result["ok"] == true end # Saves the document to the db using save. Raises an exception