kaminari 0.16.3 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b60c50194b2623ea0fdfedba7baea9a4d675557
-  data.tar.gz: 9f98c924aea42ab769c9800e39d739e0ae1ea477
+  metadata.gz: 3f6f180b0164209c6b789f3ae855089840a905fd
+  data.tar.gz: 2bbc06afb48a4e28ca76f7c960b359eb440f4dc9
 SHA512:
-  metadata.gz: 160ad63b6c8b586d82c37bf2c29230b1cb41375679073d628112b6d0023c3eee7e91de6ced19f31f6af02dd0fd5371fd1ab122120645a0f82cda005ff7e26a21
-  data.tar.gz: a0bca0e742f945a4ad67dd02406f74df8ae51f4a94bfcb5ff3025cfed5c1ad9522fea38bfdb4cd12f0e11ae8c0f2e7483594ee115a6af06cfb3b5088d914a2a9
+  metadata.gz: f3e4ac52fe8981e2610495da987398d455e25984d27a558f98175b512f22a938c58798225be16d526f38c6d19f9a1e1274612d6cf9e68e11f06bd4f4b8b0838a
+  data.tar.gz: 4f162bbb0935a179d6586316e9d3cf476ce1db7d15a61698c83313edf8c367b0df9ac14b99148e2153102f807f54d55fc1fe29894168417371b1954bf035ad63

data/.travis.yml

@@ -1,12 +1,13 @@
 language: ruby
 
 rvm:
-  - 1.8.7
   - 1.9.3
   - 2.0.0
-  - 2.1
-  - 2.2
-  - jruby
+  - 2.1.10
+  - 2.2.5
+  - 2.3.1
+  - jruby-1.7.25
+  - jruby-9.1.0.0
   - rbx-2
 
 gemfile:
@@ -16,12 +17,13 @@ gemfile:
   - gemfiles/active_record_40.gemfile
   - gemfiles/active_record_41.gemfile
   - gemfiles/active_record_42.gemfile
+  - gemfiles/active_record_edge.gemfile
   - gemfiles/data_mapper_12.gemfile
   - gemfiles/mongo_mapper.gemfile
-  - gemfiles/mongoid_24.gemfile
   - gemfiles/mongoid_30.gemfile
   - gemfiles/mongoid_31.gemfile
   - gemfiles/mongoid_40.gemfile
+  - gemfiles/mongoid_50.gemfile
   - gemfiles/sinatra_13.gemfile
   - gemfiles/sinatra_14.gemfile
 
@@ -35,29 +37,28 @@ cache: bundler
 
 matrix:
   exclude:
-    - rvm: 1.8.7
-      gemfile: gemfiles/active_record_40.gemfile
-    - rvm: 1.8.7
-      gemfile: gemfiles/active_record_41.gemfile
-    - rvm: 1.8.7
-      gemfile: gemfiles/active_record_42.gemfile
-    - rvm: 1.8.7
-      gemfile: gemfiles/mongoid_30.gemfile
-    - rvm: 1.8.7
-      gemfile: gemfiles/mongoid_31.gemfile
-    - rvm: 1.8.7
-      gemfile: gemfiles/mongoid_40.gemfile
-    - rvm: 2.2
+    - rvm: 1.9.3
+      gemfile: gemfiles/active_record_edge.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/active_record_edge.gemfile
+    - rvm: 2.1.10
+      gemfile: gemfiles/active_record_edge.gemfile
+    - rvm: 2.2.5
       gemfile: gemfiles/active_record_30.gemfile
-    - rvm: 2.2
+    - rvm: 2.2.5
       gemfile: gemfiles/active_record_31.gemfile
-    - rvm: 2.2
+    - rvm: 2.2.5
       gemfile: gemfiles/active_record_32.gemfile
-    - rvm: 2.2
-      gemfile: gemfiles/mongoid_24.gemfile
+    - rvm: 2.3.1
+      gemfile: gemfiles/active_record_30.gemfile
+    - rvm: 2.3.1
+      gemfile: gemfiles/active_record_31.gemfile
+    - rvm: 2.3.1
+      gemfile: gemfiles/active_record_32.gemfile
+    - rvm: jruby-1.7.25
+      gemfile: gemfiles/active_record_edge.gemfile
   allow_failures:
-    - rvm: 1.8.7
-      gemfile: gemfiles/mongoid_24.gemfile
-    - rvm: jruby
+    - rvm: jruby-1.7.25
+    - rvm: jruby-9.1.0.0
     - rvm: rbx-2
   fast_finish: true

data/CHANGELOG.rdoc

@@ -1,3 +1,30 @@
+== 0.17.0
+
+* Rails 5 ready!
+
+* Mongoid 5.0 support
+
+* Dropped Ruby 1.8 support
+
+* Dropped Mongoid 2.x support
+
+* Extracted Sinatra support to kaminari-sinatra gem
+
+* Extracted DataMapper support to kaminari-data_mapper gem
+
+* Extracted Mongoid support to kaminari-mongoid gem
+
+* Extracted MongoMapper support to kaminari-mongo_mapper gem
+
+* Deprecated Kaminari::PageScopeMethods#num_pages in favor of `total_pages`
+
+* Deprecated :num_pages option for `paginate` in favor of :total_pages
+
+* Fixed mangled params in pagination links on Rails 5 #766 [audionerd]
+
+* Fixed a bug where the range of the records displayed on the last page
+doesn't match #718 [danzanzini]
+
 == 0.16.3
 
 * Fixed a "stack level too deep" bug in mongoid #642 [bartes]

data/README.rdoc

@@ -27,7 +27,7 @@ The pagination helper outputs the HTML5 <nav> tag by default. Plus, the helper s
 
 == Supported versions
 
-* Ruby 1.8.7, 1.9.2, 1.9.3, 2.0.0, 2.1.x, 2.2.x
+* Ruby 1.9.2, 1.9.3, 2.0.0, 2.1.x, 2.2.x
 
 * Rails 3.0, 3.1, 3.2, 4.0, 4.1, 4.2
 

data/Rakefile

@@ -13,7 +13,26 @@ end
 task :default => "spec:all"
 
 namespace :spec do
-  %w(active_record_edge active_record_40 active_record_41 active_record_42 active_record_32 active_record_31 active_record_30 data_mapper_12 mongoid_40 mongoid_31 mongoid_30 mongoid_24 mongo_mapper sinatra_13 sinatra_14).each do |gemfile|
+  mappers = %w(
+    active_record_edge
+    active_record_42
+    active_record_41
+    active_record_40
+    active_record_32
+    active_record_31
+    active_record_30
+    data_mapper_12
+    mongoid_50
+    mongoid_40
+    mongoid_31
+    mongoid_30
+    mongoid_24
+    mongo_mapper
+    sinatra_13
+    sinatra_14
+  )
+
+  mappers.each do |gemfile|
     desc "Run Tests against #{gemfile}"
     task gemfile do
       sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle --quiet"
@@ -23,7 +42,7 @@ namespace :spec do
 
   desc "Run Tests against all ORMs"
   task :all do
-    %w(active_record_edge active_record_40 active_record_41 active_record_42 active_record_32 active_record_31 active_record_30 data_mapper_12 mongoid_40 mongoid_31 mongoid_30 mongoid_24 mongo_mapper sinatra_13 sinatra_14).each do |gemfile|
+    mappers.each do |gemfile|
       sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle --quiet"
       sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle exec rake spec"
     end

data/gemfiles/active_record_30.gemfile

@@ -6,9 +6,7 @@ gem 'rspec-rails', '~> 2.14.1'
 gem 'nokogiri', '< 1.6'
 gem 'capybara', '< 2.1'
 
-# stick to versions that work under Ruby 1.8 for now
-gem 'rubyzip', '< 1'
-gem 'mime-types', '< 2'
+gem 'mime-types', '2.99' if RUBY_VERSION < '2.0.0'
 
 platforms :ruby do
   if RUBY_VERSION > "2.1.0"

data/gemfiles/active_record_31.gemfile

@@ -4,11 +4,7 @@ gem 'railties', '~> 3.1.12'
 gem 'activerecord', '~> 3.1.12', :require => 'active_record'
 gem 'rspec-rails', '~> 2.14.1'
 
-# stick to versions that work under Ruby 1.8 for now
-gem 'capybara', '< 2.1'
-gem 'nokogiri', '< 1.6'
-gem 'rubyzip', '< 1'
-gem 'mime-types', '< 2'
+gem 'mime-types', '2.99' if RUBY_VERSION < '2.0.0'
 
 platforms :ruby do
   if RUBY_VERSION > "2.1.0"
@@ -16,9 +12,6 @@ platforms :ruby do
   else
     gem 'sqlite3', '1.3.8'
   end
-  if RUBY_VERSION <= "1.8.7"
-    gem 'i18n', '< 0.7.0'
-  end
 end
 platforms :jruby do
   gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'

data/gemfiles/active_record_32.gemfile

@@ -3,12 +3,7 @@ source 'https://rubygems.org'
 gem 'railties', '~> 3.2.3'
 gem 'activerecord', '~> 3.2.3', :require => 'active_record'
 gem 'rspec-rails', '~> 2.14.1'
-
-# Stick To Versions That Work Under Ruby 1.8 For Now
-gem 'capybara', '< 2.1'
-gem 'nokogiri', '< 1.6'
-gem 'rubyzip', '< 1'
-gem 'mime-types', '< 2'
+gem 'mime-types', '2.99' if RUBY_VERSION < '2.0.0'
 
 platforms :ruby do
   if RUBY_VERSION > "2.1.0"
@@ -16,9 +11,6 @@ platforms :ruby do
   else
     gem 'sqlite3', '1.3.8'
   end
-  if RUBY_VERSION <= "1.8.7"
-    gem 'i18n', '< 0.7.0'
-  end
 end
 platforms :jruby do
   gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'

data/gemfiles/active_record_40.gemfile

@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 gem 'railties', '~> 4.0.0'
 gem 'activerecord', '~> 4.0.0', :require => 'active_record'
 gem 'rspec-rails', '~> 2.14.1'
+gem 'mime-types', '2.99' if RUBY_VERSION == '1.9.3'
 
 platforms :ruby do
   if RUBY_VERSION > "2.1.0"

data/gemfiles/active_record_41.gemfile

@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 gem 'railties', '~> 4.1.0'
 gem 'activerecord', '~> 4.1.0', :require => 'active_record'
 gem 'rspec-rails', '~> 2.14.1'
+gem 'mime-types', '2.99' if RUBY_VERSION == '1.9.3'
 
 platforms :ruby do
   if RUBY_VERSION > "2.1.0"

data/gemfiles/active_record_42.gemfile

@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 gem 'railties', '~> 4.2.0'
 gem 'activerecord', '~> 4.2.0', :require => 'active_record'
 gem 'rspec-rails', '~> 2.14.1'
+gem 'mime-types', '2.99' if RUBY_VERSION == '1.9.3'
 
 platforms :ruby do
   if RUBY_VERSION > "2.1.0"

data/gemfiles/data_mapper_12.gemfile

@@ -9,11 +9,7 @@ gem 'dm-active_model', '~> 1.2.1'
 gem 'dm-sqlite-adapter', '~> 1.2.0'
 gem 'rspec-rails', '~> 2.14.1'
 
-# stick to versions that work under Ruby 1.8 for now
-gem 'capybara', '< 2.1'
-gem 'nokogiri', '< 1.6'
-gem 'rubyzip', '< 1'
-gem 'mime-types', '< 2'
+gem 'mime-types', '2.99' if RUBY_VERSION < '2.0.0'
 
 platforms :ruby do
   if RUBY_VERSION > "2.1.0"
@@ -22,9 +18,6 @@ platforms :ruby do
   else
     gem 'sqlite3', '1.3.8'
   end
-  if RUBY_VERSION <= "1.8.7"
-    gem 'i18n', '< 0.7.0'
-  end
 end
 platforms :jruby do
   gem 'activerecord-jdbcsqlite3-adapter', '~> 1.2.0'

data/gemfiles/mongo_mapper.gemfile

@@ -5,19 +5,13 @@ gem 'bson', '~> 1.9.2'
 gem 'mongo_mapper', '>= 0.11.0'
 gem 'rspec-rails', '~> 2.14.1'
 
-# stick to versions that work under Ruby 1.8 for now
-if RUBY_VERSION == '1.8.7'
-  gem 'capybara', '< 2.1'
-  gem 'nokogiri', '< 1.6'
-  gem 'rubyzip', '< 1'
-  gem 'mime-types', '< 2'
+gem 'capybara'
+gem 'nokogiri'
+gem 'rubyzip'
 
-  gem 'activesupport', '~> 3.2.18'
-  gem 'i18n', '< 0.7.0'
+if RUBY_VERSION == '1.9.3'
+  gem 'mime-types', '2.99'
 else
-  gem 'capybara'
-  gem 'nokogiri'
-  gem 'rubyzip'
   gem 'mime-types'
 end
 

data/gemfiles/mongoid_30.gemfile

@@ -6,6 +6,7 @@ gem 'rspec-rails', '~> 2.14.1'
 gem 'origin'
 gem 'moped'
 gem 'activesupport', '~> 3.2.18'
+gem 'mime-types', '2.99' if RUBY_VERSION == '1.9.3'
 
 platforms :mri do
   gem 'test-unit' if RUBY_VERSION > "2.1.0"

data/gemfiles/mongoid_31.gemfile

@@ -5,6 +5,7 @@ gem 'mongoid', '~> 3.1.0'
 gem 'rspec-rails', '~> 2.14.1'
 gem 'origin'
 gem 'moped'
+gem 'mime-types', '2.99' if RUBY_VERSION == '1.9.3'
 
 platforms :mri do
   gem 'test-unit' if RUBY_VERSION > "2.1.0"

data/gemfiles/mongoid_40.gemfile

@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 gem 'railties', '~> 4.0'
 gem "mongoid", "~> 4.0.0.beta2"
 gem 'rspec-rails', '~> 2.14.1'
+gem 'mime-types', '2.99' if RUBY_VERSION == '1.9.3'
 
 platforms :mri do
   gem 'test-unit' if RUBY_VERSION > "2.1.0"

data/gemfiles/mongoid_50.gemfile

@@ -0,0 +1,23 @@
+source 'https://rubygems.org'
+
+gem 'railties', '~> 4.0'
+gem 'mongoid', '~> 5.0.0'
+gem 'rspec-rails', '~> 2.14.1'
+gem 'mime-types', '2.99' if RUBY_VERSION == '1.9.3'
+
+group :development, :test do
+  gem 'database_cleaner', '~> 1.5.1'
+end
+
+platforms :mri do
+  gem 'test-unit' if RUBY_VERSION > '2.1.0'
+end
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'racc'
+  gem 'minitest'
+  gem 'rubinius-developer_tools'
+end
+
+gemspec :path => '../'

data/gemfiles/sinatra_13.gemfile

@@ -14,6 +14,7 @@ end
 gem 'rack-test'
 gem 'sinatra-contrib'
 gem 'rspec', '~> 2.14.1'
+gem 'mime-types', '2.99' if RUBY_VERSION == '1.9.3'
 
 platforms :ruby do
   if RUBY_VERSION > "2.1.0"
@@ -21,14 +22,6 @@ platforms :ruby do
   else
     gem 'sqlite3', '1.3.8'
   end
-  if RUBY_VERSION <= "1.8.7"
-    # stick to versions that work under Ruby 1.8 for now
-    gem 'mime-types', '< 2.0'
-    gem 'nokogiri', '< 1.6'
-    gem 'capybara', '< 2.1'
-    gem 'rubyzip', '< 1'
-    gem 'i18n', '< 0.7.0'
-  end
 end
 platforms :jruby do
   gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'

data/gemfiles/sinatra_14.gemfile

@@ -3,22 +3,15 @@ source 'https://rubygems.org'
 gem 'sinatra', '~> 1.4.0'
 gem 'rspec', '~> 2.14.1'
 
-if RUBY_VERSION <= "1.8.7"
-  gem 'activerecord', '~> 3.2.0', :require => 'active_record'
-  gem 'padrino-helpers', '~> 0.11.0'
-else
-  gem 'activerecord', '>= 4.0.0', :require => 'active_record'
-  gem 'padrino-helpers', '~> 0.12.0'
-end
+gem 'activerecord', '>= 4.0.0', :require => 'active_record'
+gem 'padrino-helpers', '~> 0.12.0'
 
 gem 'rack-test', '>= 0'
 gem 'sinatra-contrib', '~> 1.4.0'
 
-# stick to versions that work under Ruby 1.8 for now
-gem 'mime-types', '< 2.0'
-gem 'nokogiri', '< 1.6'
-gem 'capybara', '< 2.1'
-gem 'rubyzip', '< 1'
+if RUBY_VERSION == '1.9.3'
+  gem 'mime-types', '2.99'
+end
 
 platforms :ruby do
   if RUBY_VERSION > "2.1.0"
@@ -26,9 +19,6 @@ platforms :ruby do
   else
     gem 'sqlite3', '1.3.8'
   end
-  if RUBY_VERSION <= "1.8.7"
-    gem 'i18n', '< 0.7.0'
-  end
 end
 platforms :jruby do
   gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'

data/kaminari.gemspec

@@ -21,15 +21,15 @@ Gem::Specification.new do |s|
 
   s.licenses = ['MIT']
 
-  s.add_dependency 'activesupport', ['>= 3.0.0']
-  s.add_dependency 'actionpack', ['>= 3.0.0']
+  s.add_dependency 'activesupport', '>= 3.0.0'
+  s.add_dependency 'actionpack', '>= 3.0.0'
 
-  s.add_development_dependency 'bundler', ['>= 1.0.0']
-  s.add_development_dependency 'rake', ['>= 0']
-  s.add_development_dependency 'tzinfo', ['>= 0']
-  s.add_development_dependency 'rspec', ['>= 0']
-  s.add_development_dependency 'rr', ['>= 0']
-  s.add_development_dependency 'capybara', ['>= 1.0']
-  s.add_development_dependency 'database_cleaner', ['~> 1.2.0']
-  s.add_development_dependency 'rdoc', ['>= 0']
+  s.add_development_dependency 'bundler', '>= 1.0.0'
+  s.add_development_dependency 'rake', '>= 0'
+  s.add_development_dependency 'tzinfo', '>= 0'
+  s.add_development_dependency 'rspec', '>= 0'
+  s.add_development_dependency 'rr', (RUBY_VERSION < '2' ? '< 1.2' : '>= 0')
+  s.add_development_dependency 'capybara', '>= 1.0'
+  s.add_development_dependency 'database_cleaner', '~> 1.2.0'
+  s.add_development_dependency 'rdoc', '>= 0'
 end

data/lib/kaminari/helpers/action_view_extension.rb

@@ -95,7 +95,7 @@ module Kaminari
         t('helpers.page_entries_info.one_page.display_entries', :entry_name => entry_name, :count => collection.total_count)
       else
         first = collection.offset_value + 1
-        last = collection.last_page? ? collection.total_count : collection.offset_value + collection.limit_value
+        last = (sum = collection.offset_value + collection.limit_value) > collection.total_count ? collection.total_count : sum
         t('helpers.page_entries_info.more_pages.display_entries', :entry_name => entry_name, :first => first, :last => last, :total => collection.total_count)
       end.html_safe
     end

data/lib/kaminari/helpers/paginator.rb

@@ -12,7 +12,7 @@ module Kaminari
       include ::ActionView::Context
 
       def initialize(template, options) #:nodoc:
-        #FIXME for compatibility. remove num_pages at some time in the future
+        ActiveSupport::Deprecation.warn 'num_pages is deprecated and will be removed in Kaminari 1.0. Please use total_pages instead.' if options.has_key? :num_pages
         options[:num_pages] ||= options[:total_pages]
 
         @window_options = {}.tap do |h|

data/lib/kaminari/helpers/tags.rb

@@ -18,7 +18,10 @@ module Kaminari
         @param_name = @options.delete(:param_name) || Kaminari.config.param_name
         @theme = @options.delete(:theme)
         @views_prefix = @options.delete(:views_prefix)
-        @params = @options[:params] ? template.params.merge(@options.delete :params) : template.params
+        @params = template.params
+        # @params in Rails 5 no longer inherits from Hash
+        @params = @params.to_unsafe_h if @params.respond_to?(:to_unsafe_h)
+        @params = @params.except(:script_name).merge(@options.delete(:params) || {})
       end
 
       def to_s(locals = {}) #:nodoc:

data/lib/kaminari/hooks.rb

@@ -6,25 +6,42 @@ module Kaminari
         ::ActiveRecord::Base.send :include, Kaminari::ActiveRecordExtension
       end
 
-      begin; require 'data_mapper'; rescue LoadError; end
-      if defined? ::DataMapper
-        require 'dm-aggregates'
-        require 'kaminari/models/data_mapper_extension'
-        ::DataMapper::Collection.send :include, Kaminari::DataMapperExtension::Collection
-        ::DataMapper::Model.append_extensions Kaminari::DataMapperExtension::Model
-        # ::DataMapper::Model.send :extend, Kaminari::DataMapperExtension::Model
+      # data_mapper
+      begin
+        require 'kaminari/data_mapper'
+      rescue LoadError
+        begin; require 'data_mapper'; rescue LoadError; end
+        if defined? ::DataMapper
+          require 'dm-aggregates'
+          require 'kaminari/models/data_mapper_extension'
+          ::DataMapper::Collection.send :include, Kaminari::DataMapperExtension::Collection
+          ::DataMapper::Model.append_extensions Kaminari::DataMapperExtension::Model
+          # ::DataMapper::Model.send :extend, Kaminari::DataMapperExtension::Model
+        end
       end
 
-      begin; require 'mongoid'; rescue LoadError; end
-      if defined? ::Mongoid
-        require 'kaminari/models/mongoid_extension'
-        ::Mongoid::Document.send :include, Kaminari::MongoidExtension::Document
+      ## mongoid
+      begin
+        require 'kaminari/mongoid'
+      rescue LoadError
+        begin; require 'mongoid'; rescue LoadError; end
+        if defined? ::Mongoid
+          ActiveSupport::Deprecation.warn 'Kaminari Mongoid support has been extracted to a separate gem, and will be removed in the next 1.0 release. Please bundle kaminari-mongoid gem.'
+          require 'kaminari/models/mongoid_extension'
+          ::Mongoid::Document.send :include, Kaminari::MongoidExtension::Document
+        end
       end
 
+      ## mongo_mapper
       ActiveSupport.on_load(:mongo_mapper) do
-        require 'kaminari/models/mongo_mapper_extension'
-        ::MongoMapper::Document.send :include, Kaminari::MongoMapperExtension::Document
-        ::Plucky::Query.send :include, Kaminari::PluckyCriteriaMethods
+        begin
+          require 'kaminari/mongo_mapper'
+        rescue LoadError
+          ActiveSupport::Deprecation.warn 'Kaminari MongoMapper support has been extracted to a separate gem, and will be removed in the next 1.0 release. Please bundle kaminari-mongo_mapper gem.'
+          require 'kaminari/models/mongo_mapper_extension'
+          ::MongoMapper::Document.send :include, Kaminari::MongoMapperExtension::Document
+          ::Plucky::Query.send :include, Kaminari::PluckyCriteriaMethods
+        end
       end
       require 'kaminari/models/array_extension'
 

data/lib/kaminari/models/mongoid_extension.rb

@@ -20,7 +20,7 @@ module Kaminari
           super
           kls.send(:include, Kaminari::MongoidExtension::Document.dup)
         end
-      end
+      end if Mongoid::VERSION < '5.0.0'
     end
   end
 end

data/lib/kaminari/models/page_scope_methods.rb

@@ -30,8 +30,11 @@ module Kaminari
         total_pages_count
       end
     end
-    #FIXME for compatibility. remove num_pages at some time in the future
-    alias num_pages total_pages
+
+    def num_pages
+      ActiveSupport::Deprecation.warn 'num_pages is deprecated and will be removed in Kaminari 1.0. Please use total_pages instead.'
+      total_pages
+    end
 
     # Current page number
     def current_page

