kaminari 0.15.1 → 0.16.0

data/spec/helpers/helpers_spec.rb

@@ -8,10 +8,19 @@ describe 'Kaminari::Helpers::Paginator' do
       params { {} }
       options { {} }
       url_for {|h| "/foo?page=#{h[:page]}"}
+      link_to { "<a href='#'>link</a>" }
     end
     r
   end
 
+  describe "view helper methods delegated to template" do
+    before do
+      @paginator = Paginator.new(template, :params => {})
+    end
+    subject { @paginator.link_to("link", "#") }
+    it { should == "<a href='#'>link</a>" }
+  end
+
   describe '#params' do
     before do
       @paginator = Paginator.new(template, :params => {:controller => 'foo', :action => 'bar'})

data/spec/helpers/sinatra_helpers_spec.rb

@@ -12,6 +12,17 @@ if defined? Sinatra
   </div>
 EOT
 
+  ERB_TEMPLATE_FOR_PREVIOUS_PAGE = <<EOT
+  <div>
+  <ul>
+  <% @users.each do |user| %>
+    <li class="user_info"><%= user.id %></li>
+  <% end %>
+  </ul>
+  <%= link_to_previous_page(@users, "Previous!", {:id => 'previous_page_link'}.merge(@options || {})) %>
+  </div>
+EOT
+
   ERB_TEMPLATE_FOR_NEXT_PAGE = <<EOT
   <div>
   <ul>
@@ -125,6 +136,48 @@ EOT
       end
     end
 
+    describe '#link_to_previous_page' do
+      before do
+        mock_app do
+          register Kaminari::Helpers::SinatraHelpers
+          get '/users' do
+            @page = params[:page] || 2
+            @users = User.page(@page)
+            erb ERB_TEMPLATE_FOR_PREVIOUS_PAGE
+          end
+
+          get '/users_placeholder' do
+            @page = params[:page] || 2
+            @options = {:placeholder => %{<span id='no_previous_page'>No Previous Page</span>}}
+            @users = User.page(@page)
+            erb ERB_TEMPLATE_FOR_PREVIOUS_PAGE
+          end
+        end
+      end
+
+      context 'having more page' do
+        it 'should have a more page link' do
+          get '/users'
+          last_document.search('a#previous_page_link').should be_present
+          last_document.search('a#previous_page_link').text.should match(/Previous!/)
+        end
+      end
+
+      context 'the first page' do
+        it 'should not have a more page link' do
+          get '/users?page=1'
+          last_document.search('a#previous_page_link').should be_empty
+        end
+
+        it 'should have a no more page notation using placeholder' do
+          get '/users_placeholder?page=1'
+          last_document.search('a#previous_page_link').should be_empty
+          last_document.search('span#no_previous_page').should be_present
+          last_document.search('span#no_previous_page').text.should match(/No Previous Page/)
+        end
+      end
+    end
+
     describe '#link_to_next_page' do
       before do
         mock_app do

data/spec/models/array_spec.rb

@@ -142,9 +142,28 @@ describe Kaminari::PaginatableArray do
   end
 
   context 'when setting total count explicitly' do
-    subject { Kaminari::PaginatableArray.new((1..10).to_a, :total_count => 9999).page(5).per(10) }
-    it { should have(10).items }
-    its(:first) { should == 1 }
-    its(:total_count) { should == 9999 }
+    context "total_count > size of the given array" 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 }
+      its(:total_count) { should == 9999 }
+    end
+
+    context "total_count == size of the given array" 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(:total_count) { should == 15 }
+    end
+
+    context "total_count < size of the given array" 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(:total_count) { should == 15 }
+    end
   end
 end

data/spec/models/mongoid/mongoid_spec.rb

@@ -8,6 +8,60 @@ 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
@@ -44,7 +98,7 @@ if defined? Mongoid
       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} }
@@ -66,6 +120,23 @@ 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

data/spec/spec_helper.rb

@@ -30,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

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: kaminari
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.16.0
+  prerelease: 
 platform: ruby
 authors:
 - Akira Matsuda
@@ -11,146 +12,166 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-15 00:00:00.000000000 Z
+date: 2014-06-08 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: 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: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         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
@@ -162,11 +183,11 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
-- ".document"
-- ".gemtest"
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .document
+- .gemtest
+- .gitignore
+- .rspec
+- .travis.yml
 - CHANGELOG.rdoc
 - Gemfile
 - MIT-LICENSE
@@ -198,12 +219,14 @@ files:
 - gemfiles/active_record_31.gemfile
 - gemfiles/active_record_32.gemfile
 - gemfiles/active_record_40.gemfile
+- gemfiles/active_record_41.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/sinatra_13.gemfile
 - gemfiles/sinatra_14.gemfile
 - kaminari.gemspec
@@ -245,7 +268,10 @@ 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_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
@@ -265,26 +291,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'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: kaminari
-rubygems_version: 2.2.0
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A pagination engine plugin for Rails 3+ and other modern frameworks
 test_files:
 - spec/config/config_spec.rb
@@ -298,7 +325,10 @@ 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_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