mongoid-pagination 0.1.0 → 0.2.0

data/.gitignore

@@ -1,3 +1,2 @@
 .rspec
 Gemfile.lock
-pkg

data/lib/mongoid/pagination.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext'
+
 module Mongoid
   module Pagination
     extend ActiveSupport::Concern
@@ -12,15 +14,19 @@ module Mongoid
       #
       # @return [Mongoid::Criteria]
       def paginate(opts = {})
-        return criteria if opts[:limit].nil? and opts[:page].nil?
+        return criteria if opts[:limit].blank? and opts[:page].blank? and opts[:offset].blank?
 
         limit = (opts[:limit] || 25).to_i
         page  = (opts[:page]  || 1).to_i
 
-        if page > 1
-          offset = (page - 1) * limit
+        if opts[:page].blank?
+          offset = (opts[:offset] || 0)
         else
-          offset = 0
+          if page > 1
+            offset = (page - 1) * limit
+          else
+            offset = 0
+          end
         end
 
         per_page(limit).offset(offset)

data/lib/mongoid/pagination/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Pagination
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

data/mongoid-pagination.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'mongoid'
+  s.add_dependency 'activesupport'
 end

data/spec/pagination_spec.rb

@@ -20,6 +20,10 @@ describe Mongoid::Pagination do
           subject.options[:skip].should be_nil
         end
 
+        it "does not set the offset param by default" do
+          subject.options[:offset].should be_nil
+        end
+
         it "defaults the limit param to 25" do
           subject.options[:limit].should be_nil
         end
@@ -44,7 +48,27 @@ describe Mongoid::Pagination do
         end
       end
 
-      describe "when passed a limit param but no page" do
+      describe "when passed an offset param but no limit" do
+        subject { Person.paginate(:offset => 10) }
+
+        it "defaults the limit to 25" do
+          subject.options[:limit].should == 25
+        end
+
+        it "sets the offset to 10" do
+          subject.options[:skip].should == 10
+        end
+      end
+
+      describe "when passed an offset param and a page param" do
+        subject { Person.paginate(:offset => 0, :page => 2) }
+
+        it "uses the calculated offset from page instead of the offset param" do
+          subject.options[:skip].should == 25
+        end
+      end
+
+      describe "when passed a limit param but no page or offset" do
         subject { Person.paginate(:limit => 100) }
 
         it "defaults the page to 0" do
@@ -56,16 +80,32 @@ describe Mongoid::Pagination do
         end
       end
 
-      it "sets the skip param to 0 if passed 0" do
-        Person.paginate(:page => 0).options[:skip].should == 0
-      end
+      context "page param" do
+        it "sets the skip param to 0 if passed 0" do
+          Person.paginate(:page => 0).options[:skip].should == 0
+        end
+
+        it "sets the skip param to 0 if passed a string of 0" do
+          Person.paginate(:page => '0').options[:skip].should == 0
+        end
 
-      it "sets the skip param to 0 if passed a string of 0" do
-        Person.paginate(:page => '0').options[:skip].should == 0
+        it "sets the skip param to 0 if the passed a string of 1" do
+          Person.paginate(:page => '1').options[:skip].should == 0
+        end
       end
 
-      it "sets the skip param to 0 if the passed a string of 1" do
-        Person.paginate(:page => '1').options[:skip].should == 0
+      context "offset param" do
+        it "sets the skip param to 0 if passed 0" do
+          Person.paginate(:offset => 0).options[:skip].should == 0
+        end
+
+        it "sets the skip param to 0 if passed a string of 0" do
+          Person.paginate(:offset => '0').options[:skip].should == 0
+        end
+
+        it "sets the skip param to 1 if the passed a string of 1" do
+          Person.paginate(:offset => '1').options[:skip].should == 1
+        end
       end
 
       it "limits when passed a string param" do
@@ -78,12 +118,24 @@ describe Mongoid::Pagination do
     end
 
     context "results" do
-      it "paginates correctly on the first page" do
-        Person.paginate(:page => 1, :limit => 2).to_a.should == [one, two]
+      context "page param" do
+        it "paginates correctly on the first page" do
+          Person.paginate(:page => 1, :limit => 2).to_a.should == [one, two]
+        end
+
+        it "paginates correctly on the second page" do
+          Person.paginate(:page => 2, :limit => 2).to_a.should == [three, four]
+        end
       end
 
-      it "paginates correctly on the second page" do
-        Person.paginate(:page => 2, :limit => 2).to_a.should == [three, four]
+      context "offset param" do
+        it "paginates correctly on the first page" do
+          Person.paginate(:offset => 0, :limit => 2).to_a.should == [one, two]
+        end
+
+        it "paginates correctly on the second page" do
+          Person.paginate(:page => 2, :limit => 2).to_a.should == [three, four]
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-pagination
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-21 00:00:00.000000000 Z
+date: 2012-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70283948946940 !ruby/object:Gem::Requirement
+  requirement: &70234213653760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70283948946940
+  version_requirements: *70234213653760
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70234213653260 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70234213653260
 description: A simple pagination module for Mongoid
 email:
 - ajsharp@gmail.com