lib/couchrest/mixins/document_queries.rb in peterpunk-couchrest-0.23.1 vs lib/couchrest/mixins/document_queries.rb in peterpunk-couchrest-0.33

@@ -12,11 +12,18 @@
         # name of the current class. Take the standard set of
         # CouchRest::Database#view options.
         def all(opts = {}, &block)
           view(:all, opts, &block)
         end
-
+        
+        # Returns the number of documents that have the "couchrest-type" field
+        # equal to the name of the current class. Takes the standard set of 
+        # CouchRest::Database#view options
+        def count(opts = {}, &block)
+          all({:raw => true, :limit => 0}.merge(opts), &block)['total_rows']
+        end
+        
         # Load the first document that have the "couchrest-type" field equal to
         # the name of the current class.
         #
         # ==== Returns
         # Object:: The first object instance available
@@ -30,10 +37,43 @@
           first_instance = self.all(opts.merge!(:limit => 1))
           first_instance.empty? ? nil : first_instance.first
         end
         
         # Load a document from the database by id
+        # No exceptions will be raised if the document isn't found
+        #
+        # ==== Returns
+        # Object:: if the document was found
+        # or
+        # Nil::
+        # 
+        # === Parameters
+        # id<String, Integer>:: Document ID
+        # db<Database>:: optional option to pass a custom database to use
         def get(id, db = database)
+          begin
+            doc = db.get id
+          rescue
+            nil
+          else
+            new_doc = new(doc)
+            new_doc.changed_properties = {} # defined in properties to detect changes
+            new_doc
+          end
+        end
+        
+        # Load a document from the database by id
+        # An exception will be raised if the document isn't found
+        #
+        # ==== Returns
+        # Object:: if the document was found
+        # or
+        # Exception
+        # 
+        # === Parameters
+        # id<String, Integer>:: Document ID
+        # db<Database>:: optional option to pass a custom database to use
+        def get!(id, db = database)
           doc = db.get id
           new(doc)
         end
         
       end
\ No newline at end of file