paginator 1.0.1 → 1.0.2

data/lib/paginator.rb

@@ -2,7 +2,7 @@ require 'forwardable'
 
 class Paginator
   
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 
   class ArgumentError < ::ArgumentError; end
   class MissingCountError < ArgumentError; end
@@ -52,7 +52,12 @@ class Paginator
   # Retrieve page object by number
   def page(number)
     number = (n = number.to_i) > 0 ? n : 1
-    Page.new(self, number, lambda{ @select.call((number - 1) * @per_page, @per_page) })
+    Page.new(self, number, lambda { 
+      offset = (number - 1) * @per_page
+      args = [offset]
+      args << @per_page if @select.arity == 2
+      @select.call(*args)
+    })
   end
   
   # Page object

data/test/test_paginator.rb

@@ -72,5 +72,21 @@ class PaginatorTest < Test::Unit::TestCase
   def test_number_of_pages
     assert_equal 5, @pager.number_of_pages
   end
+  
+  def test_passing_block_to_initializer_with_arity_of_two_yields_per_page
+    pager = Paginator.new(20,2) do |offset,per_page|
+      assert_equal 2, per_page
+    end
+    pager.page(1).items
+  end
+
+  def test_passing_block_to_initializer_with_arity_of_one_does_not_yield_per_page
+    pager = Paginator.new(20,2) do |offset|
+      assert_equal 0, offset
+    end
+    pager.page(1).items
+  end
+  
+  
 
 end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: paginator
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 date: 2006-10-24 00:00:00 -06:00
 summary: A generic paginator object for use in any Ruby program
 require_paths: