kaminari 0.13.0 → 0.14.0

data/spec/helpers/helpers_spec.rb

@@ -35,13 +35,13 @@ describe 'Kaminari::Helpers::Paginator' do
 #     end
 
 #     context '1 page in total' do
-#       subject { tags_with :num_pages => 1, :current_page => 1 }
+#       subject { tags_with :total_pages => 1, :current_page => 1 }
 #       it { should have(0).tags }
 #     end
 
 #     context '10 pages in total' do
 #       context 'first page' do
-#         subject { tags_with :num_pages => 10, :current_page => 1 }
+#         subject { tags_with :total_pages => 10, :current_page => 1 }
 #         it { should_not contain_tag PrevLink }
 #         it { should contain_tag PrevSpan }
 #         it { should contain_tag CurrentPage }
@@ -54,7 +54,7 @@ describe 'Kaminari::Helpers::Paginator' do
 #       end
 
 #       context 'second page' do
-#         subject { tags_with :num_pages => 10, :current_page => 2 }
+#         subject { tags_with :total_pages => 10, :current_page => 2 }
 #         it { should contain_tag PrevLink }
 #         it { should_not contain_tag PrevSpan }
 #         it { should contain_tag CurrentPage }
@@ -67,7 +67,7 @@ describe 'Kaminari::Helpers::Paginator' do
 #       end
 
 #       context 'third page' do
-#         subject { tags_with :num_pages => 10, :current_page => 3 }
+#         subject { tags_with :total_pages => 10, :current_page => 3 }
 #         it { should contain_tag PrevLink }
 #         it { should_not contain_tag PrevSpan }
 #         it { should contain_tag CurrentPage }
@@ -80,7 +80,7 @@ describe 'Kaminari::Helpers::Paginator' do
 #       end
 
 #       context 'fourth page(no truncation)' do
-#         subject { tags_with :num_pages => 10, :current_page => 4 }
+#         subject { tags_with :total_pages => 10, :current_page => 4 }
 #         it { should contain_tag PrevLink }
 #         it { should_not contain_tag PrevSpan }
 #         it { should contain_tag CurrentPage }
@@ -93,7 +93,7 @@ describe 'Kaminari::Helpers::Paginator' do
 #       end
 
 #       context 'seventh page(no truncation)' do
-#         subject { tags_with :num_pages => 10, :current_page => 7 }
+#         subject { tags_with :total_pages => 10, :current_page => 7 }
 #         it { should contain_tag PrevLink }
 #         it { should_not contain_tag PrevSpan }
 #         it { should contain_tag CurrentPage }
@@ -106,7 +106,7 @@ describe 'Kaminari::Helpers::Paginator' do
 #       end
 
 #       context 'eighth page' do
-#         subject { tags_with :num_pages => 10, :current_page => 8 }
+#         subject { tags_with :total_pages => 10, :current_page => 8 }
 #         it { should contain_tag PrevLink }
 #         it { should_not contain_tag PrevSpan }
 #         it { should contain_tag CurrentPage }
@@ -119,7 +119,7 @@ describe 'Kaminari::Helpers::Paginator' do
 #       end
 
 #       context 'last page' do
-#         subject { tags_with :num_pages => 10, :current_page => 10 }
+#         subject { tags_with :total_pages => 10, :current_page => 10 }
 #         it { should contain_tag PrevLink }
 #         it { should_not contain_tag PrevSpan }
 #         it { should contain_tag CurrentPage }

data/spec/helpers/sinatra_helpers_spec.rb

@@ -1,173 +1,169 @@
 require 'spec_helper'
-require 'spec_helper_for_sinatra'
-
-ERB_TEMPLATE_FOR_PAGINATE = <<EOT
-<div>
-<ul>
-<% @users.each do |user| %>
-  <li class="user_info"><%= user.id %></li>
-<% end %>
-</ul>
-<%= paginate @users, @options %>
-</div>
-EOT
 
-ERB_TEMPLATE_FOR_NEXT_PAGE = <<EOT
-<div>
-<ul>
-<% @users.each do |user| %>
-  <li class="user_info"><%= user.id %></li>
-<% end %>
-</ul>
-<%= link_to_next_page(@users, "Next!", {:id => 'next_page_link'}.merge(@options || {})) %>
-</div>
+if defined? Sinatra
+  ERB_TEMPLATE_FOR_PAGINATE = <<EOT
+  <div>
+  <ul>
+  <% @users.each do |user| %>
+    <li class="user_info"><%= user.id %></li>
+  <% end %>
+  </ul>
+  <%= paginate @users, @options %>
+  </div>
 EOT
 
-describe 'Kaminari::Helpers::SinatraHelper' do
-  before do
-    50.times {|i| User.create! :name => "user#{i}"}
-  end
+  ERB_TEMPLATE_FOR_NEXT_PAGE = <<EOT
+  <div>
+  <ul>
+  <% @users.each do |user| %>
+    <li class="user_info"><%= user.id %></li>
+  <% end %>
+  </ul>
+  <%= link_to_next_page(@users, "Next!", {:id => 'next_page_link'}.merge(@options || {})) %>
+  </div>
+EOT
 
-  describe '#paginate' do
+  describe 'Kaminari::Helpers::SinatraHelper' do
     before do
-      mock_app do
-        register Kaminari::Helpers::SinatraHelpers
-        get '/users' do
-          @page = params[:page] || 1
-          @users = User.page(@page)
-          @options = {}
-          erb ERB_TEMPLATE_FOR_PAGINATE
-        end
-      end
-    end
-
-    context 'normal paginations with Sinatra' do
-      before { get '/users' }
-
-      it 'should have a navigation tag' do
-        last_document.search('nav.pagination').should_not be_empty
-      end
-
-      it 'should have pagination links' do
-        last_document.search('.page a').should have_at_least(1).items
-        last_document.search('.next a').should have_at_least(1).items
-        last_document.search('.last a').should have_at_least(1).items
-      end
-
-      it 'should point to current page' do
-        last_document.search('.current').text.should match /1/
-
-        get '/users?page=2'
-        last_document.search('.current').text.should match /2/
-      end
-
-      it 'should load 25 users' do
-        last_document.search('li.user_info').should have(25).items
-      end
-
-      it 'should preserve params' do
-        get '/users?foo=bar'
-        last_document.search('.page a').should(be_all do |elm|
-          elm.attribute('href').value =~ /foo=bar/
-        end)
-      end
+      50.times {|i| User.create! :name => "user#{i}"}
     end
 
-    context 'optional paginations with Sinatra' do
-      it 'should have 5 windows with 1 gap' do
+    describe '#paginate' do
+      before do
         mock_app do
           register Kaminari::Helpers::SinatraHelpers
           get '/users' do
             @page = params[:page] || 1
-            @users = User.page(@page).per(5)
+            @users = User.page(@page)
             @options = {}
             erb ERB_TEMPLATE_FOR_PAGINATE
           end
         end
-
-        get '/users'
-        last_document.search('.page').should have(6).items
-        last_document.search('.gap').should have(1).item
       end
 
-      it 'should controll the inner window size' do
-        mock_app do
-          register Kaminari::Helpers::SinatraHelpers
-          get '/users' do
-            @page = params[:page] || 1
-            @users = User.page(@page).per(3)
-            @options = {:window => 10}
-            erb ERB_TEMPLATE_FOR_PAGINATE
-          end
+      context 'normal paginations with Sinatra' do
+        before { get '/users' }
+
+        it 'should have a navigation tag' do
+          last_document.search('nav.pagination').should_not be_empty
         end
 
-        get '/users'
-        last_document.search('.page').should have(12).items
-        last_document.search('.gap').should have(1).item
-      end
+        it 'should have pagination links' do
+          last_document.search('.page a').should have_at_least(1).items
+          last_document.search('.next a').should have_at_least(1).items
+          last_document.search('.last a').should have_at_least(1).items
+        end
 
-      it 'should specify a page param name' do
-        mock_app do
-          register Kaminari::Helpers::SinatraHelpers
-          get '/users' do
-            @page = params[:page] || 1
-            @users = User.page(@page).per(3)
-            @options = {:param_name => :user_page}
-            erb ERB_TEMPLATE_FOR_PAGINATE
-          end
+        it 'should point to current page' do
+          last_document.search('.current').text.should match(/1/)
+
+          get '/users?page=2'
+          last_document.search('.current').text.should match(/2/)
         end
 
-        get '/users'
-        last_document.search('.page a').should(be_all do |elm|
-          elm.attribute('href').value =~ /user_page=\d+/
-        end)
+        it 'should load 25 users' do
+          last_document.search('li.user_info').should have(25).items
+        end
+
+        it 'should preserve params' do
+          get '/users?foo=bar'
+          last_document.search('.page a').should(be_all do |elm|
+            elm.attribute('href').value =~ /foo=bar/
+          end)
+        end
       end
-    end
-  end
 
-  describe '#link_to_next_page' do
-    before do
-      mock_app do
-        register Kaminari::Helpers::SinatraHelpers
-        get '/users' do
-          @page = params[:page] || 1
-          @users = User.page(@page)
-          erb ERB_TEMPLATE_FOR_NEXT_PAGE
+      context 'optional paginations with Sinatra' do
+        it 'should have 5 windows with 1 gap' do
+          mock_app do
+            register Kaminari::Helpers::SinatraHelpers
+            get '/users' do
+              @page = params[:page] || 1
+              @users = User.page(@page).per(5)
+              @options = {}
+              erb ERB_TEMPLATE_FOR_PAGINATE
+            end
+          end
+
+          get '/users'
+          last_document.search('.page').should have(6).items
+          last_document.search('.gap').should have(1).item
         end
 
-        get '/users_placeholder' do
-          @page = params[:page] || 1
-          @options = {:placeholder => %{<span id='no_next_page'>No Next Page</span>}}
-          @users = User.page(@page)
-          erb ERB_TEMPLATE_FOR_NEXT_PAGE
+        it 'should controll the inner window size' do
+          mock_app do
+            register Kaminari::Helpers::SinatraHelpers
+            get '/users' do
+              @page = params[:page] || 1
+              @users = User.page(@page).per(3)
+              @options = {:window => 10}
+              erb ERB_TEMPLATE_FOR_PAGINATE
+            end
+          end
+
+          get '/users'
+          last_document.search('.page').should have(12).items
+          last_document.search('.gap').should have(1).item
         end
-      end
-    end
 
-    context 'having more page' do
-      it 'should have a more page link' do
-        get '/users'
-        last_document.search('a#next_page_link').should be_present
-        last_document.search('a#next_page_link').text.should match /Next!/
+        it 'should specify a page param name' do
+          mock_app do
+            register Kaminari::Helpers::SinatraHelpers
+            get '/users' do
+              @page = params[:page] || 1
+              @users = User.page(@page).per(3)
+              @options = {:param_name => :user_page}
+              erb ERB_TEMPLATE_FOR_PAGINATE
+            end
+          end
+
+          get '/users'
+          last_document.search('.page a').should(be_all do |elm|
+            elm.attribute('href').value =~ /user_page=\d+/
+          end)
+        end
       end
     end
 
-    context 'the last page' do
+    describe '#link_to_next_page' do
       before do
-        User.delete_all
-        50.times {|i| User.create! :name => "user#{i}"}
+        mock_app do
+          register Kaminari::Helpers::SinatraHelpers
+          get '/users' do
+            @page = params[:page] || 1
+            @users = User.page(@page)
+            erb ERB_TEMPLATE_FOR_NEXT_PAGE
+          end
+
+          get '/users_placeholder' do
+            @page = params[:page] || 1
+            @options = {:placeholder => %{<span id='no_next_page'>No Next Page</span>}}
+            @users = User.page(@page)
+            erb ERB_TEMPLATE_FOR_NEXT_PAGE
+          end
+        end
       end
 
-      it 'should not have a more page link' do
-        get '/users?page=2'
-        last_document.search('a#next_page_link').should be_empty
+      context 'having more page' do
+        it 'should have a more page link' do
+          get '/users'
+          last_document.search('a#next_page_link').should be_present
+          last_document.search('a#next_page_link').text.should match(/Next!/)
+        end
       end
 
-      it 'should have a no more page notation using placeholder' do
-        get '/users_placeholder?page=2'
-        last_document.search('a#next_page_link').should be_empty
-        last_document.search('span#no_next_page').should be_present
-        last_document.search('span#no_next_page').text.should match /No Next Page/
+      context 'the last page' do
+        it 'should not have a more page link' do
+          get '/users?page=2'
+          last_document.search('a#next_page_link').should be_empty
+        end
+
+        it 'should have a no more page notation using placeholder' do
+          get '/users_placeholder?page=2'
+          last_document.search('a#next_page_link').should be_empty
+          last_document.search('span#no_next_page').should be_present
+          last_document.search('span#no_next_page').text.should match(/No Next Page/)
+        end
       end
     end
   end

data/spec/helpers/tags_spec.rb

@@ -28,11 +28,11 @@ describe 'Kaminari::Helpers' do
 
       describe '#last?' do
         context 'current_page == page' do
-          subject { Paginator::PageProxy.new({:num_pages => 39}, 39, nil) }
+          subject { Paginator::PageProxy.new({:total_pages => 39}, 39, nil) }
           its(:last?) { should be_true }
         end
         context 'current_page != page' do
-          subject { Paginator::PageProxy.new({:num_pages => 39}, 38, nil) }
+          subject { Paginator::PageProxy.new({:total_pages => 39}, 38, nil) }
           its(:last?) { should_not be_true }
         end
       end
@@ -75,16 +75,16 @@ describe 'Kaminari::Helpers' do
       end
 
       describe '#right_outer?' do
-        context 'num_pages - page > right' do
-          subject { Paginator::PageProxy.new({:num_pages => 10, :right => 3}, 6, nil) }
+        context 'total_pages - page > right' do
+          subject { Paginator::PageProxy.new({:total_pages => 10, :right => 3}, 6, nil) }
           its(:right_outer?) { should_not be_true }
         end
-        context 'num_pages - page == right' do
-          subject { Paginator::PageProxy.new({:num_pages => 10, :right => 3}, 7, nil) }
+        context 'total_pages - page == right' do
+          subject { Paginator::PageProxy.new({:total_pages => 10, :right => 3}, 7, nil) }
           its(:right_outer?) { should_not be_true }
         end
-        context 'num_pages - page < right' do
-          subject { Paginator::PageProxy.new({:num_pages => 10, :right => 3}, 8, nil) }
+        context 'total_pages - page < right' do
+          subject { Paginator::PageProxy.new({:total_pages => 10, :right => 3}, 8, nil) }
           its(:right_outer?) { should be_true }
         end
       end

data/spec/models/active_record/active_record_relation_methods_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+if defined? ActiveRecord
+  describe Kaminari::ActiveRecordRelationMethods do
+    describe '#total_count' do
+      before do
+        @author = User.create! :name => 'author'
+        @author2 = User.create! :name => 'author2'
+        @author3 = User.create! :name => 'author3'
+        @books = 2.times.map {|i| @author.books_authored.create!(:title => "title%03d" % i) }
+        @books2 = 3.times.map {|i| @author2.books_authored.create!(:title => "title%03d" % i) }
+        @books3 = 4.times.map {|i| @author3.books_authored.create!(:title => "subject%03d" % i) }
+        @readers = 4.times.map { User.create! :name => 'reader' }
+        @books.each {|book| book.readers << @readers }
+      end
+
+      context "when the scope includes an order which references a generated column" do
+        it "should successfully count the results" do
+          @author.readers.by_read_count.page(1).total_count.should == @readers.size
+        end
+      end
+      context "when the scope use conditions on includes" do
+        it "should keep includes and successfully count the results" do
+          # Only @author and @author2 have books titled with the title00x partern
+          User.includes(:books_authored).where("books.title LIKE 'title00%'").page(1).total_count.should == 2
+        end
+      end
+    end
+  end
+end

data/spec/models/active_record/default_per_page_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+if defined? ActiveRecord
+
+  describe 'default per_page' do
+    describe 'AR::Base' do
+      subject { ActiveRecord::Base }
+      it { should_not respond_to :paginates_per }
+    end
+
+    subject { User.page 0 }
+
+    context 'by default' do
+      its(:limit_value) { should == 25 }
+    end
+
+    context 'when explicitly set via paginates_per' do
+      before { User.paginates_per 1326 }
+      its(:limit_value) { should == 1326 }
+      after { User.paginates_per nil }
+    end
+
+    describe "default per_page value's independency per model" do
+      context "when User's default per_page was changed" do
+        before { User.paginates_per 1326 }
+        subject { Book.page 0 }
+        its(:limit_value) { should == 25 }
+        after { User.paginates_per nil }
+      end
+    end
+  end
+end