Fixed a problem in paginator with pages of size one.

git-svn-id: https://svn.thoughtbot.com/plugins/squirrel/trunk@114 7bbfaf0e-4d1d-0410-9690-a8bb5f8ef2aa

lib/paginator.rb

@@ -12,15 +12,15 @@ class Paginator < Array
       def initialize opts={}
         @total_results = opts[:count].to_i
         @limit         = opts[:limit].to_i
-        @offset        = opts[:offset].to_i + 1
+        @offset        = opts[:offset].to_i
 
         @per_page      = @limit
         @current       = (@offset / @limit) + 1
         @first         = 1
         @last          = ((@total_results-1) / @limit) + 1
         @next          = @current + 1 if @current < @last
         @previous      = @current - 1 if @current > 1
-        @current_range = (@offset..([@offset+@limit-1, @total_results].min))
+        @current_range = ((@offset+1)..([@offset+@limit, @total_results].min))
 
         (@first..@last).each do |page|
           self[page-1] = Page.new((page-1) * @per_page, @per_page, page, @per_page)

test/squirrel_test.rb

@@ -146,6 +146,22 @@ def test_does_include_paginator_on_paged_queries
 	  assert_not_nil posts.total_results
 	end
 
+	def test_paginator_low_edge_cases
+	  pages = Thoughtbot::Squirrel::Paginator.new(:count => 100, :offset => 0, :limit => 1)
+	  assert_equal 100,    pages.last
+	  assert_equal 1,      pages.current
+	  assert_equal 1,      pages.first
+	  assert_equal (1..1), pages.current_range
+	end
+
+	def test_paginator_high_edge_cases
+	  pages = Thoughtbot::Squirrel::Paginator.new(:count => 100, :offset => 99, :limit => 1)
+	  assert_equal 100,        pages.last
+	  assert_equal 100,        pages.current
+	  assert_equal 1,          pages.first
+	  assert_equal (100..100), pages.current_range
+  end
+
 	def test_pages_are_sane
 	  assert posts = Post.find(:all) { id <=> (1..6); paginate :page => 2, :per_page => 4 }
 	  assert_not_nil       posts.pages