api-pagination 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0a884f079d5228439b05823470d82b27a9fe253
-  data.tar.gz: b76f421e8921cf19b6ba8418a20058044718e7a3
+  metadata.gz: 6af37b20cc366bdb21326a922f7d2fd145178307
+  data.tar.gz: adfcf9ea355a22dbeb2c739f69d23af8767000c1
 SHA512:
-  metadata.gz: 0890791df230ec465bf397265ab570ef251c28cee3134f6fe05972676bfa0493cd10d6a0cde0b9fc4ce063d4cac2956be11b848275b3b5e110c0497f7b980be4
-  data.tar.gz: f0b546d497bb139afaf1c09ce17ab7a4ed0423a4d962d0ea649cfdf6bbeb905554efc9679e932a6f9e6afd6e899f3693732a71a97994e8c0707eed4632f611ec
+  metadata.gz: 4e0e335c9901191fd8f85202ff25967e09574bc1fb6fdd574a051e0aeb8c0865f17893ec423fee635ab23a3a278025fe82adb5c50a327ff87b288b4ac9aafca5
+  data.tar.gz: f230b0babeb25fffcd26542ba373389a2e62188cd8a6fd3c963719e291f963b121f554e19d71f50de77b08459f735d6b8ed272cef15f589be72679b86f7687bf

data/lib/api-pagination/version.rb

@@ -2,7 +2,7 @@ module ApiPagination
   class Version
     MAJOR = 3
     MINOR = 0
-    PATCH = 1
+    PATCH = 2
 
     def self.to_s
       [MAJOR, MINOR, PATCH].join('.')

data/lib/grape/pagination.rb

@@ -5,7 +5,7 @@ module Grape
         def paginate(collection)
           options = {
             :page     => params[:page],
-            :per_page => (settings[:per_page] || params[:per_page])
+            :per_page => (params[:per_page] || settings[:per_page])
           }
           collection = ApiPagination.paginate(collection, options)
 

data/lib/rails/pagination.rb

@@ -18,7 +18,7 @@ module Rails
 
     private
 
-    def _paginate_collection(collection, options)
+    def _paginate_collection(collection, options={})
       options = {
         :page     => params[:page],
         :per_page => (options.delete(:per_page) || params[:per_page])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api-pagination
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - David Celis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-01 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec