diff --git a/lib/kaminari/active_record.rb b/lib/kaminari/active_record.rb index ad665d9..5fe9c5a 100644 --- a/lib/kaminari/active_record.rb +++ b/lib/kaminari/active_record.rb @@ -1,7 +1,7 @@ module Kaminari module ActiveRecord extend ActiveSupport::Concern - PER_PAGE = 10 + PER_PAGE = 25 included do def self.inherited(kls) @@ -17,7 +17,7 @@ module Kaminari scope :page, lambda {|num| offset(PER_PAGE * ([num.to_i, 1].max - 1)).limit(PER_PAGE) } do - # page(3).per(20) + # page(3).per(10) def per(num) offset(offset_value / limit_value * num).limit(num) end diff --git a/spec/models/scopes_spec.rb b/spec/models/scopes_spec.rb index 91bb4b4..ce58732 100644 --- a/spec/models/scopes_spec.rb +++ b/spec/models/scopes_spec.rb @@ -3,13 +3,13 @@ require File.expand_path('../spec_helper', File.dirname(__FILE__)) describe Kaminari::ActiveRecord do before :all do User.delete_all - 1.upto(20) {|i| User.create! :name => "user#{'%02d' % i}" } + 1.upto(100) {|i| User.create! :name => "user#{'%03d' % i}" } end describe '#page' do shared_examples_for 'the first page' do - it { should have(10).users } - its('first.name') { should == 'user01' } + it { should have(25).users } + its('first.name') { should == 'user001' } end shared_examples_for 'blank page' do @@ -23,8 +23,8 @@ describe Kaminari::ActiveRecord do context 'page 2' do subject { User.page 2 } - it { should have(10).users } - its('first.name') { should == 'user11' } + it { should have(25).users } + its('first.name') { should == 'user026' } end context 'page without an argument' do @@ -38,7 +38,7 @@ describe Kaminari::ActiveRecord do end context 'page > max page' do - subject { User.page 3 } + subject { User.page 5 } it_should_behave_like 'blank page' end end @@ -47,36 +47,36 @@ describe Kaminari::ActiveRecord do context 'page 1 per 5' do subject { User.page(1).per(5) } it { should have(5).users } - its('first.name') { should == 'user01' } + its('first.name') { should == 'user001' } end end describe '#num_pages' do - context 'per 10' do - subject { User.page.num_pages } - it { should == 2 } + context 'per 25 (default)' do + subject { User.page } + its(:num_pages) { should == 4 } end context 'per 7' do - subject { User.page(2).per(7).num_pages } - it { should == 3 } + subject { User.page(2).per(7) } + its(:num_pages) { should == 15 } end context 'per 65536' do - subject { User.page(50).per(65536).num_pages } - it { should == 1 } + subject { User.page(50).per(65536) } + its(:num_pages) { should == 1 } end end describe '#current_page' do context 'page 1' do - subject { User.page.current_page } - it { should == 1 } + subject { User.page } + its(:current_page) { should == 1 } end context 'page 2' do - subject { User.page(2).per(3).current_page } - it { should == 2 } + subject { User.page(2).per 3 } + its(:current_page) { should == 2 } end end end