pagination 0.3.2 → 0.3.3

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/lib/pagination/collection.rb

@@ -46,17 +46,23 @@ module Pagination
     # based on the current page.
     #
     # If we have 100 pages for example and we're at page 50,
-    # this would simple return 
+    # this would simply return 
     #
-    #     [50, 51, 52, 53, 54, 55, 56, 57, 58, 59]
+    #     [45, 46, 47, 48, 49, 50, 51, 52, 53, 54]
     #
     # When we're at page 1, it displays 1 to 10.
     #
     # You can pass in a number to limit the total displayed pages.
-    # 1 2 3 4 5
-    def displayed_pages(limit = 10)
-      lower = [page, [pages.last - limit, 0].max + 1].min
-      upper = [page + limit - 1, pages.last].min
+    def displayed_pages(limit = 10, left_offset = -5, right_offset = 4)
+      lower, upper = nil, nil
+
+      if page + left_offset < 1 || page + right_offset > pages.last
+        lower = [page, [pages.last - limit, 0].max + 1].min
+        upper = [page + limit - 1, pages.last].min
+      else
+        lower = page + left_offset
+        upper = page + right_offset
+      end
 
       (lower..upper).to_a
     end
@@ -73,6 +79,10 @@ module Pagination
     def each(&block)
       collection.each(&block) 
     end
+    
+    def total_pages
+      (total / per_page.to_f).ceil
+    end
 
   protected
     def collection
@@ -80,12 +90,7 @@ module Pagination
     end
 
     def pages
-      1..last_page
+      1..total_pages
     end
-
-    def last_page
-      (total / per_page.to_f).ceil
-    end
-
   end
 end

data/pagination.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pagination}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cyril David"]
-  s.date = %q{2010-06-04}
+  s.date = %q{2010-06-10}
   s.default_executable = %q{pagination}
   s.description = %q{Trying to make the pagination world a better place}
   s.email = %q{cyx.ucron@gmail.com}

data/test/test_pagination.rb

@@ -71,34 +71,59 @@ class TestPagination < Test::Unit::TestCase
     end
   end
   
-  context "given we have 100 pages and we're at page 1" do
+  context "given we have 100 pages and we're at pages 1 to 6" do
+    should "have 1 to 10 of displayed_pages" do
+      (1..6).each do |p|
+        collection = Pagination.paginate((1..100).to_a, :per_page => p)
+        assert_equal (1..10).to_a, collection.displayed_pages
+      end
+    end
+  end
+
+  context "given we have 100 pages and we're at page 7" do
     setup do
-      @collection = Pagination.paginate((1..100).to_a, :per_page => 1)
+      @collection = Pagination.paginate((1..100).to_a, :per_page => 1, :page => 7)
     end
     
-    should "have 1 to 10 of displayed_pages" do
-      assert_equal (1..10).to_a, @collection.displayed_pages
+    should "have 2 to 11 of displayed_pages" do
+      assert_equal (2..11).to_a, @collection.displayed_pages
     end
   end
 
+
   context "given we have 100 pages and we're at page 50" do
     setup do
       @collection = Pagination.paginate((1..100).to_a, :per_page => 1, :page => 50)
     end
     
-    should "have 50 to 59 of displayed_pages" do
-      assert_equal (50..59).to_a, @collection.displayed_pages
+    should "have 45 to 54 of displayed_pages" do
+      assert_equal (45..54).to_a, @collection.displayed_pages
+    end
+  end
+
+  context "given we have 100 pages and we're at page 94" do
+    should "start with 89 and end with 98" do
+      collection = Pagination.paginate((1..100).to_a, :per_page => 1, :page => 94)
+      assert_equal (89..98).to_a, collection.displayed_pages
+    end
+  end
+
+  context "given we have 100 pages and we're at page 95" do
+    should "start with 90 and end with 99" do
+      collection = Pagination.paginate((1..100).to_a, :per_page => 1, :page => 95)
+      assert_equal (90..99).to_a, collection.displayed_pages
     end
   end
 
-  context "given we have 100 pages and we're at pages 91 up to 99" do
-    should "start with the 91 end with 100" do
-      (91..99).each do |p|
+  context "given we have 100 pages and we're at pages 96 up to 100" do
+    should "start with 91 and end with 100" do
+      (96..100).each do |p|
         collection = Pagination.paginate((1..100).to_a, :per_page => 1, :page => p)
         assert_equal (91..100).to_a, collection.displayed_pages
       end
     end
   end
+ 
   
   context "given we have 5 pages and we're at page 2 up to 5" do
     should "always display the 5 pages" do

data/test/test_pagination_template.rb

@@ -33,23 +33,23 @@ class TestPaginationTemplate < Test::Unit::TestCase
 
     should "have a ul > li.next-link with page=2" do
       assert_equal 1, 
-        doc.search('div.pagination > a.next-link[href="?page=2"]').length
+        doc.search('nav.pagination > a.next-link[href="?page=2"]').length
     end
 
     should "display the first page as the current page" do
-      assert_equal 1, doc.search('div.pagination > ul > li > span').length
+      assert_equal 1, doc.search('nav.pagination > nav.page-numbers > ul > li > span').length
 
-      assert_equal '1', doc.search('div.pagination > ul > li > span').text
+      assert_equal '1', doc.search('nav.pagination > nav.page-numbers > ul > li > span').text
     end
 
     should "display pages 2 to 5 as links" do
       (2..5).each do |page|
         assert_equal 1, 
-          doc.search(%(div.pagination > ul > li > 
+          doc.search(%(nav.pagination > nav.page-numbers > ul > li > 
                        a[href="?page=#{page}"])).length
 
         assert_equal page.to_s, 
-          doc.search(%(div.pagination > ul > li > 
+          doc.search(%(nav.pagination > nav.page-numbers > ul > li > 
                        a[href="?page=#{page}"])).text
       end
     end

data/views/paginate.haml

@@ -1,19 +1,24 @@
 - if items.render?
-  %div.pagination
+  %nav.pagination
     - if items.prev_page
-      %a.prev-link{:href => ("?page=%s" % items.prev_page)}
+      %a.prev-link{:href => ("?page=%d" % items.prev_page)}
         %span ← Previous
-      
-    %ul
-      - items.displayed_pages.each do |page|
-        - if items.current?(page)
-          %li.active
-            %span= page
-        - else
-          %li
-            %a{:href => ("?page=%s" % page)}= page
-
+    %nav.page-numbers
+      %span.current-page
+        %span
+          %strong
+            Page
+          = items.page
+          of
+          = items.total_pages
+      %ul                        
+        - items.displayed_pages.each do |page|
+          - if items.current?(page)
+            %li.active
+              %span= page           
+          - else
+            %li
+              %a{:href => ("?page=%d" % page)}= page
     - if items.next_page
-      %a.next-link{:href => ("?page=%s" % items.next_page)}
+      %a.next-link{:href => ("?page=%d" % items.next_page)}
         %span Next →
-

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Cyril David
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-04 00:00:00 +08:00
+date: 2010-06-10 00:00:00 +08:00
 default_executable: pagination
 dependencies: 
 - !ruby/object:Gem::Dependency