Fix all the specs

Author: davidcelis

Gemfile

@@ -9,3 +9,4 @@ gem 'pagy', require: false
 
 gem 'sqlite3', require: false
 gem 'sequel', require: false
+gem 'pry-suite'

lib/api-pagination.rb

@@ -89,21 +89,23 @@ def paginate_with_kaminari(collection, options, paginate_array_options = {})
       end
 
       collection = Kaminari.paginate_array(collection, paginate_array_options) if collection.is_a?(Array)
-      collection.page(options[:page]).per(options[:per_page])
+      [collection.page(options[:page]).per(options[:per_page]), nil]
     end
 
     def paginate_with_will_paginate(collection, options)
       if options[:per_page] <= 0
         options[:per_page] = default_per_page_for_will_paginate(collection)
       end
 
-      if defined?(Sequel::Dataset) && collection.kind_of?(Sequel::Dataset)
+      collection = if defined?(Sequel::Dataset) && collection.kind_of?(Sequel::Dataset)
         collection.paginate(options[:page], options[:per_page])
       else
         supported_options = [:page, :per_page, :total_entries]
         options = options.dup.keep_if { |k,v| supported_options.include?(k.to_sym) }
         collection.paginate(options)
       end
+
+      [collection, nil]
     end
 
     def get_default_per_page_for_kaminari(collection)

spec/api-pagination_spec.rb

@@ -22,12 +22,12 @@
         end
 
         describe '.pages_from' do
-          subject {described_class.pages_from collection}
+          subject { described_class.pages_from(collection) }
 
           context 'on empty collection' do
-            let(:collection) {ApiPagination.paginate [], page: 1}
+            let(:collection) { ApiPagination.paginate([], page: 1).first }
 
-            it {is_expected.to be_empty}
+            it { is_expected.to be_empty }
           end
         end
       end
@@ -37,14 +37,14 @@
       context 'Using will_paginate' do
         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)
+            paginated_collection = ApiPagination.paginate(collection, total_entries: 3000).first
             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)
+            paginated_collection = ApiPagination.paginate(collection).first
             expect(paginated_collection.total_entries).to eq(100)
           end
         end

spec/sequel_spec.rb

@@ -23,9 +23,8 @@
     end
 
     it 'returns a Sequel::Dataset' do
-      collection = ApiPagination.paginate(people)
+      collection = ApiPagination.paginate(people).first
       expect(collection.kind_of?(Sequel::Dataset)).to be_truthy
     end
   end
 end
-

spec/spec_helper.rb

@@ -16,7 +16,7 @@
 require ENV['PAGINATOR']
 ApiPagination.config.paginator = ENV['PAGINATOR'].to_sym
 
-require 'will_paginate/array' if ENV['PAGINATOR'] == :will_paginate
+require 'will_paginate/array' if ENV['PAGINATOR'].to_sym == :will_paginate
 
 RSpec.configure do |config|
   config.include Rack::Test::Methods