kaminari 0.14.1 → 0.17.0

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
@@ -8,12 +22,68 @@ if defined? Mongoid
       end
     end
 
+    describe 'max_scan', :if => Mongoid::VERSION >= '3' do
+      context 'less than total' do
+        context 'page 1' do
+          subject { User.max_scan(20).page 1 }
+          it { should be_a Mongoid::Criteria }
+          its(:current_page) { should == 1   }
+          its(:prev_page)    { should be_nil }
+          its(:next_page)    { should be_nil }
+          its(:limit_value)  { should == 25  }
+          its(:total_pages)  { should == 1   }
+          its(:total_count)  { should == 20  }
+          it { should skip(0) }
+        end
+
+        context 'page 2' do
+          subject { User.max_scan(30).page 2 }
+          it { should be_a Mongoid::Criteria }
+          its(:current_page) { should == 2   }
+          its(:prev_page)    { should == 1   }
+          its(:next_page)    { should be_nil }
+          its(:limit_value)  { should == 25  }
+          its(:total_pages)  { should == 2   }
+          its(:total_count)  { should == 30  }
+          it { should skip 25 }
+        end
+      end
+
+      context 'more than total' do
+        context 'page 1' do
+          subject { User.max_scan(60).page 1 }
+          it { should be_a Mongoid::Criteria }
+          its(:current_page) { should == 1   }
+          its(:prev_page)    { should be_nil }
+          its(:next_page)    { should == 2   }
+          its(:limit_value)  { should == 25  }
+          its(:total_pages)  { should == 2   }
+          its(:total_count)  { should == 41  }
+          it { should skip(0) }
+        end
+
+        context 'page 2' do
+          subject { User.max_scan(60).page 2 }
+          it { should be_a Mongoid::Criteria }
+          its(:current_page) { should == 2   }
+          its(:prev_page) { should == 1      }
+          its(:next_page) { should be_nil    }
+          its(:limit_value) { should == 25   }
+          its(:total_pages) { should == 2    }
+          its(:total_count)  { should == 41  }
+          it { should skip 25 }
+        end
+      end
+    end
+
     describe '#page' do
 
       context 'page 1' do
         subject { User.page 1 }
         it { should be_a Mongoid::Criteria }
         its(:current_page) { should == 1 }
+        its(:prev_page) { should be_nil }
+        its(:next_page) { should == 2 }
         its(:limit_value) { should == 25 }
         its(:total_pages) { should == 2 }
         it { should skip(0) }
@@ -23,6 +93,8 @@ if defined? Mongoid
         subject { User.page 2 }
         it { should be_a Mongoid::Criteria }
         its(:current_page) { should == 2 }
+        its(:prev_page) { should == 1 }
+        its(:next_page) { should be_nil }
         its(:limit_value) { should == 25 }
         its(:total_pages) { should == 2 }
         it { should skip 25 }
@@ -32,18 +104,22 @@ if defined? Mongoid
         subject { User.page 'foobar' }
         it { should be_a Mongoid::Criteria }
         its(:current_page) { should == 1 }
+        its(:prev_page) { should be_nil }
+        its(:next_page) { should == 2 }
         its(:limit_value) { should == 25 }
         its(:total_pages) { should == 2 }
         it { should skip 0 }
       end
 
       shared_examples 'complete valid pagination' do
-        if Mongoid::VERSION =~ /^3/
+        if Mongoid::VERSION > '3.0.0'
           its(:selector) { should == {'salary' => 1} }
         else
           its(:selector) { should == {:salary => 1} }
         end
         its(:current_page) { should == 2 }
+        its(:prev_page) { should == 1 }
+        its(:next_page) { should be_nil }
         its(:limit_value) { should == 25 }
         its(:total_pages) { should == 2 }
         it { should skip 25 }
@@ -58,12 +134,31 @@ if defined? Mongoid
         subject { User.page(2).where(:salary => 1) }
         it_should_behave_like 'complete valid pagination'
       end
