just_paginate 0.0.4 → 0.0.5

data/lib/just_paginate.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 module JustPaginate
 
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 
   def self.page_value(page)
     if page.nil?
@@ -13,9 +13,13 @@ module JustPaginate
 
   def self.paginate(curr_page, per_page, total_entry_count,  &selection_strategy)
     raise "Pagination just supplies index range, expects a selection strategy" if selection_strategy.nil? 
-    total_page_number = total_entry_count / per_page
+    
     entries = yield(index_range(curr_page, per_page, total_entry_count)) || []    
-    return entries, total_page_number
+    return entries, total_page_number(total_entry_count, per_page)
+  end
+
+  def self.total_page_number(total_entry_count, per_page)
+    total_entry_count / per_page
   end
   
   def self.index_range(curr_page, per_page, total_entry_count)
@@ -27,7 +31,7 @@ module JustPaginate
     end
     
     if end_index>total_entry_count
-      end_index=(total_entry_count-1)
+      end_index = total_entry_count
     end
     
     Range.new(start_index, end_index)
@@ -98,7 +102,7 @@ module JustPaginate
         current = (total-max_visible)+1
       end
 
-      current.upto(current+(max_visible)).each {|n| labels.push(n.to_s)}
+      current.upto(current+(max_visible-1)).each {|n| labels.push(n.to_s)}
 
       if (current <= (total-max_visible))
         labels.concat ["...", "#{total}", ">"]

data/test/test_just_paginate.rb

@@ -26,7 +26,14 @@ class JustPaginateTest < Test::Unit::TestCase
         JustPaginate.index_range(7,2,4)
       end
     end
-    
+  
+    should "calculate correct total page count" do
+      assert_equal 25, JustPaginate.total_page_number(500, 20)
+      
+
+    end
+
+  
     should "correctly apply the supplied selection strategy" do
       ran = false
       sliced_entries, page_count = JustPaginate.paginate(1, 5, 10) do |index_range|
@@ -53,7 +60,10 @@ class JustPaginateTest < Test::Unit::TestCase
       assert_equal 60..79, JustPaginate.index_range(4,20,100)
       assert_equal 60..79, JustPaginate.index_range(4,20,95)
       assert_equal 80..99, JustPaginate.index_range(5,20,100)
-      assert_equal 80..94, JustPaginate.index_range(5,20,95)
+      assert_equal 80..95, JustPaginate.index_range(5,20,95)
+
+      assert_equal 460..479, JustPaginate.index_range(24,20,500)
+      assert_equal 480..499, JustPaginate.index_range(25,20,500)
     end
   end
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: just_paginate
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Gitorious AS