@@ -16,3 +16,4 @@ 0.8.0 - Allow :id and :rev in attributes= method, although values will be ignored. Minor version change an accident, should have been patch 0.8.1 - Address.find.all in readme should be Address.all 0.8.2 - Add link to blog post on using objects with models +0.8.3 - Fix API changes in CouchREST, proper exception thrown for non-started CouchDB and catch CouchDB 0.9 new conflict codes CHANGELOG @@ -52,7 +52,7 @@ It is recommend that you read the quick start and performance sections in the rd CouchFoo::Base.set_database(:host => "http://localhost:5984", :database => "mydatabase") CouchFoo::Base.logger = Rails.logger -If using with Rails you will need to create an initializer to do this (until proper integration is added) +If using with Rails you will need to create an initializer to do this (until proper integration is added). Also note depending on your version of CouchDB will depend on the version of the CouchREST gem you will require - CouchDB 0.9 requires CouchREST greater than 0.2 and CouchDB 0.8 requires CouchREST between 0.16 and 0.2. You will be warned on CouchFoo initialization if this is wrong. == Examples of usage @@ -127,7 +127,7 @@ Please feel free to fork and hit me with a request to merge back in. At the mom * Proper integration with rails using a couchdb.yml config file * Example ruby script for updating indexes as an external process, and the same for database compacting * :include for database queries -* Remove dependency from CouchRest? Add support for attachments and log calls to server so know performance times. General tidy up of database.rb +* Remove dependency from CouchRest - keep support for both CouchDB 0.8 and 0.9 for now. Add support for attachments and log calls to server so know performance times. General tidy up of database.rb. Add support for etags? * inline and HABTM inline associations. Also x_id and x_type properties should be automatically defined * compatability with willpaginate and friends * cleanup of associations, reflection, validations classes (were modified in a rush) README.rdoc @@ -9,7 +9,24 @@ module CouchFoo def initialize(options, bulk_save_default, *args) self.database = CouchRest.database(options[:host] + "/" + options[:database]) self.bulk_save_default = bulk_save_default - self.database_version = (JSON.parse(RestClient.get(options[:host]))["version"]).gsub(/-.+/,"").to_f + + # Check database ok + begin + self.database_version = (JSON.parse(RestClient.get(options[:host]))["version"]).gsub(/-.+/,"").to_f + rescue Exception => e + if e.is_a?(Errno::ECONNREFUSED) + raise CouchFooError, "CouchDB not started" + else + raise CouchFooError, "Error determining CouchDB version" + end + end + + # Due to CouchDB view API changes in 0.9 and CouchREST only supporting newer version + if version > 0.8 && CouchRest::VERSION.to_f < 0.21 + raise CouchFooError, "CouchFoo requires CouchRest > 0.2 for use with CouchDB 0.9" + elsif version < 0.9 && (CouchRest::VERSION.to_f >= 0.21 || CouchRest::VERSION.to_f <= 0.15) + raise CouchFooError, "CouchFoo requires 0.15 < CouchRest < 0.21 for use with CouchDB 0.8" + end end def save(doc, bulk_save = bulk_save?) @@ -92,7 +109,7 @@ module CouchFoo def handle_exception(exception) if exception.is_a?(RestClient::ResourceNotFound) raise DocumentNotFound, "Couldn't find document" - elsif exception.is_a?(RestClient::RequestFailed) && exception.respond_to?(:http_code) && exception.http_code == 412 + elsif exception.is_a?(RestClient::RequestFailed) && exception.respond_to?(:http_code) && (exception.http_code == 412 || exception.http_code == 409) raise DocumentConflict, "Document has been updated whilst object loaded" else @@ -114,7 +131,7 @@ module CouchFoo def database if @active_database.nil? if self == CouchFoo::Base - raise Exception, "No databases setup" + raise CouchFooError, "No databases setup" else superclass.database end lib/couch_foo/database.rb 332abedfdb7b6bf22e71409bc2da24a010992806 George Palmer george.palmer@gmail.com http://github.com/georgepalmer/couch_foo/commit/cc7c63487a6815ea45b70038c3360c94e22e2c26 cc7c63487a6815ea45b70038c3360c94e22e2c26 2009-04-21T04:57:33-07:00 2009-04-21T04:57:33-07:00 Fix CouchRest API changes, add support for conflict detection on CouchDB 0.9 and proper exception thrown if CouchDB not started 45feb94e2a317bb48de09aa364d1302488ae943c George Palmer george.palmer@gmail.com