objectreload-pagination 0.1.5 → 0.1.6

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/lib/pagination.rb

@@ -9,4 +9,8 @@ require 'pagination/enumerable'
 require 'pagination/view_helpers'
 
 # Loads the :paginate view helper
-ActionView::Base.send :include, Pagination::ViewHelpers
+ActionView::Base.send :include, Pagination::ViewHelpers
+
+if defined?(ActionController::Base) and ActionController::Base.respond_to? :rescue_responses
+  ActionController::Base.rescue_responses['Pagination::InvalidPage'] = :not_found
+end

data/lib/pagination/collection.rb

@@ -1,5 +1,5 @@
 module Pagination
-  class InvalidPage < ActiveRecord::RecordNotFound
+  class InvalidPage < ArgumentError
     def initialize(page, max = 1)
       super "#{page} must be greater than 0" if page < 1
       super "#{page} must be less than #{max}" if page >= 1
@@ -19,7 +19,7 @@ module Pagination
       else
         @current_page = options[:current_page].to_i
         @per_page = options[:per_page].to_i
-        self.total_entries ||= @collection.count(:id, :distinct => true)
+        self.total_entries ||= @collection.count(:distinct => true, :select => :id)
       end
 
       raise InvalidPage.new(@current_page) if @current_page < 1

data/test/collection_test.rb

@@ -5,7 +5,9 @@ require File.dirname(__FILE__) + '/../lib/pagination/enumerable'
 class CollectionTest < Test::Unit::TestCase
   context "collection test" do
     setup do
-      @collection = ('a'..'e').to_a
+      Article.destroy_all
+      5.times {|i| Article.create!(:id => i, :user => User.create)}
+      @collection = Article.all
     end
 
     should "return elements from specific range" do
@@ -13,9 +15,9 @@ class CollectionTest < Test::Unit::TestCase
       # limit = per_page
       # offset = (current_page - 1) * limit
       [
-        { :offset => 0,  :limit => 3,  :expected => %w( a b c ) },
-        { :offset => 3,  :limit => 3,  :expected => %w( d e ) },
-        { :offset => 0,  :limit => 5,  :expected => %w( a b c d e ) },
+        { :offset => 0,  :limit => 3,  :expected => [@collection[0],@collection[1], @collection[2]] },
+        { :offset => 3,  :limit => 3,  :expected => [@collection[3],@collection[4]] },
+        { :offset => 0,  :limit => 5,  :expected => [@collection[0],@collection[1], @collection[2], @collection[3], @collection[4]] },
         { :offset => 6,  :limit => 3,  :expected => [] },
       ].
       each do |conditions|
@@ -26,7 +28,6 @@ class CollectionTest < Test::Unit::TestCase
 
     context "init pagination collection" do
       setup do
-        @collection = [1,2,3,4,5]
         @paginated_collection = paginate_collection(@collection)
       end
 
@@ -56,6 +57,10 @@ class CollectionTest < Test::Unit::TestCase
       should "rise an error ArgumentError" do
         assert_raise(ArgumentError) { paginate_collection(@collection, 2, -2) }
       end
+
+      should "test_rescue_response_hook_presence" do
+        assert_equal :not_found, ActionController::Base.rescue_responses['Pagination::InvalidPage']
+      end
     end
 
     context "having already paginated collection" do

data/test/lib/view_test_process.rb

@@ -43,9 +43,12 @@ class Pagination::ViewTestCase < Test::Unit::TestCase
 
     def paginate(collection = {}, options = {}, &block)
 
+      Article.destroy_all
+      11.times {|i| Article.create!(:id => i, :user => User.create)}
+
       if collection.instance_of? Hash
         @request.params :page => collection[:page] || 1
-        collection = [1,2,3,4,5,6,7,8,9,10,11]
+        collection = Article.all
       end
       options = {:per_page => 4, :controls => :top}.merge(options)
 

data/test/view_helpers_test.rb

@@ -3,6 +3,11 @@ require File.dirname(__FILE__) + '/lib/view_test_process'
 
 class ViewHelpersTest < Pagination::ViewTestCase
   context "paginate method" do
+    setup do
+      Article.destroy_all
+      5.times {|i| Article.create!(:id => i, :user => User.create)}
+      @collection = Article.all
+    end
 
     should "return full output" do
       paginate({:page => 1})
@@ -123,7 +128,7 @@ class ViewHelpersTest < Pagination::ViewTestCase
 
       # magic ID
       paginate({}, :id => true) do |div|
-        assert_equal 'fixnums_pagination', div.first['id']
+        assert_equal 'articles_pagination', div.first['id']
       end
 
       # explicit ID

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Mateusz Drozdzynski
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-29 00:00:00 +02:00
+date: 2010-07-01 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
@@ -79,8 +79,8 @@ signing_key:
 specification_version: 3
 summary: Simple pagination - without changes in controllers
 test_files: 
+- test/lib/view_test_process.rb
 - test/active_record_extentions_test.rb
 - test/collection_test.rb
-- test/lib/view_test_process.rb
-- test/test_helper.rb
 - test/view_helpers_test.rb
+- test/test_helper.rb