From 5a8bd2a515bb2d8e6d731c394eec0ad87a6ae40c Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 18 Jan 2017 10:40:59 +0100 Subject: [PATCH] make it compatible with kaminari 1.0 --- lib/rocket_pants/controller/respondable.rb | 6 +++--- rocket_pants.gemspec | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/rocket_pants/controller/respondable.rb b/lib/rocket_pants/controller/respondable.rb index 6b6476e..6251c06 100644 --- a/lib/rocket_pants/controller/respondable.rb +++ b/lib/rocket_pants/controller/respondable.rb @@ -18,7 +18,7 @@ def serializable_hash(options = {}) def self.pagination_type(object) if object.respond_to?(:total_entries) :will_paginate - elsif object.respond_to?(:num_pages) && object.respond_to?(:current_page) + elsif object.respond_to?(:total_pages) && object.respond_to?(:current_page) :kaminari else nil @@ -49,7 +49,7 @@ def self.extract_pagination(collection) :pages => collection.total_pages.try(:to_i) } when :kaminari - current, total, per_page = collection.current_page, collection.num_pages, collection.limit_value + current, total, per_page = collection.current_page, collection.total_pages, collection.limit_value { :current => current, :previous => (current > 1 ? (current - 1) : nil), @@ -227,4 +227,4 @@ def metadata_for(object, options, type, singular) end end -end \ No newline at end of file +end diff --git a/rocket_pants.gemspec b/rocket_pants.gemspec index 302529a..05a338b 100644 --- a/rocket_pants.gemspec +++ b/rocket_pants.gemspec @@ -26,8 +26,8 @@ Gem::Specification.new do |s| s.add_development_dependency 'activerecord', '>= 3.0', '< 5.0' s.add_development_dependency 'sqlite3' s.add_development_dependency 'reversible_data', '~> 1.0' - s.add_development_dependency 'kaminari' + s.add_development_dependency 'kaminari', '>= 0.15' s.files = Dir.glob("{lib}/**/*") s.require_path = 'lib' -end \ No newline at end of file +end