objectreload-pagination 0.1.9 → 0.1.11

data/VERSION

@@ -1 +1 @@
-0.1.9
+0.1.11

data/lib/pagination.rb

@@ -2,9 +2,6 @@
 require 'active_record/base_extensions'
 require 'active_record/scope_extensions'
 
-# Loads
-require 'action_controller/rescue_with_helper'
-
 # Loads internal pagination classes
 require 'pagination/collection'
 require 'pagination/named_scope'
@@ -13,15 +10,3 @@ require 'pagination/view_helpers'
 
 # Loads the :paginate view helper
 ActionView::Base.send :include, Pagination::ViewHelpers
-
-# Load :rescue_with_handler - solution: https://rails.lighthouseapp.com/projects/8994/tickets/2034-exceptions-in-views-hard-to-catch
-ActionController::Base.send :include, RescueWithHelper
-
-ActionController::Base.send(:rescue_from, Pagination::InvalidPage, :with => :not_found)
-
-def not_found
-  # Avoid calling '304 Not Modified'
-  if stale?(:etag => "invalid_page", :last_modified => DateTime.now.utc)
-    render_optional_error_file 404
-  end
-end

data/lib/pagination/collection.rb

@@ -1,11 +1,4 @@
 module Pagination
-  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
-    end
-  end
-
   class Collection < Array
     attr_reader :current_page, :per_page, :total_entries, :total_pages
 
@@ -22,12 +15,9 @@ module Pagination
         self.total_entries ||= @collection.empty? ? 0 : @collection.count(:id , :distinct => true)
       end
 
-      raise InvalidPage.new(@current_page) if @current_page < 1
       raise ArgumentError, "`per_page` setting cannot be less than 1 (#{@per_page} given)" if @per_page < 1
 
       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

data/test/collection_test.rb

@@ -49,11 +49,6 @@ class CollectionTest < Test::Unit::TestCase
         assert_equal 4, pag_array.count
       end
 
-      should "rise an error InvalidPage" do
-        assert_raise(Pagination::InvalidPage) { paginate_collection(@collection, -2, 2) }
-        assert_raise(Pagination::InvalidPage) { paginate_collection(@collection, 1000, 2) }
-      end
-
       should "rise an error ArgumentError" do
         assert_raise(ArgumentError) { paginate_collection(@collection, 2, -2) }
       end

data/test/lib/view_test_process.rb

@@ -1,4 +1,4 @@
-gem 'actionpack', '2.3.5'
+gem 'actionpack', '2.3.8'
 require 'action_controller'
 require 'action_controller/test_process'
 

data/test/test_helper.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
-gem 'test-unit', '1.2.3'
+gem 'test-unit', '>= 2.0'
 require 'test/unit'
-gem 'activerecord', '2.3.5'
+gem 'activerecord', '2.3.8'
 require 'active_record'
 require 'shoulda'
 require 'logger'

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: objectreload-pagination
 version: !ruby/object:Gem::Version 
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 1
-  - 9
-  version: 0.1.9
+  - 11
+  version: 0.1.11
 platform: ruby
 authors: 
 - Mateusz Drozdzynski
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-08 00:00:00 +03:00
+date: 2010-07-12 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
@@ -35,7 +36,6 @@ files:
 - Rakefile
 - VERSION
 - init.rb
-- lib/action_controller/rescue_with_helper.rb
 - lib/active_record/base_extensions.rb
 - lib/active_record/scope_extensions.rb
 - lib/pagination.rb
@@ -59,23 +59,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Simple pagination - without changes in controllers

data/lib/action_controller/rescue_with_helper.rb

@@ -1,16 +0,0 @@
-# When an exception happens inside a view, it is wrapped with an
-# ActionView::TemplateError. The lookup for the rescue_with_handler
-# then fails to find the handle for the original exception. This solution
-# special cases the template error to look also at the wrapped exception
-# and if there is a handler for that exception, then call it and ignore
-# the wrapping.
-module RescueWithHelper
-  def rescue_with_handler(exception)
-    if ((exception.class == ActionView::TemplateError) &&
-      (orig_exception = exception.original_exception) &&
-      (orig_handler = handler_for_rescue(orig_exception)))
-      exception = orig_exception
-    end
-    super(exception)
-  end
-end