kaminari 0.8.0 → 0.9.0

data/CHANGELOG

@@ -1,3 +1,10 @@
+== 0.9.0
+
+* added "per_page" to the template local variables #3 [hsbt]
+
+* show no contents when the current page is the only page (in other words,
+num_pages == 1) #2 [hsbt]
+
 == 0.8.0
 
 * using HTML5 <nav> tag rather than <div> for the container tag

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.9.0

data/app/views/kaminari/_current_page.html.erb

@@ -1 +1,9 @@
+<%# available local variables:
+  page:          the page number of this page
+  page_url:      url to this page
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
+-%>
 <span class="page current"><%= page %></span>

data/app/views/kaminari/_current_page.html.haml

@@ -1,2 +1,9 @@
+-# available local variables:
+  page:          the page number of this page
+  page_url:      url to this page
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
 %span.page.current
   = page

data/app/views/kaminari/_first_page_link.html.erb

@@ -1,3 +1,11 @@
+<%# available local variables:
+  page:          the page number of this page
+  page_url:      url to this page
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
+-%>
 <span class="page first">
   <%= link_to page, page_url, :remote => remote %>
 </span>

data/app/views/kaminari/_first_page_link.html.haml

@@ -1,2 +1,9 @@
+-# available local variables:
+  page:          the page number of this page
+  page_url:      url to this page
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
 %span.page.first
   = link_to page, page_url, :remote => remote

data/app/views/kaminari/_last_page_link.html.erb

@@ -1,3 +1,11 @@
+<%# available local variables:
+  page:          the page number of this page
+  page_url:      url to this page
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
+-%>
 <span class="page last">
   <%= link_to page, page_url, :remote => remote %>
 </span>

data/app/views/kaminari/_last_page_link.html.haml

@@ -1,2 +1,9 @@
+-# available local variables:
+  page:          the page number of this page
+  page_url:      url to this page
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
 %span.page.last
   = link_to page, page_url, :remote => remote

data/app/views/kaminari/_next_link.html.erb

@@ -1,3 +1,10 @@
+<%# available local variables:
+  next_url:      url to the next page
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
+-%>
 <span class="next">
   <%= link_to_if (current_page < num_pages), raw('Next &raquo;'), next_url, :class => 'next', :rel => 'next', :remote => remote %>
 </span>

data/app/views/kaminari/_next_link.html.haml

@@ -1,2 +1,8 @@
+-# available local variables:
+  next_url:      url to the next page
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
 %span.next
   = link_to_if (current_page < num_pages), raw('Next &raquo;'), next_url, :class => 'next', :rel => 'next', :remote => remote

data/app/views/kaminari/_next_span.html.erb

@@ -1 +1,7 @@
+<%# available local variables:
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
+-%>
 <span class="next"></span>

data/app/views/kaminari/_next_span.html.haml

@@ -1 +1,6 @@
+-# available local variables:
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
 %span.next

data/app/views/kaminari/_page_link.html.erb

@@ -1,3 +1,11 @@
+<%# available local variables:
+  page:          the page number of this page
+  page_url:      url to this page
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
+-%>
 <span class="page">
   <%= link_to page, page_url, :remote => remote %>
 </span>

data/app/views/kaminari/_page_link.html.haml

@@ -1,2 +1,9 @@
+-# available local variables:
+  page:          the page number of this page
+  page_url:      url to this page
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
 %span.page
   = link_to page, page_url, :remote => remote

data/app/views/kaminari/_paginator.html.erb

@@ -1,3 +1,9 @@
+<%# available local variables:
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
+-%>
 <nav class='pagination'>
   <%= content_for :kaminari_paginator_tags %>
 </nav>

data/app/views/kaminari/_paginator.html.haml

@@ -1,2 +1,7 @@
+-# available local variables:
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
 %nav.pagination
   = content_for :kaminari_paginator_tags

data/app/views/kaminari/_prev_link.html.erb

@@ -1,3 +1,10 @@
+<%# available local variables:
+  prev_url:      url to the previous page
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
+-%>
 <span class="prev">
   <%= link_to_if (current_page > 1), raw('&laquo; Prev'), prev_url, :class => 'prev', :rel => 'prev', :remote => remote %>
 </span>

data/app/views/kaminari/_prev_link.html.haml

@@ -1,2 +1,8 @@
+-# available local variables:
+  prev_url:      url to the previous page
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
 %span.prev
   = link_to_if (current_page > 1), raw('« Prev'), prev_url, :class => 'prev', :rel => 'prev', :remote => remote

data/app/views/kaminari/_prev_span.html.erb

@@ -1 +1,7 @@
+<%# available local variables:
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
+-%>
 <span class="prev"></span>

data/app/views/kaminari/_prev_span.html.haml

@@ -1 +1,6 @@
+-# available local variables:
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
 %span.prev

data/app/views/kaminari/_truncated_span.html.erb

@@ -1 +1,7 @@
+<%# available local variables:
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
+-%>
 <span class="page">...</span>

data/app/views/kaminari/_truncated_span.html.haml

@@ -1,2 +1,7 @@
+-# available local variables:
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
 %span.page
   \...

data/kaminari.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kaminari}
-  s.version = "0.8.0"
+  s.version = "0.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Akira Matsuda"]
-  s.date = %q{2011-02-08}
+  s.date = %q{2011-02-09}
   s.description = %q{Kaminari is a Scope & Engine based clean and powerful and customizable and sophisticated paginator for Rails 3}
   s.email = %q{ronnie@dio.jp}
   s.extra_rdoc_files = [

data/lib/kaminari/helpers.rb

@@ -67,6 +67,7 @@ module Kaminari
 
       def tagify_links
         num_pages, current_page, left, window, right = @options[:num_pages], @options[:current_page], @left, @window, @right
+        return [] if num_pages <= 1
 
         tags = []
         tags << (current_page > 1 ? PrevLink.new(self) : PrevSpan.new(self))
@@ -129,7 +130,7 @@ module Kaminari
     end
 
     def paginate(scope, options = {}, &block)
-      PaginationRenderer.new self, options.reverse_merge(:current_page => scope.current_page, :num_pages => scope.num_pages, :remote => false)
+      PaginationRenderer.new self, options.reverse_merge(:current_page => scope.current_page, :num_pages => scope.num_pages, :per_page => scope.limit_value, :remote => false)
     end
   end
 end

data/spec/helpers/helpers_spec.rb

@@ -15,95 +15,102 @@ describe 'Kaminari::Helpers::PaginationRenderer' do
       PaginationRenderer.new(renderer, options).tagify_links
     end
 
-    context 'first page' do
-      subject { tags_with :num_pages => 10, :current_page => 1 }
-      it { should_not contain_tag PrevLink }
-      it { should contain_tag PrevSpan }
-      it { should contain_tag CurrentPage }
-      it { should_not contain_tag FirstPageLink }
-      it { should contain_tag LastPageLink }
-      it { should contain_tag PageLink }
-      it { should contain_tag NextLink }
-      it { should_not contain_tag NextSpan }
-      it { should contain_tag TruncatedSpan }
+    context '1 page in total' do
+      subject { tags_with :num_pages => 1, :current_page => 1 }
+      it { should have(0).tags }
     end
 
-    context 'second page' do
-      subject { tags_with :num_pages => 10, :current_page => 2 }
-      it { should contain_tag PrevLink }
-      it { should_not contain_tag PrevSpan }
-      it { should contain_tag CurrentPage }
-      it { should contain_tag FirstPageLink }
-      it { should contain_tag LastPageLink }
-      it { should contain_tag PageLink }
-      it { should contain_tag NextLink }
-      it { should_not contain_tag NextSpan }
-      it { should contain_tag TruncatedSpan }
-    end
+    context '10 pages in total' do
+      context 'first page' do
+        subject { tags_with :num_pages => 10, :current_page => 1 }
+        it { should_not contain_tag PrevLink }
+        it { should contain_tag PrevSpan }
+        it { should contain_tag CurrentPage }
+        it { should_not contain_tag FirstPageLink }
+        it { should contain_tag LastPageLink }
+        it { should contain_tag PageLink }
+        it { should contain_tag NextLink }
+        it { should_not contain_tag NextSpan }
+        it { should contain_tag TruncatedSpan }
+      end
 
-    context 'third page' do
-      subject { tags_with :num_pages => 10, :current_page => 3 }
-      it { should contain_tag PrevLink }
-      it { should_not contain_tag PrevSpan }
-      it { should contain_tag CurrentPage }
-      it { should contain_tag FirstPageLink }
-      it { should contain_tag LastPageLink }
-      it { should contain_tag PageLink }
-      it { should contain_tag NextLink }
-      it { should_not contain_tag NextSpan }
-      it { should contain_tag TruncatedSpan }
-    end
+      context 'second page' do
+        subject { tags_with :num_pages => 10, :current_page => 2 }
+        it { should contain_tag PrevLink }
+        it { should_not contain_tag PrevSpan }
+        it { should contain_tag CurrentPage }
+        it { should contain_tag FirstPageLink }
+        it { should contain_tag LastPageLink }
+        it { should contain_tag PageLink }
+        it { should contain_tag NextLink }
+        it { should_not contain_tag NextSpan }
+        it { should contain_tag TruncatedSpan }
+      end
 
-    context 'fourth page(no truncation)' do
-      subject { tags_with :num_pages => 10, :current_page => 4 }
-      it { should contain_tag PrevLink }
-      it { should_not contain_tag PrevSpan }
-      it { should contain_tag CurrentPage }
-      it { should contain_tag FirstPageLink }
-      it { should contain_tag LastPageLink }
-      it { should contain_tag PageLink }
-      it { should contain_tag NextLink }
-      it { should_not contain_tag NextSpan }
-      it { should_not contain_tag TruncatedSpan }
-    end
+      context 'third page' do
+        subject { tags_with :num_pages => 10, :current_page => 3 }
+        it { should contain_tag PrevLink }
+        it { should_not contain_tag PrevSpan }
+        it { should contain_tag CurrentPage }
+        it { should contain_tag FirstPageLink }
+        it { should contain_tag LastPageLink }
+        it { should contain_tag PageLink }
+        it { should contain_tag NextLink }
+        it { should_not contain_tag NextSpan }
+        it { should contain_tag TruncatedSpan }
+      end
 
-    context 'seventh page(no truncation)' do
-      subject { tags_with :num_pages => 10, :current_page => 7 }
-      it { should contain_tag PrevLink }
-      it { should_not contain_tag PrevSpan }
-      it { should contain_tag CurrentPage }
-      it { should contain_tag FirstPageLink }
-      it { should contain_tag LastPageLink }
-      it { should contain_tag PageLink }
-      it { should contain_tag NextLink }
-      it { should_not contain_tag NextSpan }
-      it { should_not contain_tag TruncatedSpan }
-    end
+      context 'fourth page(no truncation)' do
+        subject { tags_with :num_pages => 10, :current_page => 4 }
+        it { should contain_tag PrevLink }
+        it { should_not contain_tag PrevSpan }
+        it { should contain_tag CurrentPage }
+        it { should contain_tag FirstPageLink }
+        it { should contain_tag LastPageLink }
+        it { should contain_tag PageLink }
+        it { should contain_tag NextLink }
+        it { should_not contain_tag NextSpan }
+        it { should_not contain_tag TruncatedSpan }
+      end
 
-    context 'eighth page' do
-      subject { tags_with :num_pages => 10, :current_page => 8 }
-      it { should contain_tag PrevLink }
-      it { should_not contain_tag PrevSpan }
-      it { should contain_tag CurrentPage }
-      it { should contain_tag FirstPageLink }
-      it { should contain_tag LastPageLink }
-      it { should contain_tag PageLink }
-      it { should contain_tag NextLink }
-      it { should_not contain_tag NextSpan }
-      it { should contain_tag TruncatedSpan }
-    end
+      context 'seventh page(no truncation)' do
+        subject { tags_with :num_pages => 10, :current_page => 7 }
+        it { should contain_tag PrevLink }
+        it { should_not contain_tag PrevSpan }
+        it { should contain_tag CurrentPage }
+        it { should contain_tag FirstPageLink }
+        it { should contain_tag LastPageLink }
+        it { should contain_tag PageLink }
+        it { should contain_tag NextLink }
+        it { should_not contain_tag NextSpan }
+        it { should_not contain_tag TruncatedSpan }
+      end
+
+      context 'eighth page' do
+        subject { tags_with :num_pages => 10, :current_page => 8 }
+        it { should contain_tag PrevLink }
+        it { should_not contain_tag PrevSpan }
+        it { should contain_tag CurrentPage }
+        it { should contain_tag FirstPageLink }
+        it { should contain_tag LastPageLink }
+        it { should contain_tag PageLink }
+        it { should contain_tag NextLink }
+        it { should_not contain_tag NextSpan }
+        it { should contain_tag TruncatedSpan }
+      end
 
-    context 'last page' do
-      subject { tags_with :num_pages => 10, :current_page => 10 }
-      it { should contain_tag PrevLink }
-      it { should_not contain_tag PrevSpan }
-      it { should contain_tag CurrentPage }
-      it { should contain_tag FirstPageLink }
-      it { should_not contain_tag LastPageLink }
-      it { should contain_tag PageLink }
-      it { should_not contain_tag NextLink }
-      it { should contain_tag NextSpan }
-      it { should contain_tag TruncatedSpan }
+      context 'last page' do
+        subject { tags_with :num_pages => 10, :current_page => 10 }
+        it { should contain_tag PrevLink }
+        it { should_not contain_tag PrevSpan }
+        it { should contain_tag CurrentPage }
+        it { should contain_tag FirstPageLink }
+        it { should_not contain_tag LastPageLink }
+        it { should contain_tag PageLink }
+        it { should_not contain_tag NextLink }
+        it { should contain_tag NextSpan }
+        it { should contain_tag TruncatedSpan }
+      end
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kaminari
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 59
   prerelease: 
   segments: 
   - 0
-  - 8
+  - 9
   - 0
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Akira Matsuda
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-08 00:00:00 +09:00
+date: 2011-02-09 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency