mongomodel 0.4.7 → 0.4.8

data/lib/mongomodel.rb

@@ -38,6 +38,7 @@ module MongoModel
   autoload :MongoOptions,     'mongomodel/support/mongo_options'
   autoload :MongoOrder,       'mongomodel/support/mongo_order'
   autoload :MongoOperator,    'mongomodel/support/mongo_operator'
+  autoload :Paginator,        'mongomodel/support/paginator'
   autoload :Scope,            'mongomodel/support/scope'
   autoload :Types,            'mongomodel/support/types'
   autoload :Configuration,    'mongomodel/support/configuration'

data/lib/mongomodel/support/paginator.rb

@@ -0,0 +1,39 @@
+module MongoModel
+  class Paginator < Array
+    attr_reader :current_page, :per_page, :total_entries
+    
+    def initialize(scope, page, per_page)
+      @current_page = page.to_i
+      @per_page = per_page.to_i
+      
+      super(scope.offset(offset).limit(per_page))
+      
+      # Try to autodetect total entries
+      if total_entries.nil? && size < per_page && (current_page == 1 or size > 0)
+        @total_entries = offset + size
+      else
+        @total_entries = scope.count
+      end
+    end
+    
+    def total_pages
+      total_entries.zero? ? 1 : (total_entries / per_page.to_f).ceil
+    end
+    
+    def previous_page
+      current_page > 1 ? (current_page - 1) : nil
+    end
+    
+    def next_page
+      current_page < total_pages ? (current_page + 1) : nil
+    end
+    
+    def out_of_bounds?
+      current_page > total_pages
+    end
+    
+    def offset
+      (current_page - 1) * per_page
+    end
+  end
+end

data/lib/mongomodel/support/scope/pagination.rb

@@ -1,5 +1,3 @@
-require 'will_paginate/collection'
-
 module MongoModel
   class Scope
     module Pagination
@@ -7,10 +5,7 @@ module MongoModel
         page     = options[:page] || 1
         per_page = options[:per_page] || klass.per_page
         
-        WillPaginate::Collection.create(page, per_page) do |pager|
-          pager.replace offset(pager.offset).limit(pager.per_page)
-          pager.total_entries ||= count
-        end
+        Paginator.new(self, page, per_page)
       end
     end
   end

data/lib/mongomodel/version.rb

@@ -1,3 +1,3 @@
 module MongoModel
-  VERSION = "0.4.7"
+  VERSION = "0.4.8"
 end

data/mongomodel.gemspec

@@ -17,7 +17,6 @@ Gem::Specification.new do |s|
   s.add_dependency "activesupport", ">= 3.1"
   s.add_dependency "activemodel",   ">= 3.1"
   s.add_dependency "mongo",         "~> 1.5"
-  s.add_dependency "will_paginate", "~> 2.3.15"
 
   s.add_development_dependency "bundler",     ">= 1.0.0"
   s.add_development_dependency "rspec",       "~> 2.8"

data/spec/mongomodel/support/paginator_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+module MongoModel
+  describe Paginator do
+    let(:entries) { [stub] * 10 }
+    let(:scope) { stub(:count => 35, :limit => entries).as_null_object }
+    let(:page) { 2 }
+    let(:per_page) { 10 }
+    
+    subject { Paginator.new(scope, page, per_page) }
+    
+    it { should be_a_kind_of(Array) }
+    
+    its(:total_entries) { should == 35 }
+    its(:total_pages) { should == 4 }
+    
+    its(:current_page) { should == 2 }
+    its(:previous_page) { should == 1 }
+    its(:next_page) { should == 3 }
+    its(:offset) { should == 10 }
+    
+    its(:size) { should == 10 }
+    
+    it { should_not be_out_of_bounds }
+    
+    context "first page" do
+      let(:page) { 1 }
+      
+      its(:previous_page) { should be_nil }
+      its(:next_page) { should == 2 }
+      its(:offset) { should == 0 }
+    end
+    
+    context "last page" do
+      let(:entries) { [stub] * 5 }
+      before { scope.stub(:count => nil) }
+      
+      let(:page) { 4 }
+      
+      its(:previous_page) { should == 3 }
+      its(:next_page) { should be_nil }
+    end
+    
+    context "no entries" do
+      before { scope.stub(:count => 0) }
+      
+      its(:total_pages) { should == 1 }
+    end
+    
+    context "out of bounds" do
+      let(:page) { 5 }
+      
+      it { should be_out_of_bounds }
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongomodel
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-22 00:00:00.000000000 Z
+date: 2012-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -59,22 +59,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: will_paginate
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.3.15
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.3.15
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -207,6 +191,7 @@ files:
 - lib/mongomodel/support/mongo_operator.rb
 - lib/mongomodel/support/mongo_options.rb
 - lib/mongomodel/support/mongo_order.rb
+- lib/mongomodel/support/paginator.rb
 - lib/mongomodel/support/reference.rb
 - lib/mongomodel/support/scope.rb
 - lib/mongomodel/support/scope/batches.rb
@@ -282,6 +267,7 @@ files:
 - spec/mongomodel/support/mongo_operator_spec.rb
 - spec/mongomodel/support/mongo_options_spec.rb
 - spec/mongomodel/support/mongo_order_spec.rb
+- spec/mongomodel/support/paginator_spec.rb
 - spec/mongomodel/support/property_spec.rb
 - spec/mongomodel/support/scope_spec.rb
 - spec/spec.opts
@@ -310,6 +296,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1652112125246390451
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -323,4 +312,3 @@ signing_key:
 specification_version: 3
 summary: MongoDB ORM for Ruby/Rails
 test_files: []
-has_rdoc: