mongoid 0.5.1 → 0.5.2

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/lib/mongoid/criteria.rb

@@ -24,7 +24,7 @@ module Mongoid #:nodoc:
     # query has returned it will provided a grouping of keys with counts.
     #
     # Example:
-    # 
+    #
     # <tt>criteria.select(:field1).where(:field1 => "Title").aggregate(Person)</tt>
     def aggregate(klass = nil)
       @klass = klass if klass
@@ -38,7 +38,7 @@ module Mongoid #:nodoc:
     #
     # Options:
     #
-    # selections: A +Hash+ where the key is the field name and the value is an 
+    # selections: A +Hash+ where the key is the field name and the value is an
     # +Array+ of values that must all match.
     #
     # Example:
@@ -52,6 +52,22 @@ module Mongoid #:nodoc:
       selections.each { |key, value| @selector[key] = { "$all" => value } }; self
     end
 
+    # Get the count of matching documents in the database for the +Criteria+.
+    #
+    # Options:
+    #
+    # klass: Optional class that the collection will be retrieved from.
+    #
+    # Example:
+    #
+    # <tt>criteria.count</tt>
+    #
+    # Returns: <tt>Integer</tt>
+    def count(klass = nil)
+      @klass = klass if klass
+      return @klass.collection.find(@selector, @options).count
+    end
+
     # Adds a criterion to the +Criteria+ that specifies values that are not allowed
     # to match any document in the database. The MongoDB conditional operator that
     # will be used is "$ne".
@@ -111,7 +127,7 @@ module Mongoid #:nodoc:
     # query has returned it will provided a grouping of keys with objects.
     #
     # Example:
-    # 
+    #
     # <tt>criteria.select(:field1).where(:field1 => "Title").group(Person)</tt>
     def group(klass = nil)
       @klass = klass if klass
@@ -256,8 +272,8 @@ module Mongoid #:nodoc:
     end
 
     # Adds a criterion to the +Criteria+ that specifies how many results to skip
-    # when returning Documents. This is mostly used in conjunction with 
-    # <tt>limit()</tt> to handle paginated results, and is similar to the 
+    # when returning Documents. This is mostly used in conjunction with
+    # <tt>limit()</tt> to handle paginated results, and is similar to the
     # traditional "offset" parameter.
     #
     # Options:
@@ -273,9 +289,9 @@ module Mongoid #:nodoc:
       @options[:skip] = value; self
     end
 
-    # Translate the supplied arguments into a +Criteria+ object. 
-    # 
-    # If the passed in args is a single +String+, then it will 
+    # Translate the supplied arguments into a +Criteria+ object.
+    #
+    # If the passed in args is a single +String+, then it will
     # construct an id +Criteria+ from it.
     #
     # If the passed in args are a type and a hash, then it will construct
@@ -300,7 +316,7 @@ module Mongoid #:nodoc:
 
     # Adds a criterion to the +Criteria+ that specifies values that must
     # be matched in order to return results. This is similar to a SQL "WHERE"
-    # clause. This is the actual selector that will be provided to MongoDB, 
+    # clause. This is the actual selector that will be provided to MongoDB,
     # similar to the Javascript object that is used when performing a find()
     # in the MongoDB console.
     #

data/lib/mongoid/document.rb

@@ -39,6 +39,14 @@ module Mongoid #:nodoc:
         @collection ||= Mongoid.database.collection(@collection_name)
       end
 
+      # Returns a count of matching records in the database based on the
+      # provided arguments.
+      #
+      # <tt>Person.count(:first, :conditions => { :attribute => "value" })</tt>
+      def count(*args)
+        Criteria.translate(*args).count(self)
+      end
+
       # Defines all the fields that are accessable on the Document
       # For each field that is defined, a getter and setter will be
       # added as an instance method to the Document.

data/mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
-  s.date = %q{2009-10-27}
+  s.date = %q{2009-10-28}
   s.email = %q{durran@gmail.com}
   s.extra_rdoc_files = [
     "README.textile"

data/spec/unit/mongoid/criteria_spec.rb

@@ -54,6 +54,25 @@ describe Mongoid::Criteria do
 
   end
 
+  describe "#count" do
+
+    before do
+      @criteria = Mongoid::Criteria.new(:all, Person)
+      @selector = { :test => "Testing" }
+      @criteria.where(@selector)
+      @collection = mock
+      @cursor = mock
+      Person.expects(:collection).returns(@collection)
+    end
+
+    it "returns the count from the cursor without creating the documents" do
+      @collection.expects(:find).with(@selector, {}).returns(@cursor)
+      @cursor.expects(:count).returns(10)
+      @criteria.count.should == 10
+    end
+
+  end
+
   describe "#excludes" do
 
     it "adds the $ne query to the selector" do

data/spec/unit/mongoid/document_spec.rb

@@ -109,6 +109,21 @@ describe Mongoid::Document do
 
   end
 
+  describe "#count" do
+
+    before do
+      @params = { :conditions => { :title => "Sir" } }
+      @criteria = mock
+    end
+
+    it "delegates to the criteria api" do
+      Mongoid::Criteria.expects(:translate).with(@params).returns(@criteria)
+      @criteria.expects(:count).with(Person).returns(10)
+      Person.count(@params).should == 10
+    end
+
+  end
+
   describe "#field" do
 
     context "with no options" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Durran Jordan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-27 00:00:00 -04:00
+date: 2009-10-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency