magic_grid 0.12.2 → 0.12.3

data/lib/magic_grid/collection.rb

@@ -207,8 +207,15 @@ module MagicGrid
     def perform_pagination(collection)
       return collection unless @per_page
 
+      total_entries = count(collection)
+      @current_page = bound_current_page(@current_page,
+                                         @per_page,
+                                         total_entries)
+
       if collection.respond_to? :paginate
-        collection.paginate(page: @current_page, per_page: @per_page, total_entries: count(collection))
+        collection.paginate(page: @current_page,
+                            per_page: @per_page,
+                            total_entries: total_entries)
       elsif collection.respond_to? :page
         collection.page(@current_page).per(@per_page)
       elsif collection.is_a?(Array) and Module.const_defined?(:Kaminari)
@@ -249,5 +256,16 @@ module MagicGrid
       @reduced_collection ||= apply_all_operations(@collection)
     end
 
+    private
+
+    def bound_current_page(page, per_page, total_entries)
+      pages = total_entries / per_page
+      pages = 1 if pages == 0
+      if page > pages
+        pages
+      else
+        page
+      end
+    end
   end
 end

data/lib/magic_grid/version.rb

@@ -1,3 +1,3 @@
 module MagicGrid
-  VERSION = "0.12.2"
+  VERSION = "0.12.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magic_grid
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.12.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2012-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -48,7 +48,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
@@ -56,7 +56,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
@@ -215,7 +215,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1453942600846998467
+      hash: 1658296312752844098
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -224,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1453942600846998467
+      hash: 1658296312752844098
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23