data/lib/kaminari/railtie.rb

@@ -1,6 +1,6 @@
 module Kaminari
   class Railtie < ::Rails::Railtie #:nodoc:
-    initializer 'kaminari' do |_app|
+    initializer 'kaminari' do
       Kaminari::Hooks.init
     end
   end

data/lib/kaminari/sinatra.rb

@@ -2,4 +2,6 @@ require 'sinatra/base'
 require 'kaminari'
 require 'kaminari/helpers/sinatra_helpers'
 
+ActiveSupport::Deprecation.warn 'Kaminari Sinatra support has been extracted to a separate gem, and will be removed in the next 1.0 release. Please bundle kaminari-sinatra gem.'
+
 Kaminari::Hooks.init

data/lib/kaminari/version.rb

@@ -1,3 +1,3 @@
 module Kaminari
-  VERSION = '0.16.3'
+  VERSION = '0.17.0'
 end

data/spec/fake_app/mongoid/config.rb

@@ -10,7 +10,9 @@ if RUBY_VERSION >= '1.9.2' && RUBY_VERSION < '2.2.0'
 end
 
 Mongoid.configure do |config|
-  if Mongoid::VERSION > '3.0.0'
+  if Mongoid::VERSION >= '5.0.0'
+    config.connect_to 'kaminari_test'
+  elsif Mongoid::VERSION > '3.0.0'
     config.sessions = {:default => {:hosts => ['0.0.0.0:27017'], :database => 'kaminari_test'}}
   else
     config.master = Mongo::Connection.new.db('kaminari_test')

data/spec/helpers/action_view_extension_spec.rb

@@ -177,6 +177,18 @@ describe 'Kaminari::ActionViewExtension', :if => defined?(Rails)do
             it      { should == 'Displaying members <b>26&nbsp;-&nbsp;50</b> of <b>50</b> in total' }
           end
         end
+
+        describe 'the last page' do
+          before do
+            User.max_pages_per 4
+            @users = User.page(4).per(10)
+          end
+
+          after { User.max_pages_per nil }
+
+          subject { helper.page_entries_info @users, :params => {:controller => 'users', :action => 'index'} }
+          it      { should == 'Displaying users <b>31&nbsp;-&nbsp;40</b> of <b>50</b> in total' }
+        end
       end
     end
     context 'on a model with namespace' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kaminari
 version: !ruby/object:Gem::Version
-  version: 0.16.3
+  version: 0.17.0
 platform: ruby
 authors:
 - Akira Matsuda
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2016-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -203,10 +203,10 @@ files:
 - gemfiles/active_record_edge.gemfile
 - gemfiles/data_mapper_12.gemfile
 - gemfiles/mongo_mapper.gemfile
-- gemfiles/mongoid_24.gemfile
 - gemfiles/mongoid_30.gemfile
 - gemfiles/mongoid_31.gemfile
 - gemfiles/mongoid_40.gemfile
+- gemfiles/mongoid_50.gemfile
 - gemfiles/sinatra_13.gemfile
 - gemfiles/sinatra_14.gemfile
 - kaminari.gemspec
@@ -291,7 +291,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: kaminari
-rubygems_version: 2.4.5
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: A pagination engine plugin for Rails 3+ and other modern frameworks

data/gemfiles/mongoid_24.gemfile

@@ -1,25 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'railties', '>= 3.2.3'
-gem 'mongoid', '~> 2.4.0'
-gem 'rspec-rails', '~> 2.14.1'
-
-# stick to versions that work under Ruby 1.8 for now
-gem 'capybara', '< 2.1'
-gem 'nokogiri', '< 1.6'
-gem 'rubyzip', '< 1'
-gem 'mime-types', '< 2'
-gem 'database_cleaner', '< 1.0.0'
-
-if RUBY_VERSION <= "1.8.7"
-  gem 'i18n', '< 0.7.0'
-end
-
-platforms :rbx do
-  gem 'rubysl', '~> 2.0'
-  gem 'racc'
-  gem 'minitest'
-  gem 'rubinius-developer_tools'
-end
-
-gemspec :path => '../'