georgepalmer-couch_foo 0.8.2 → 0.8.3

data/README.rdoc

@@ -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)

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:minor: 8
-:patch: 2
+:patch: 3
 :major: 0
+:minor: 8

data/lib/couch_foo/database.rb

@@ -9,12 +9,29 @@ 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?)
       begin
-        response = database.save(doc, bulk_save)
+        response = database.save_doc(doc, bulk_save)
         check_response_ok(response)
       rescue Exception => e
         handle_exception(e)
@@ -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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: georgepalmer-couch_foo
 version: !ruby/object:Gem::Version 
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors: 
 - George Palmer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-21 00:00:00 -07:00
+date: 2009-04-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,43 +58,41 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.rdoc
-- LICENSE
+extra_rdoc_files: []
+
 files: 
-- README.rdoc
 - VERSION.yml
+- README.rdoc
 - lib/boolean.rb
+- lib/couch_foo.rb
 - lib/couch_foo
+- lib/couch_foo/database.rb
+- lib/couch_foo/dirty.rb
+- lib/couch_foo/serialization.rb
+- lib/couch_foo/associations.rb
 - lib/couch_foo/associations
+- lib/couch_foo/associations/has_one_association.rb
 - lib/couch_foo/associations/association_collection.rb
-- lib/couch_foo/associations/association_proxy.rb
+- lib/couch_foo/associations/has_many_association.rb
 - lib/couch_foo/associations/belongs_to_association.rb
+- lib/couch_foo/associations/association_proxy.rb
 - lib/couch_foo/associations/belongs_to_polymorphic_association.rb
 - lib/couch_foo/associations/has_and_belongs_to_many_association.rb
-- lib/couch_foo/associations/has_many_association.rb
-- lib/couch_foo/associations/has_one_association.rb
-- lib/couch_foo/associations.rb
-- lib/couch_foo/attribute_methods.rb
+- lib/couch_foo/observer.rb
 - lib/couch_foo/base.rb
+- lib/couch_foo/serializers
+- lib/couch_foo/serializers/xml_serializer.rb
+- lib/couch_foo/serializers/json_serializer.rb
 - lib/couch_foo/calculations.rb
-- lib/couch_foo/callbacks.rb
-- lib/couch_foo/database.rb
-- lib/couch_foo/dirty.rb
+- lib/couch_foo/view_methods.rb
+- lib/couch_foo/attribute_methods.rb
 - lib/couch_foo/named_scope.rb
-- lib/couch_foo/observer.rb
+- lib/couch_foo/callbacks.rb
 - lib/couch_foo/reflection.rb
-- lib/couch_foo/serialization.rb
-- lib/couch_foo/serializers
-- lib/couch_foo/serializers/json_serializer.rb
-- lib/couch_foo/serializers/xml_serializer.rb
-- lib/couch_foo/timestamp.rb
 - lib/couch_foo/validations.rb
-- lib/couch_foo/view_methods.rb
-- lib/couch_foo.rb
+- lib/couch_foo/timestamp.rb
 - test/couch_foo_test.rb
 - test/test_helper.rb
-- LICENSE
 has_rdoc: true
 homepage: http://github.com/georgepalmer/couch_foo
 post_install_message: 

data/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2008 George Palmer
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.