mongoid 0.7.8 → 0.7.9

data/VERSION

@@ -1 +1 @@
-0.7.8
+0.7.9

data/lib/mongoid/criteria.rb

@@ -64,8 +64,9 @@ module Mongoid #:nodoc:
     #
     # Returns: <tt>Integer</tt>
     def count(klass = nil)
+      return @count if @count
       @klass = klass if klass
-      return @klass.collection.find(@selector, @options).count
+      return @klass.collection.find(@selector, @options.dup).count
     end
 
     # Adds a criterion to the +Criteria+ that specifies values that are not allowed
@@ -100,13 +101,17 @@ module Mongoid #:nodoc:
     # objects of the type of class provided.
     def execute(klass = nil)
       @klass = klass if klass
-      filter_options
       if type == :first
-        attributes = klass.collection.find_one(@selector, @options)
-        attributes ? @klass.instantiate(attributes) : nil
+        attributes = klass.collection.find_one(@selector, @options.dup)
+        return attributes ? @klass.instantiate(attributes) : nil
       else
-        attributes = @klass.collection.find(@selector, @options)
-        attributes ? attributes.collect { |doc| @klass.instantiate(doc) } : []
+        attributes = @klass.collection.find(@selector, @options.dup)
+        if attributes
+          @count = attributes.count
+          return attributes.collect { |doc| @klass.instantiate(doc) }
+        else
+          return []
+        end
       end
     end
 
@@ -123,7 +128,9 @@ module Mongoid #:nodoc:
     #
     # Returns: <tt>self</tt>
     def extras(extras)
-      @options = extras; self
+      @options = extras
+      filter_options
+      self
     end
 
     GROUP_REDUCE = "function(obj, prev) { prev.group.push(obj); }"
@@ -234,9 +241,7 @@ module Mongoid #:nodoc:
     # will replace it with a skip parameter and return the same value. Defaults
     # to 20 if nothing was provided.
     def offset
-      per_page = @options[:per_page] || 20
-      offset = (page * per_page) - per_page
-      @options[:skip] ||= offset
+      @options[:skip]
     end
 
     # Adds a criterion to the +Criteria+ that specifies the sort order of
@@ -258,15 +263,16 @@ module Mongoid #:nodoc:
     # Either returns the page option and removes it from the options, or
     # returns a default value of 1.
     def page
-      @options[:page] || 1
+      if @options[:skip] && @options[:limit]
+        (@options[:skip].to_i + @options[:limit].to_i) / @options[:limit].to_i
+      else
+        1
+      end
     end
 
     # Returns the number of results per page or the default of 20.
     def per_page
-      num = @options[:per_page] || 20
-      skip = (page * num) - num
-      @options[:skip] = skip
-      num
+      (@options[:limit] || 20).to_i
     end
 
     # Adds a criterion to the +Criteria+ that specifies the fields that will
@@ -351,8 +357,12 @@ module Mongoid #:nodoc:
 
     protected
     def filter_options
-      @options.delete(:page)
-      @options.delete(:per_page)
+      page_num = @options.delete(:page)
+      per_page_num = @options.delete(:per_page)
+      if (page_num || per_page_num)
+        @options[:limit] = (per_page_num || 20).to_i
+        @options[:skip] = (page_num || 1).to_i * @options[:limit] - @options[:limit]
+      end
     end
 
   end

data/lib/mongoid/document.rb

@@ -172,9 +172,8 @@ module Mongoid #:nodoc:
       # Returns paginated array of docs.
       def paginate(params = {})
         criteria = Criteria.translate(:all, params)
-        WillPaginate::Collection.create(criteria.page, criteria.per_page, 0) do |pager|
-          results = criteria.execute(self)
-          pager.total_entries = results.size
+        results = criteria.execute(self)
+        WillPaginate::Collection.create(criteria.page, criteria.per_page, criteria.count) do |pager|
           pager.replace(results)
         end
       end

data/mongoid.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.7.8"
+  s.version = "0.7.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]

data/spec/integration/mongoid/document_spec.rb

@@ -114,6 +114,12 @@ describe Mongoid::Document do
       Person.paginate(:per_page => 20, :page => 2).length.should == 10
     end
 
+    it "returns a proper count" do
+      @criteria = Mongoid::Criteria.translate(:all, { :per_page => 20, :page => 1 })
+      @criteria.execute(Person)
+      @criteria.count.should == 30
+    end
+
   end
 
   describe "#reload" do