+
+      context "with database:", :if => Mongoid::VERSION >= '3' do
+        before :all do
+          15.times { User.with(:database => "default_db").create!(:salary => 1) }
+          10.times { User.with(:database => "other_db").create!(:salary => 1) }
+        end
+
+        context "default_db" do
+          subject { User.with(:database => "default_db").order_by(:artist.asc).page(1) }
+          its(:total_count) { should == 15 }
+        end
+
+        context "other_db" do
+          subject { User.with(:database => "other_db").order_by(:artist.asc).page(1) }
+          its(:total_count) { should == 10 }
+        end
+      end
     end
 
     describe '#per' do
       subject { User.page(2).per(10) }
       it { should be_a Mongoid::Criteria }
       its(:current_page) { should == 2 }
+      its(:prev_page) { should == 1 }
+      its(:next_page) { should == 3 }
       its(:limit_value) { should == 10 }
       its(:total_pages) { should == 5 }
       it { should skip 10 }
@@ -85,6 +180,8 @@ if defined? Mongoid
         its(:total_count) { should == 5 }
         its(:limit_value) { should == 1 }
         its(:current_page) { should == 1 }
+        its(:prev_page) { should be_nil }
+        its(:next_page) { should == 2 }
         its(:total_pages) { should == 5 }
       end
 
@@ -94,6 +191,8 @@ if defined? Mongoid
         its(:total_count) { should == 3 }
         its(:limit_value) { should == 2 }
         its(:current_page) { should == 1 }
+        its(:prev_page) { should be_nil }
+        its(:next_page) { should == 2 }
         its(:total_pages) { should == 2 }
       end
 
@@ -103,8 +202,27 @@ if defined? Mongoid
         its(:total_count) { should == 3 }
         its(:limit_value) { should == 2 }
         its(:current_page) { should == 1 }
+        its(:prev_page) { should be_nil }
+        its(:next_page) { should == 2 }
         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
+
+      context 'when paginates_per is defined in subclass of subclass' do
+        subject { Android.all.page 1 }
+        its(:limit_value) { should == 200 }
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -9,6 +9,7 @@ end
 require 'bundler/setup'
 Bundler.require
 
+require 'capybara/rspec'
 require 'database_cleaner'
 
 # Simulate a gem providing a subclass of ActiveRecord::Base before the Railtie is loaded.
@@ -29,4 +30,5 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
   config.mock_with :rr
+  config.filter_run_excluding :generator_spec => true if !ENV['GENERATOR_SPEC']
 end

data/spec/spec_helper_for_sinatra.rb

@@ -1,7 +1,7 @@
 require 'kaminari/sinatra'
+require 'kaminari/helpers/action_view_extension'
 require 'rack/test'
 require 'sinatra/test_helpers'
-require 'capybara/dsl'
 require 'capybara/rspec'
 
 require 'fake_app/sinatra_app'
@@ -17,14 +17,13 @@ module HelperMethodForHelperSpec
 
   def helper
     # OMG terrible object...
-    Kaminari::Helpers::SinatraHelpers::ActionViewTemplateProxy.new(:current_params => {}, :current_path => '/', :param_name => Kaminari.config.param_name).extend(Padrino::Helpers, Kaminari::ActionViewExtension, Kaminari::Helpers::SinatraHelpers::HelperMethods, FakeEnv)
+    ::Kaminari::Helpers::SinatraHelpers::ActionViewTemplateProxy.new(:current_params => {}, :current_path => '/', :param_name => Kaminari.config.param_name).extend(Padrino::Helpers, Kaminari::ActionViewExtension, Kaminari::Helpers::SinatraHelpers::HelperMethods, FakeEnv)
   end
 end
 
 RSpec.configure do |config|
   config.include Rack::Test::Methods
   config.include Sinatra::TestHelpers
-  config.include Capybara::DSL
   config.include HelperMethodForHelperSpec
 #   config.include HelperMethodForHelperSpec, :type => :helper
 end

data/spec/support/database_cleaner.rb

@@ -1,11 +1,14 @@
 DatabaseCleaner[:active_record].strategy = :transaction if defined? ActiveRecord
-DatabaseCleaner[:data_mapper].strategy = :transaction if defined? DataMapper
+DatabaseCleaner[:data_mapper].strategy = :truncation if defined? DataMapper
 DatabaseCleaner[:mongoid].strategy = :truncation if defined? Mongoid
 DatabaseCleaner[:mongo_mapper].strategy = :truncation if defined? MongoMapper
 
 RSpec.configure do |config|
   config.before :suite do
-    DatabaseCleaner.clean_with :truncation
+    DatabaseCleaner.clean_with :truncation if defined? ActiveRecord
+    DatabaseCleaner.clean_with :truncation if defined? DataMapper
+    DatabaseCleaner.clean_with :truncation if defined? Mongoid
+    DatabaseCleaner.clean_with :truncation if defined? MongoMapper
   end
   config.before :each do
     DatabaseCleaner.start

metadata

@@ -1,194 +1,160 @@
 --- !ruby/object:Gem::Specification
 name: kaminari
 version: !ruby/object:Gem::Version
-  version: 0.14.1
-  prerelease: 
+  version: 0.17.0
 platform: ruby
 authors:
 - Akira Matsuda
+- Yuki Nishijima
+- Zachary Scott
+- Hiroshi Shibata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-11 00:00:00.000000000 Z
+date: 2016-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Kaminari is a Scope & Engine based, clean, powerful, agnostic, customizable
-  and sophisticated paginator for Rails 3
+  and sophisticated paginator for Rails 3+
 email:
 - ronnie@dio.jp
 executables: []
@@ -196,12 +162,12 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
-- .document
-- .gemtest
-- .gitignore
-- .rspec
-- .travis.yml
-- CHANGELOG
+- ".document"
+- ".gemtest"
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- CHANGELOG.rdoc
 - Gemfile
 - MIT-LICENSE
 - README.rdoc
@@ -231,11 +197,18 @@ files:
 - gemfiles/active_record_30.gemfile
 - gemfiles/active_record_31.gemfile
 - 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
-- gemfiles/mongoid_24.gemfile
 - gemfiles/mongoid_30.gemfile
-- gemfiles/sinatra.gemfile
+- gemfiles/mongoid_31.gemfile
+- gemfiles/mongoid_40.gemfile
+- gemfiles/mongoid_50.gemfile
+- gemfiles/sinatra_13.gemfile
+- gemfiles/sinatra_14.gemfile
 - kaminari.gemspec
 - lib/generators/kaminari/config_generator.rb
 - lib/generators/kaminari/templates/kaminari_config.rb
@@ -275,16 +248,21 @@ files:
 - spec/fake_app/mongoid/models.rb
 - spec/fake_app/rails_app.rb
 - spec/fake_app/sinatra_app.rb
+- spec/fake_app/views/alternative/kaminari/_first_page.html.erb
+- spec/fake_app/views/alternative/kaminari/_paginator.html.erb
+- spec/fake_app/views/kaminari/bootstrap/_page.html.erb
+- spec/fake_app/views/kaminari/bootstrap/_paginator.html.erb
 - spec/fake_gem.rb
+- spec/generators/views_generator_spec.rb
 - spec/helpers/action_view_extension_spec.rb
 - spec/helpers/helpers_spec.rb
 - spec/helpers/sinatra_helpers_spec.rb
 - spec/helpers/tags_spec.rb
 - spec/models/active_record/active_record_relation_methods_spec.rb
-- spec/models/active_record/default_per_page_spec.rb
-- spec/models/active_record/max_per_page_spec.rb
+- spec/models/active_record/inherited_spec.rb
 - spec/models/active_record/scopes_spec.rb
 - spec/models/array_spec.rb
+- spec/models/configuration_methods_spec.rb
 - spec/models/data_mapper/data_mapper_spec.rb
 - spec/models/mongo_mapper/mongo_mapper_spec.rb
 - spec/models/mongoid/mongoid_spec.rb
@@ -296,34 +274,27 @@ files:
 homepage: https://github.com/amatsuda/kaminari
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1633849575199426851
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1633849575199426851
 requirements: []
 rubyforge_project: kaminari
-rubygems_version: 1.8.24
+rubygems_version: 2.6.4
 signing_key: 
-specification_version: 3
-summary: A pagination engine plugin for Rails 3 or other modern frameworks
+specification_version: 4
+summary: A pagination engine plugin for Rails 3+ and other modern frameworks
 test_files:
 - spec/config/config_spec.rb
 - spec/fake_app/active_record/config.rb
