kaminari 0.16.1 → 0.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 117c68d8324470079a8c8a6eeaa3810f85c12db6
-  data.tar.gz: 7b2782d769a5f11cdae40b5235d32f52a38cb0b7
+  metadata.gz: 2627d8c87c7ace1ca82760c49c31f7cd7cc0dc3b
+  data.tar.gz: e8f5c196e7e5a01ad32579f7b3157912b6f2fe9c
 SHA512:
-  metadata.gz: 2c4e2d2cec8d2b0590956a935271d45277843a3acf507848be5c76098f79d072574f06447c76fbd5398bbf212be3b37bfd0c104d6568ca7a52a09f51cc233010
-  data.tar.gz: 5f4bfd98606eddfffa12c4b52a004183a110ac9c7b32c6b80f28fd58f7265379c8b55e3d2a258cfb31e3459e97fd694aa9bec62e5f1d0aad051517bbca33ec62
+  metadata.gz: 0cc0e4d37b650625b17c42545cfe6ffb71a7e716a0a7b28bb29330ee506d99a5b4bb820c8cc9ea1ea4379ce45cc00c93772e3d3e966b2808d827e5c5582b006a
+  data.tar.gz: 26bcfb07c7a0ea59728afd2e140683a66c350687fd96ac40f015530008b1700c1410d481bb25aa935cd6c60c37629105ddb201841432de43cad436f913c006b3

data/.travis.yml

@@ -1,13 +1,11 @@
-services: mongodb
-
-script: "bundle exec rake spec"
+language: ruby
 
 rvm:
   - 1.8.7
   - 1.9.3
   - 2.0.0
   - 2.1
-  - ruby-head
+  - 2.2
   - jruby
   - rbx-2
 
@@ -17,7 +15,7 @@ gemfile:
   - gemfiles/active_record_32.gemfile
   - gemfiles/active_record_40.gemfile
   - gemfiles/active_record_41.gemfile
-  - gemfiles/active_record_edge.gemfile
+  - gemfiles/active_record_42.gemfile
   - gemfiles/data_mapper_12.gemfile
   - gemfiles/mongo_mapper.gemfile
   - gemfiles/mongoid_24.gemfile
@@ -27,6 +25,14 @@ gemfile:
   - gemfiles/sinatra_13.gemfile
   - gemfiles/sinatra_14.gemfile
 
+sudo: false
+
+services: mongodb
+
+script: "bundle exec rake spec"
+
+cache: bundler
+
 matrix:
   exclude:
     - rvm: 1.8.7
@@ -34,20 +40,24 @@ matrix:
     - rvm: 1.8.7
       gemfile: gemfiles/active_record_41.gemfile
     - rvm: 1.8.7
-      gemfile: gemfiles/active_record_edge.gemfile
+      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: ruby-head
+    - rvm: 2.2
       gemfile: gemfiles/active_record_30.gemfile
-    - rvm: ruby-head
+    - rvm: 2.2
       gemfile: gemfiles/active_record_31.gemfile
-    - rvm: ruby-head
+    - rvm: 2.2
       gemfile: gemfiles/active_record_32.gemfile
+    - rvm: 2.2
+      gemfile: gemfiles/mongoid_24.gemfile
   allow_failures:
-    - rvm: ruby-head
-    - gemfile: gemfiles/active_record_edge.gemfile
+    - rvm: 1.8.7
+      gemfile: gemfiles/mongoid_24.gemfile
+    - rvm: jruby
+    - rvm: rbx-2
   fast_finish: true

data/CHANGELOG.rdoc

@@ -1,3 +1,26 @@
+== 0.16.2
+
+* Fixed a bug where cloned Relations remember previous relations'
+@total_count value #565 [inkstak]
+
+* Fixed a bug where `paginate_array()` with total_count option returns whole
+array for every page #516 [abhichvn]
+
+* Fixed a bug where :num_pages option was backwards-incompatible #605
+[klebershimabuku]
+
+* Fixed a bug where themed views generator attempts to overwrite README.md
+#623 [swrobel]
+
+* Fixed a bug that ruby raises a NameError when theme was not found #622
+[maxprokopiev]
+
+* Fixed a bug that paginates_per does not work with subclasses on mongoid #634
+[kouyaf77]
+
+* Show an error message if a proper template was not found for the generator
+theme #600 [meltedice]
+
 == 0.16.1
 
 * Fix a bug where :theme option for #paginate method doesn't work properly

data/README.rdoc

@@ -27,9 +27,9 @@ 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.1
+* Ruby 1.8.7, 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
+* Rails 3.0, 3.1, 3.2, 4.0, 4.1, 4.2
 
 * Haml 3+
 

data/Rakefile

@@ -13,7 +13,7 @@ end
 task :default => "spec:all"
 
 namespace :spec do
-  %w(active_record_edge active_record_40 active_record_41 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|
+  %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|
     desc "Run Tests against #{gemfile}"
     task gemfile do
       sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle --quiet"
@@ -23,7 +23,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_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|
+    %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|
       sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle --quiet"
       sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle exec rake spec"
     end

data/gemfiles/active_record_31.gemfile

@@ -16,6 +16,9 @@ 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

@@ -16,6 +16,9 @@ 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

@@ -7,6 +7,7 @@ gem 'rspec-rails', '~> 2.14.1'
 platforms :ruby do
   if RUBY_VERSION > "2.1.0"
     gem 'sqlite3'
+    gem 'test-unit'
   else
     gem 'sqlite3', '1.3.8'
   end

data/gemfiles/active_record_42.gemfile

@@ -0,0 +1,24 @@
+source 'https://rubygems.org'
+
+gem 'railties', '~> 4.2.0'
+gem 'activerecord', '~> 4.2.0', :require => 'active_record'
+gem 'rspec-rails', '~> 2.14.1'
+
+platforms :ruby do
+  if RUBY_VERSION > "2.1.0"
+    gem 'sqlite3'
+  else
+    gem 'sqlite3', '1.3.8'
+  end
+end
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'
+end
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'racc'
+  gem 'minitest'
+  gem 'rubinius-developer_tools'
+end
+
+gemspec :path => '../'

data/gemfiles/data_mapper_12.gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'railties', '>= 3.2.3'
+gem 'railties', '~> 3.2.21'
 gem 'dm-core', '~> 1.2.0'
 gem 'dm-migrations', '~> 1.2.0'
 gem 'dm-aggregates', '~> 1.2.0'
@@ -18,9 +18,13 @@ gem 'mime-types', '< 2'
 platforms :ruby do
   if RUBY_VERSION > "2.1.0"
     gem 'sqlite3'
+    gem 'test-unit'
   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

@@ -6,13 +6,19 @@ gem 'mongo_mapper', '>= 0.11.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'
-
 if RUBY_VERSION == '1.8.7'
+  gem 'capybara', '< 2.1'
+  gem 'nokogiri', '< 1.6'
+  gem 'rubyzip', '< 1'
+  gem 'mime-types', '< 2'
+
   gem 'activesupport', '~> 3.2.18'
+  gem 'i18n', '< 0.7.0'
+else
+  gem 'capybara'
+  gem 'nokogiri'
+  gem 'rubyzip'
+  gem 'mime-types'
 end
 
 platforms :rbx do

data/gemfiles/mongoid_24.gemfile

@@ -11,6 +11,10 @@ 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'

data/gemfiles/mongoid_30.gemfile

@@ -7,6 +7,10 @@ gem 'origin'
 gem 'moped'
 gem 'activesupport', '~> 3.2.18'
 
+platforms :mri do
+  gem 'test-unit' if RUBY_VERSION > "2.1.0"
+end
+
 platforms :rbx do
   gem 'rubysl', '~> 2.0'
   gem 'racc'

data/gemfiles/mongoid_31.gemfile

@@ -6,6 +6,10 @@ gem 'rspec-rails', '~> 2.14.1'
 gem 'origin'
 gem 'moped'
 
+platforms :mri do
+  gem 'test-unit' if RUBY_VERSION > "2.1.0"
+end
+
 platforms :rbx do
   gem 'rubysl', '~> 2.0'
   gem 'racc'

data/gemfiles/mongoid_40.gemfile

@@ -4,6 +4,10 @@ gem 'railties', '~> 4.0'
 gem "mongoid", "~> 4.0.0.beta2"
 gem 'rspec-rails', '~> 2.14.1'
 
+platforms :mri do
+  gem 'test-unit' if RUBY_VERSION > "2.1.0"
+end
+
 platforms :rbx do
   gem 'rubysl', '~> 2.0'
   gem 'racc'

data/gemfiles/sinatra_13.gemfile

@@ -1,18 +1,19 @@
 source 'https://rubygems.org'
 
-gem 'activerecord', '~> 3.2.3', :require => 'active_record'
 gem 'sinatra', '~> 1.3.0'
-gem 'tilt', '~> 1.3.0'
-gem 'padrino-helpers', '~> 0.10.6'
-gem 'rack-test', '>= 0'
-gem 'sinatra-contrib', '~> 1.3.0'
-gem 'rspec', '~> 2.14.1'
+gem 'tilt'
 
-# 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 >= "2.2.0"
+  gem 'activerecord', '>= 4.0.0', :require => 'active_record'
+  gem 'padrino-helpers'
+else
+  gem 'activerecord', '~> 3.2.3', :require => 'active_record'
+  gem 'padrino-helpers', '~> 0.10.6'
+end
+
+gem 'rack-test'
+gem 'sinatra-contrib'
+gem 'rspec', '~> 2.14.1'
 
 platforms :ruby do
   if RUBY_VERSION > "2.1.0"
@@ -20,6 +21,14 @@ 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

@@ -1,12 +1,13 @@
 source 'https://rubygems.org'
 
-gem 'activerecord', '~> 3.2.0', :require => 'active_record'
 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
 
@@ -25,6 +26,9 @@ 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/lib/generators/kaminari/views_generator.rb

@@ -24,11 +24,12 @@ BANNER
       def copy_or_fetch #:nodoc:
         return copy_default_views if file_name == 'default'
 
-        themes = self.class.themes
-        if theme = themes.detect {|t| t.name == file_name}
-          download_templates theme
+        if theme = self.class.themes.detect {|t| t.name == file_name}
+          if download_templates(theme).empty?
+            say %Q[template_engine: #{template_engine} is not available for theme: #{file_name}]
+          end
         else
-          say %Q[no such theme: #{file_name}\n  avaliable themes: #{themes.map(&:name).join ", "}]
+          say %Q[no such theme: #{file_name}\n  avaliable themes: #{self.class.themes.map(&:name).join ", "}]
         end
       end
 
@@ -89,7 +90,7 @@ BANNER
       end
 
       def templates_for(template_engine) #:nodoc:
-        @templates.select {|t| !t.description?}.select {|t| !t.view? || (t.engine == template_engine)}
+        @templates.select {|t| t.engine == template_engine }
       end
     end
 

data/lib/kaminari/helpers/action_view_extension.rb

@@ -15,7 +15,9 @@ module Kaminari
     # * <tt>:remote</tt> - Ajax? (false by default)
     # * <tt>:ANY_OTHER_VALUES</tt> - Any other hash key & values would be directly passed into each tag as :locals value.
     def paginate(scope, options = {}, &block)
-      paginator = Kaminari::Helpers::Paginator.new self, options.reverse_merge(:current_page => scope.current_page, :total_pages => scope.total_pages, :per_page => scope.limit_value, :remote => false)
+      options[:total_pages] ||= options[:num_pages] || scope.total_pages
+
+      paginator = Kaminari::Helpers::Paginator.new(self, options.reverse_merge(:current_page => scope.current_page, :per_page => scope.limit_value, :remote => false))
       paginator.to_s
     end
 

data/lib/kaminari/helpers/paginator.rb

@@ -13,7 +13,6 @@ module Kaminari
 
       def initialize(template, options) #:nodoc:
         #FIXME for compatibility. remove num_pages at some time in the future
-        options[:total_pages] ||= options[:num_pages]
         options[:num_pages] ||= options[:total_pages]
 
         @window_options = {}.tap do |h|

data/lib/kaminari/helpers/sinatra_helpers.rb

@@ -1,5 +1,6 @@
 require 'active_support/core_ext/object'
 require 'active_support/core_ext/string'
+require 'action_dispatch/http/mime_type'
 
 begin
 

data/lib/kaminari/models/active_record_model_extension.rb

@@ -11,7 +11,7 @@ module Kaminari
       #   Model.page(5)
       eval <<-RUBY
         def self.#{Kaminari.config.page_method_name}(num = nil)
-          limit(default_per_page).offset(default_per_page * ([num.to_i, 1].max - 1)).extending do
+          limit(default_per_page).offset(default_per_page * ((num = num.to_i - 1) < 0 ? 0 : num)).extending do
             include Kaminari::ActiveRecordRelationMethods
             include Kaminari::PageScopeMethods
           end

data/lib/kaminari/models/active_record_relation_methods.rb

@@ -12,6 +12,11 @@ module Kaminari
       model_name.human.downcase
     end
 
+    def reset #:nodoc:
+      @total_count = nil
+      super
+    end
+
     def total_count(column_name = :all, options = {}) #:nodoc:
       # #count overrides the #select which could include generated columns referenced in #order, so skip #order here, where it's irrelevant to the result anyway
       @total_count ||= begin

data/lib/kaminari/models/array_extension.rb

@@ -17,11 +17,15 @@ module Kaminari
         extend Kaminari::PageScopeMethods
       end
 
-      if @_total_count
-        original_array = original_array.first(@_total_count)
+      if @_total_count.present? && @_total_count <= original_array.count
+        original_array = original_array.first(@_total_count)[@_offset_value, @_limit_value]
       end
 
-      super(original_array[@_offset_value, @_limit_value] || [])
+      if @_total_count.nil?
+        original_array = original_array[@_offset_value, @_limit_value]
+      end
+
+      super(original_array || [])
     end
 
     def entry_name
@@ -31,7 +35,7 @@ module Kaminari
     # items at the specified "page"
     class_eval <<-RUBY, __FILE__, __LINE__ + 1
       def #{Kaminari.config.page_method_name}(num = 1)
-        offset(limit_value * ([num.to_i, 1].max - 1))
+        offset(limit_value * ((num = num.to_i - 1) < 0 ? 0 : num))
       end
     RUBY
 

data/lib/kaminari/models/mongoid_criteria_methods.rb

@@ -1,5 +1,10 @@
 module Kaminari
   module MongoidCriteriaMethods
+    def initialize_copy(other) #:nodoc:
+      @total_count = nil
+      super
+    end
+
     def entry_name
       model_name.human.downcase
     end

data/lib/kaminari/models/mongoid_extension.rb

@@ -7,14 +7,20 @@ module Kaminari
       include Kaminari::ConfigurationMethods
 
       included do
-        # Fetch the values at the specified page number
-        #   Model.page(5)
         scope Kaminari.config.page_method_name, Proc.new {|num|
-          limit(default_per_page).offset(default_per_page * ([num.to_i, 1].max - 1))
+          limit(default_per_page).offset(default_per_page * ((num = num.to_i - 1) < 0 ? 0 : num))
         } do
           include Kaminari::MongoidCriteriaMethods
           include Kaminari::PageScopeMethods
         end
+
+        class << self
+          def inherited_with_kaminari(kls)
+            inherited_without_kaminari(kls)
+            kls.send(:include, Kaminari::MongoidExtension::Document.dup)
+          end
+          alias_method_chain :inherited, :kaminari
+        end
       end
     end
   end

data/lib/kaminari/version.rb

@@ -1,3 +1,3 @@
 module Kaminari
-  VERSION = '0.16.1'
+  VERSION = '0.16.2'
 end

data/spec/fake_app/active_record/models.rb

@@ -10,7 +10,7 @@ class User < ActiveRecord::Base
     User.joins(:books_read => :authors).where(:authors_books => {:id => self})
   end
 
-  scope :by_name, order(:name)
+  scope :by_name, lambda { order(:name) }
   scope :by_read_count, lambda {
     cols = if connection.adapter_name == "PostgreSQL"
       column_names.map { |column| %{"users"."#{column}"} }.join(", ")

data/spec/fake_app/mongo_mapper/config.rb

@@ -1,2 +1,2 @@
-MongoMapper.connection = Mongo::Connection.new 'localhost', 27017
+MongoMapper.connection = Mongo::Connection.new '0.0.0.0', 27017
 MongoMapper.database = 'kaminari_test'

data/spec/fake_app/mongoid/config.rb

@@ -5,13 +5,13 @@
 # See: http://redmine.ruby-lang.org/issues/show/4300
 require 'mongoid/version'
 
-if RUBY_VERSION >= '1.9.2'
+if RUBY_VERSION >= '1.9.2' && RUBY_VERSION < '2.2.0'
   YAML::ENGINE.yamler = 'syck'
 end
 
 Mongoid.configure do |config|
   if Mongoid::VERSION > '3.0.0'
-    config.sessions = {:default => {:hosts => ['localhost:27017'], :database => 'kaminari_test'}}
+    config.sessions = {:default => {:hosts => ['0.0.0.0:27017'], :database => 'kaminari_test'}}
   else
     config.master = Mongo::Connection.new.db('kaminari_test')
   end

data/spec/fake_app/mongoid/models.rb

@@ -1,6 +1,6 @@
 class User
   include ::Mongoid::Document
-  if Mongoid::VERSION > '4.0.0'
+  if Mongoid::VERSION >= '4.0.0'
     include Mongoid::Attributes::Dynamic
   end
 
@@ -12,6 +12,14 @@ class User::Address
   include ::Mongoid::Document
 end
 
+class Product
+  include ::Mongoid::Document
+end
+
+class Device < Product
+  paginates_per 100
+end
+
 class MongoMongoidExtensionDeveloper
   include ::Mongoid::Document
   field :salary, :type => Integer

data/spec/helpers/action_view_extension_spec.rb

@@ -28,6 +28,11 @@ describe 'Kaminari::ActionViewExtension', :if => defined?(Rails)do
       subject { helper.paginate @users, :views_prefix => "alternative/", :params => {:controller => 'users', :action => 'index'} }
       it { should eq("  <b>1</b>\n") }
     end
+
+    context "num_pages: 3" do
+      subject { helper.paginate @users, :num_pages => 3, :params => {:controller => 'users', :action => 'index'} }
+      it { should match(/<a href="\/users\?page=3">Last/) }
+    end
   end
 
   describe '#link_to_previous_page' do

data/spec/models/active_record/active_record_relation_methods_spec.rb

@@ -14,6 +14,12 @@ if defined? ActiveRecord
         @books.each {|book| book.readers << @readers }
       end
 
+      context "when the scope is cloned" do
+        it "should reset total_coount momoization" do
+          User.page.tap(&:total_count).where(:name => 'author').total_count.should == 1
+        end
+      end
+
       context "when the scope includes an order which references a generated column" do
         it "should successfully count the results" do
           @author.readers.by_read_count.page(1).total_count.should == @readers.size

data/spec/models/array_spec.rb

@@ -142,27 +142,30 @@ describe Kaminari::PaginatableArray do
   end
 
   context 'when setting total count explicitly' do
-    context "total_count > size of the given array" do
+    context "array 1..10, page 5, per 10, total_count 9999" do
       subject { Kaminari::PaginatableArray.new((1..10).to_a, :total_count => 9999).page(5).per(10) }
 
-      it { should have(0).items }
-      its(:first) { should be_nil }
+      it { should have(10).items }
+      its(:first) { should == 1 }
+      its(:current_page) { should == 5 }
       its(:total_count) { should == 9999 }
     end
 
-    context "total_count == size of the given array" do
+    context "array 1..15, page 1, per 10, total_count 15" do
       subject { Kaminari.paginate_array((1..15).to_a, :total_count => 15).page(1).per(10) }
 
       it { should have(10).items }
       its(:first) { should == 1 }
+      its(:current_page) { should == 1 }
       its(:total_count) { should == 15 }
     end
 
-    context "total_count < size of the given array" do
+    context "array 1..25, page 2, per 10, total_count 15" do
       subject { Kaminari.paginate_array((1..25).to_a, :total_count => 15).page(2).per(10) }
 
       it { should have(5).items }
       its(:first) { should == 11 }
+      its(:current_page) { should == 2 }
       its(:total_count) { should == 15 }
     end
   end

data/spec/models/mongoid/mongoid_spec.rb

@@ -1,6 +1,20 @@
 require 'spec_helper'
 
 if defined? Mongoid
+  describe Kaminari::MongoidCriteriaMethods do
+    describe "#total_count" do
+      before do
+        2.times {|i| User.create!(:salary => i) }
+      end
+
+      context "when the scope is cloned" do
+        it "should reset total_coount momoization" do
+          User.page.tap(&:total_count).where(:salary => 1).total_count.should == 1
+        end
+      end
+    end
+  end
+
   describe Kaminari::MongoidExtension do
     before(:each) do
       41.times do
@@ -193,5 +207,17 @@ if defined? Mongoid
         its(:total_pages) { should == 2 }
       end
     end
+
+    describe '#paginates_per' do
+      context 'when paginates_per is not defined in superclass' do
+        subject { Product.all.page 1 }
+        its(:limit_value) { should == 25 }
+      end
+
+      context 'when paginates_per is defined in subclass' do
+        subject { Device.all.page 1 }
+        its(:limit_value) { should == 100 }
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kaminari
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.16.2
 platform: ruby
 authors:
 - Akira Matsuda
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2015-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -199,6 +199,7 @@ files:
 - gemfiles/active_record_32.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
@@ -289,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: kaminari
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A pagination engine plugin for Rails 3+ and other modern frameworks