@@ -274,10 +280,8 @@ describe Mongoid::Document do
       end
 
       it "creates new versions" do
-        p @comment
         @from_db = Comment.find(@comment.id)
         @from_db.version.should == 6
-        p @from_db
         @from_db.versions.size.should == 5
       end
 

data/spec/unit/mongoid/criteria_spec.rb

@@ -56,19 +56,35 @@ describe Mongoid::Criteria do
 
   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)
+    context "when criteria has not been executed" do
+
+      before do
+        @criteria.instance_variable_set(:@count, 34)
+      end
+
+      it "returns a count from the cursor" do
+        @criteria.count.should == 34
+      end
+
     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
+    context "when criteria has been executed" 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
 
   end
@@ -93,8 +109,8 @@ describe Mongoid::Criteria do
       before do
         @collection = mock
         Person.expects(:collection).returns(@collection)
-        @collection.expects(:find).with(@criteria.selector, @criteria.options).returns([])
         @criteria = Mongoid::Criteria.new(:all).extras(:page => 1, :per_page => 20)
+        @collection.expects(:find).with(@criteria.selector, @criteria.options).returns([])
       end
 
       it "filters out unused params" do
@@ -105,6 +121,23 @@ describe Mongoid::Criteria do
 
     end
 
+    context "when type is :all" do
+
+      before do
+        @collection = mock
+        Person.expects(:collection).returns(@collection)
+        @criteria = Mongoid::Criteria.new(:all).extras(:page => 1, :per_page => 20)
+        @cursor = stub(:count => 44, :collect => [])
+        @collection.expects(:find).with(@criteria.selector, @criteria.options).returns(@cursor)
+      end
+
+      it "adds the count instance variable" do
+        @criteria.execute(Person).should == []
+        @criteria.count.should == 44
+      end
+
+    end
+
     context "when type is :first" do
 
       context "when documents exist" do
@@ -155,6 +188,39 @@ describe Mongoid::Criteria do
 
   describe "#extras" do
 
+    context "filtering" do
+
+      context "when page is provided" do
+
+        it "sets the limit and skip options" do
+          @criteria.extras({ :page => "2" })
+          @criteria.page.should == 2
+          @criteria.options.should == { :skip => 20, :limit => 20 }
+        end
+
+      end
+
+      context "when per_page is provided" do
+
+        it "sets the limit and skip options" do
+          @criteria.extras({ :per_page => 45 })
+          @criteria.options.should == { :skip => 0, :limit => 45 }
+        end
+
+      end
+
+      context "when page and per_page both provided" do
+
+        it "sets the limit and skip options" do
+          @criteria.extras({ :per_page => 30, :page => "4" })
+          @criteria.options.should == { :skip => 90, :limit => 30 }
+          @criteria.page.should == 4
+        end
+
+      end
+
+    end
+
     it "adds the extras to the options" do
       @criteria.extras({ :skip => 10 })
       @criteria.options.should == { :skip => 10 }
@@ -319,9 +385,9 @@ describe Mongoid::Criteria do
           @criteria = Mongoid::Criteria.new(:all)
         end
 
-        it "adds the skip option to the options and returns it" do
-          @criteria.offset.should == 0
-          @criteria.options[:skip].should == 0
+        it "returns nil" do
+          @criteria.offset.should be_nil
+          @criteria.options[:skip].should be_nil
         end
 
       end

data/spec/unit/mongoid/document_spec.rb

@@ -59,7 +59,7 @@ describe Mongoid::Document do
   describe "#all" do
 
     before do
-      @cursor = mock
+      @cursor = stub(:count => 100)
       @people = []
     end
 
@@ -282,7 +282,7 @@ describe Mongoid::Document do
     context "when finding all" do
 
       before do
-        @cursor = mock
+        @cursor = stub(:count => 100)
         @people = []
       end
 
@@ -297,7 +297,7 @@ describe Mongoid::Document do
     context "when sorting" do
 
       before do
-        @cursor = mock
+        @cursor = stub(:count => 50)
         @people = []
       end
 
@@ -550,7 +550,7 @@ describe Mongoid::Document do
   describe "#paginate" do
 
     before do
-      @criteria = stub(:page => 1, :per_page => "20")
+      @criteria = stub(:page => 1, :per_page => "20", :count => 100)
     end
 
     context "when pagination parameters are passed" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.7.8
+  version: 0.7.9
 platform: ruby
 authors: 
 - Durran Jordan