@@ -336,16 +307,21 @@ test_files:
 - spec/fake_app/mongoid/models.rb
 - spec/fake_app/rails_app.rb
 - spec/fake_app/sinatra_app.rb
+- spec/fake_app/views/alternative/kaminari/_first_page.html.erb
+- spec/fake_app/views/alternative/kaminari/_paginator.html.erb
+- spec/fake_app/views/kaminari/bootstrap/_page.html.erb
+- spec/fake_app/views/kaminari/bootstrap/_paginator.html.erb
 - spec/fake_gem.rb
+- spec/generators/views_generator_spec.rb
 - spec/helpers/action_view_extension_spec.rb
 - spec/helpers/helpers_spec.rb
 - spec/helpers/sinatra_helpers_spec.rb
 - spec/helpers/tags_spec.rb
 - spec/models/active_record/active_record_relation_methods_spec.rb
-- spec/models/active_record/default_per_page_spec.rb
-- spec/models/active_record/max_per_page_spec.rb
+- spec/models/active_record/inherited_spec.rb
 - spec/models/active_record/scopes_spec.rb
 - spec/models/array_spec.rb
+- spec/models/configuration_methods_spec.rb
 - spec/models/data_mapper/data_mapper_spec.rb
 - spec/models/mongo_mapper/mongo_mapper_spec.rb
 - spec/models/mongoid/mongoid_spec.rb

data/gemfiles/mongoid_24.gemfile

@@ -1,7 +0,0 @@
-source :rubygems
-
-gem 'railties', '>= 3.2.3'
-gem 'mongoid', '~> 2.4.0'
-gem 'rspec-rails', '>= 2.0'
-
-gemspec :path => '../'

data/gemfiles/sinatra.gemfile

@@ -1,10 +0,0 @@
-source :rubygems
-
-gem 'activerecord', '>= 3.2.3', :require => 'active_record'
-gem 'sinatra', '>= 1.3'
-gem 'padrino-helpers', '>= 0.10.6.c'
-gem 'rack-test', '>= 0'
-gem 'sinatra-contrib', '>= 1.3'
-gem 'nokogiri', '>= 0'
-
-gemspec :path => '../'

data/spec/models/active_record/default_per_page_spec.rb

@@ -1,32 +0,0 @@
-require 'spec_helper'
-
-if defined? ActiveRecord
-
-  describe 'default per_page' do
-    describe 'AR::Base' do
-      subject { ActiveRecord::Base }
-      it { should_not respond_to :paginates_per }
-    end
-
-    subject { User.page 0 }
-
-    context 'by default' do
-      its(:limit_value) { should == 25 }
-    end
-
-    context 'when explicitly set via paginates_per' do
-      before { User.paginates_per 1326 }
-      its(:limit_value) { should == 1326 }
-      after { User.paginates_per nil }
-    end
-
-    describe "default per_page value's independency per model" do
-      context "when User's default per_page was changed" do
-        before { User.paginates_per 1326 }
-        subject { Book.page 0 }
-        its(:limit_value) { should == 25 }
-        after { User.paginates_per nil }
-      end
-    end
-  end
-end

data/spec/models/active_record/max_per_page_spec.rb

@@ -1,32 +0,0 @@
-require 'spec_helper'
-
-if defined? ActiveRecord
-
-  describe 'max per_page' do
-    describe 'AR::Base' do
-      subject { ActiveRecord::Base }
-      it { should_not respond_to :max_paginates_per }
-    end
-
-    subject { User.page(0).per(100) }
-
-    context 'by default' do
-      its(:limit_value) { should == 100 }
-    end
-
-    context 'when explicitly set via max_paginates_per' do
-      before { User.max_paginates_per 10 }
-      its(:limit_value) { should == 10 }
-      after { User.max_paginates_per nil }
-    end
-
-    describe "max per_page value's independency per model" do
-      context "when User's max per_page was changed" do
-        before { User.max_paginates_per 10 }
-        subject { Book.page(0).per(100) }
-        its(:limit_value) { should == 100 }
-        after { User.max_paginates_per nil }
-      end
-    end
-  end
-end