paginator 1.0.9 → 1.1.0

data/History.txt

@@ -1,3 +1,8 @@
+== 1.1.0 / 2007-10-12
+
+* Paginator now mixes in Enumerable (supporting inject, etc, on pages)
+* Page now mixes in Enumerable (supporting inject, etc, on items)
+
 == 1.0.9 / 2007-02-17
 
 * Modified Pager#number_of_pages to support mathn's monkeypatching of Fixnum#/

data/README.txt

@@ -30,7 +30,7 @@ You could, of course, just pass in the number of items per page directly to the
   end
 
   # In your view
-  <% @page.items.each do |foo| %>
+  <% @page.each do |foo| %>
     <%# Show something for each item %>
   <% end %>
   <%= @page.number %>
@@ -62,7 +62,7 @@ No special instructions.
 
 (The MIT License)
 
-Copyright (c) 2006 Bruce Williams (http://codefluency.com)
+Copyright (c) 2006-2007 Bruce Williams (http://codefluency.com)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/paginator.rb

@@ -2,7 +2,9 @@ require 'forwardable'
 
 class Paginator
   
-  VERSION = '1.0.9'
+  VERSION = '1.1.0'
+  
+  include Enumerable
 
   class ArgumentError < ::ArgumentError; end
   class MissingCountError < ArgumentError; end
@@ -42,17 +44,9 @@ class Paginator
     page number_of_pages
   end
   
-  # Iterate through pages
   def each
-    each_with_index do |item, index|
-      yield item
-    end
-  end
-  
-  # Iterate through pages with indices
-  def each_with_index
     1.upto(number_of_pages) do |number|
-      yield(page(number), number - 1)
+      yield page(number)
     end
   end
   
@@ -73,11 +67,7 @@ class Paginator
   # of the page in the paginator
   class Page
     
-    extend Forwardable
-    def_delegator :@pager, :first, :first
-    def_delegator :@pager, :last, :last
-    def_delegator :items, :each
-    def_delegator :items, :each_with_index    
+    include Enumerable
         
     attr_reader :number, :pager
     
@@ -98,10 +88,10 @@ class Paginator
       @number > 1
     end
     
-    # Get previous page (if possible)
-    def prev
-      @pager.page(@number - 1) if prev?
-    end
+ #   # Get previous page (if possible)
+   def prev
+     @pager.page(@number - 1) if prev?
+   end
     
     # Checks to see if there's a page after this one
     def next?
@@ -109,9 +99,9 @@ class Paginator
     end
     
     # Get next page (if possible)
-    def next
-      @pager.page(@number + 1) if next?
-    end
+   def next
+     @pager.page(@number + 1) if next?
+   end
     
     # The "item number" of the first item on this page
     def first_item_number
@@ -131,6 +121,18 @@ class Paginator
       @pager == other.pager && self.number == other.number
     end
     
+    def each(&block)
+      items.each(&block)
+    end
+    
+    def method_missing(meth, *args, &block) #:nodoc:
+      if @pager.respond_to?(meth)
+        @pager.__send__(meth, *args, &block)
+      else
+        super
+      end
+    end
+    
   end
   
 end

data/test/test_paginator.rb

@@ -60,12 +60,16 @@ class PaginatorTest < Test::Unit::TestCase
     assert !@pager.first.prev
   end
   
-  def test_each
+  def test_page_enumerable
     @pager.each do |page|
       assert page
       page.each do |item|
         assert item
       end
+      page.each_with_index do |item, index|
+        assert_equal page.items[index], item
+      end
+      assert_equal page.items, page.inject([]) {|list, item| list << item }
     end
   end
   
@@ -120,7 +124,6 @@ class PaginatorTest < Test::Unit::TestCase
     assert_equal 10, page.first_item_number
     assert_equal 11, page.last_item_number    
   end
-  
 
 end
 

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.4
 specification_version: 1
 name: paginator
 version: !ruby/object:Gem::Version 
-  version: 1.0.9
-date: 2007-02-17 00:00:00 -06:00
+  version: 1.1.0
+date: 2007-08-12 00:00:00 -05:00
 summary: A generic paginator object for use in any Ruby program
 require_paths: 
 - lib
@@ -38,10 +38,13 @@ files:
 - test/test_paginator.rb
 test_files: 
 - test/test_paginator.rb
-rdoc_options: []
-
-extra_rdoc_files: []
-
+rdoc_options: 
+- --main
+- README.txt
+extra_rdoc_files: 
+- History.txt
+- Manifest.txt
+- README.txt
 executables: 
 - paginator
 extensions: []
@@ -56,5 +59,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.6
+        version: 1.2.1
     version: