objectreload-pagination 0.1.0 → 0.1.1

data/.gitignore

@@ -0,0 +1,4 @@
+*.gemspec
+*.log
+*.gem
+pkg/

data/VERSION

@@ -0,0 +1 @@
+0.1.1

data/lib/pagination/collection.rb

@@ -5,48 +5,54 @@ module Pagination
       super "#{page} must be less than #{max}" if page >= 1
     end
   end
-  
+
   class Collection < Array
     attr_reader :current_page, :per_page, :total_entries, :total_pages
-    
+
     def initialize(options = {})
       @collection = options[:collection]
-      
-      @current_page = options[:current_page].to_i
+
+      if (already_paginated = ([:current_page, :per_page, :total_entries].all? { |m| @collection.respond_to?(m) }))
+        @current_page = @collection.current_page
+        @per_page = @collection.per_page
+        self.total_entries ||= @collection.total_entries
+      else
+        @current_page = options[:current_page].to_i
+        @per_page = options[:per_page].to_i
+        self.total_entries ||= @collection.count
+      end
+
       raise InvalidPage.new(@current_page) if @current_page < 1
-      
-      @per_page = options[:per_page].to_i
       raise ArgumentError, "`per_page` setting cannot be less than 1 (#{@per_page} given)" if @per_page < 1
-      
-      self.replace(@collection.paginate(:limit => limit, :offset => offset))
-      
-      self.total_entries ||= @collection.count
+
+      replace(already_paginated ? @collection : @collection.paginate(:limit => limit, :offset => offset))
+
       raise InvalidPage.new(current_page, total_pages) if current_page > total_pages
     end
-    
+
     def previous_page
       current_page - 1 if current_page > 1
     end
-    
+
     def next_page
       current_page + 1 if current_page < total_pages
     end
-    
+
+    def offset
+      offset = (current_page-1)*limit
+    end
+
   protected
-    
+
     def limit
       per_page
     end
-    
-    def offset
-      offset = (current_page-1)*limit
-    end
-    
+
     def total_entries=(number)
       @total_entries = number.to_i
       @total_pages = @total_entries > 0 ? (@total_entries / per_page.to_f).ceil : 1
     end
-    
+
     def replace(array)
       result = super
 
@@ -59,4 +65,4 @@ module Pagination
       result
     end
   end
-end
+end

data/test/collection_test.rb

@@ -23,7 +23,7 @@ class CollectionTest < Test::Unit::TestCase
         assert_equal expected, @collection.paginate(conditions)
       end
     end
-  
+
     context "init pagination collection" do
       setup do
         @collection = [1,2,3,4,5]
@@ -57,8 +57,28 @@ class CollectionTest < Test::Unit::TestCase
         assert_raise(ArgumentError) { paginate_collection(@collection, 2, -2) }
       end
     end
+
+    context "having already paginated collection" do
+      setup do
+        @collection = (11..20).to_a
+        class << @collection
+          def total_entries; 100; end
+          def current_page; 2; end
+          def per_page; 10; end
+        end
+
+        @paginated_collection = paginate_collection(@collection, 1, 1, 1)
+      end
+
+      should "use attribute values of the original collection" do
+        assert_equal @collection, @paginated_collection
+        assert_equal @collection.total_entries, @paginated_collection.total_entries
+        assert_equal @collection.current_page, @paginated_collection.current_page
+        assert_equal @collection.per_page, @paginated_collection.per_page
+      end
+    end
   end
-  
+
   private
     def paginate_collection(collection, current_page=2, per_page=2, total_entries=nil)
       Pagination::Collection.new(
@@ -68,4 +88,4 @@ class CollectionTest < Test::Unit::TestCase
             :total_entries => total_entries
           )
     end
-end
+end

data/test/lib/view_test_process.rb

@@ -1,3 +1,4 @@
+gem 'actionpack', '2.3.5'
 require 'action_controller'
 require 'action_controller/test_process'
 
@@ -37,7 +38,7 @@ class Pagination::ViewTestCase < Test::Unit::TestCase
   end
 
   def default_test; end
-  
+
   protected
 
     def paginate(collection = {}, options = {}, &block)
@@ -45,7 +46,7 @@ class Pagination::ViewTestCase < Test::Unit::TestCase
       if collection.instance_of? Hash
         @request.params :page => collection[:page] || 1
         collection = [1,2,3,4,5,6,7,8,9,10,11]
-      end      
+      end
       options = {:per_page => 4, :controls => :top}.merge(options)
 
       locals = { :collection => collection, :options => options }
@@ -177,4 +178,4 @@ module HTML
       childless?? '' : super
     end
   end
-end
+end

data/test/test_helper.rb

@@ -1,5 +1,8 @@
 require 'rubygems'
-require 'activerecord'
+gem 'test-unit', '1.2.3'
+require 'test/unit'
+gem 'activerecord', '2.3.5'
+require 'active_record'
 require 'shoulda'
 require 'logger'
 
@@ -33,4 +36,4 @@ end
 
 class Article < ActiveRecord::Base
   belongs_to :user
-end
+end

data/test/view_helpers_test.rb

@@ -17,7 +17,7 @@ class ViewHelpersTest < Pagination::ViewTestCase
 
       assert_dom_equal expected, @html_result
     end
-    
+
     should "show links to pages" do
       paginate do |pagination|
         assert_select 'a[href]', 3 do |elements|
@@ -221,4 +221,4 @@ class AdditionalLinkAttributesRenderer < Pagination::LinkRenderer
   def page_link(page, text, attributes = {})
     @template.link_to text, url_for(page), attributes.merge(@additional_link_attributes)
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: objectreload-pagination
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Mateusz Drozdzynski
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-13 00:00:00 +02:00
+date: 2010-02-26 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -23,10 +23,12 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
+- .gitignore
 - CHANGELOG.rdoc
 - LICENSE
 - README.rdoc
 - Rakefile
+- VERSION
 - init.rb
 - lib/active_record/base_extensions.rb
 - lib/active_record/scope_extensions.rb
@@ -70,8 +72,8 @@ signing_key:
 specification_version: 3
 summary: Simple pagination - without changes in controllers
 test_files: 
-- test/test_helper.rb
 - test/lib/view_test_process.rb
 - test/active_record_extentions_test.rb
 - test/collection_test.rb
 - test/view_helpers_test.rb
+- test/test_helper.rb