api-pagination 4.5.2 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fb30057d988236c8f5c6e557f7feea70fd79bd5
-  data.tar.gz: 98a0b719a0a1ae299bde47edd30b8a6e2ed015e2
+  metadata.gz: 5d77fb4d992aae484c741d89235cf7cbdb998c3f
+  data.tar.gz: e267de21b868427e1788392d7ceffd30cbee68f7
 SHA512:
-  metadata.gz: 9b8a65195ac6a5feb65932e020ffa460508f8b53e47b16c34a7c22fd2e3816ffaa7d894590bc14593e3d90991adad14bdd9698a0ac36078588ccea6a35479736
-  data.tar.gz: d29a8fa3d95a922f4be7a880a18f425a32a391e40ae8ebbef46f6c149fcd561153e01bda567e1e5c65edbffd3bf04422e2d68ef6f671efcad2e98e19209c04e8
+  metadata.gz: 4e68ca7f44c0729540fd32a98b5106c803c2cdd96a73fa77c52dfa179f5ed00f7f529259838ebc28d10172efe2f421d66feb303f99c3e5eeaf73e7db9acd2b87
+  data.tar.gz: 3bec93cd7ff6bb0d33de4720317e6a459787758b4c7d952f4edd7757eb309769b207c829070f38ccad2643121bd8af052b89a92b9e985d92da2f4b15d79cde9a

data/lib/api-pagination.rb

@@ -25,7 +25,7 @@ module ApiPagination
           pages[:prev]  = collection.current_page - 1
         end
 
-        unless collection.last_page?
+        unless collection.last_page? || (ApiPagination.config.paginator == :kaminari && collection.out_of_range?)
           pages[:last] = collection.total_pages
           pages[:next] = collection.current_page + 1
         end
@@ -60,7 +60,7 @@ module ApiPagination
       if defined?(Sequel::Dataset) && collection.kind_of?(Sequel::Dataset)
         collection.paginate(options[:page], options[:per_page])
       else
-        collection.paginate(:page => options[:page], :per_page => options[:per_page])
+        collection.paginate(options)
       end
     end
 

data/lib/api-pagination/version.rb

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

data/spec/api-pagination_spec.rb

@@ -1,30 +1,66 @@
 require 'spec_helper'
 
 describe ApiPagination do
-  let(:collection) { (1..100).to_a }
-  let(:paginate_array_options) { { total_count: 1000 } }
+  let(:collection) {(1..100).to_a}
+  let(:paginate_array_options) {{ total_count: 1000 }}
 
-  context 'Using kaminari' do
-    before do
-      ApiPagination.config.paginator = :kaminari
-    end
+  describe "#paginate" do
+    context 'Using kaminari' do
+      before do
+        ApiPagination.config.paginator = :kaminari
+      end
+
+      after do
+        ApiPagination.config.paginator = ENV['PAGINATOR'].to_sym
+      end
+
+      it 'should accept paginate_array_options option' do
+        expect(Kaminari).to receive(:paginate_array)
+                              .with(collection, paginate_array_options)
+                              .and_call_original
+
+        ApiPagination.paginate(
+          collection,
+          {
+            per_page:               30,
+            paginate_array_options: paginate_array_options
+          }
+        )
+      end
+
+      describe '.pages_from' do
+        subject {described_class.pages_from collection}
 
-    after do
-      ApiPagination.config.paginator = ENV['PAGINATOR'].to_sym
+        context 'on empty collection' do
+          let(:collection) {ApiPagination.paginate [], page: 1}
+
+          it {is_expected.to be_empty}
+        end
+      end
     end
 
-    it 'should accept paginate_array_options option' do
-      expect(Kaminari).to receive(:paginate_array)
-                            .with(collection, paginate_array_options)
-                            .and_call_original
-
-      ApiPagination.paginate(
-        collection,
-        {
-          per_page: 30,
-          paginate_array_options: paginate_array_options
-        }
-      )
+    context 'Using will_paginate' do
+      before do
+        ApiPagination.config.paginator = :will_paginate
+      end
+
+      after do
+        ApiPagination.config.paginator = ENV['PAGINATOR'].to_sym
+      end
+
+      context 'passing in total_entries in options' do
+        it 'should set total_entries using the passed in value' do
+          paginated_collection = ApiPagination.paginate(collection, total_entries: 3000)
+          expect(paginated_collection.total_entries).to eq(3000)
+        end
+      end
+
+      context 'passing in collection only' do
+        it 'should set total_entries using the size of the collection ' do
+          paginated_collection = ApiPagination.paginate(collection)
+          expect(paginated_collection.total_entries).to eq(100)
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api-pagination
 version: !ruby/object:Gem::Version
-  version: 4.5.2
+  version: 4.6.0
 platform: ruby
 authors:
 - David Celis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-29 00:00:00.000000000 Z
+date: 2017-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Link header pagination for Rails and Grape APIs. Don't use the request body.