mongoid 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/mongoid/document.rb

@@ -127,7 +127,9 @@ module Mongoid #:nodoc:
           params[:page] || 1,
           params[:per_page] || 20,
           0) do |pager|
-            results = collection.find(selector, { :limit => pager.per_page, :offset => pager.offset })
+            results = collection.find(selector, { :sort => (params[:sort] || {}),
+                                                  :limit => pager.per_page,
+                                                  :offset => pager.offset })
             pager.total_entries = results.count
             pager.replace(results.collect { |doc| new(doc) })
         end

data/mongoid.gemspec

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

data/spec/unit/mongoid/document_spec.rb

@@ -419,7 +419,7 @@ describe Mongoid::Document do
     context "when pagination parameters are passed" do
 
       it "delegates to will paginate with the results" do
-        @collection.expects(:find).with({ :test => "Test" }, {:limit => 20, :offset => 20}).returns(@cursor)
+        @collection.expects(:find).with({ :test => "Test" }, { :sort => {}, :limit => 20, :offset => 20}).returns(@cursor)
         Person.paginate(:conditions => { :test => "Test" }, :page => 2, :per_page => 20)
       end
 
@@ -428,12 +428,21 @@ describe Mongoid::Document do
     context "when pagination parameters are not passed" do
 
       it "delegates to will paginate with default values" do
-        @collection.expects(:find).with({ :test => "Test" }, {:limit => 20, :offset => 0}).returns(@cursor)
+        @collection.expects(:find).with({ :test => "Test" }, { :sort => {}, :limit => 20, :offset => 0}).returns(@cursor)
         Person.paginate(:conditions => { :test => "Test" })
       end
 
     end
 
+    context "when sorting paramters provided" do
+
+      it "adds the sorting parameters in the collection#find" do
+        @collection.expects(:find).with({ :test => "Test" }, { :sort => { :test => -1}, :limit => 20, :offset => 0}).returns(@cursor)
+        Person.paginate(:conditions => { :test => "Test" }, :sort => { :test => -1 })
+      end
+
+    end
+
   end
 
   describe "#parent" do

metadata

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