kaminari 0.10.4 → 0.11.0

data/spec/helpers/tags_spec.rb

@@ -2,49 +2,6 @@ require File.expand_path('../spec_helper', File.dirname(__FILE__))
 include Kaminari::Helpers
 
 describe 'Kaminari::Helpers' do
-  describe 'template lookup rule' do
-    describe 'Paginator' do
-      subject { Paginator }
-      its(:ancestor_renderables) { should == [Paginator] }
-    end
-    describe 'PrevLink' do
-      subject { PrevLink }
-      its(:ancestor_renderables) { should == [PrevLink, Prev, Link, Page] }
-    end
-    describe 'PrevSpan' do
-      subject { PrevSpan }
-      its(:ancestor_renderables) { should == [PrevSpan, Prev, NonLink] }
-    end
-    describe 'FirstPageLink' do
-      subject { FirstPageLink }
-      its(:ancestor_renderables) { should == [FirstPageLink, PageLink, Link, Page] }
-    end
-    describe 'PageLink' do
-      subject { PageLink }
-      its(:ancestor_renderables) { should == [PageLink, Link, Page] }
-    end
-    describe 'CurrentPage' do
-      subject { CurrentPage }
-      its(:ancestor_renderables) { should == [CurrentPage, NonLink, Page] }
-    end
-    describe 'TruncatedSpan' do
-      subject { TruncatedSpan }
-      its(:ancestor_renderables) { should == [TruncatedSpan, NonLink] }
-    end
-    describe 'LastPageLink' do
-      subject { LastPageLink }
-      its(:ancestor_renderables) { should == [LastPageLink, PageLink, Link, Page] }
-    end
-    describe 'NextLink' do
-      subject { NextLink }
-      its(:ancestor_renderables) { should == [NextLink, Next, Link, Page] }
-    end
-    describe 'NextSpan' do
-      subject { NextSpan }
-      its(:ancestor_renderables) { should == [NextSpan, Next, NonLink] }
-    end
-  end
-
   describe 'Paginator' do
     describe 'Paginator::PageProxy' do
       describe '#current?' do
@@ -80,6 +37,28 @@ describe 'Kaminari::Helpers' do
         end
       end
 
+      describe '#next?' do
+        context 'page == current_page + 1' do
+          subject { Paginator::PageProxy.new({:current_page => 52}, 53, nil) }
+          its(:next?) { should be_true }
+        end
+        context 'page != current_page + 1' do
+          subject { Paginator::PageProxy.new({:current_page => 52}, 77, nil) }
+          its(:next?) { should_not be_true }
+        end
+      end
+
+      describe '#prev?' do
+        context 'page == current_page - 1' do
+          subject { Paginator::PageProxy.new({:current_page => 77}, 76, nil) }
+          its(:prev?) { should be_true }
+        end
+        context 'page != current_page + 1' do
+          subject { Paginator::PageProxy.new({:current_page => 77}, 80, nil) }
+          its(:prev?) { should_not be_true }
+        end
+      end
+
       describe '#left_outer?' do
         context 'current_page == left' do
           subject { Paginator::PageProxy.new({:left => 3}, 3, nil) }
@@ -87,7 +66,7 @@ describe 'Kaminari::Helpers' do
         end
         context 'current_page == left + 1' do
           subject { Paginator::PageProxy.new({:left => 3}, 4, nil) }
-          its(:left_outer?) { should be_true }
+          its(:left_outer?) { should_not be_true }
         end
         context 'current_page == left + 2' do
           subject { Paginator::PageProxy.new({:left => 3}, 5, nil) }
@@ -102,7 +81,7 @@ describe 'Kaminari::Helpers' do
         end
         context 'num_pages - page == right' do
           subject { Paginator::PageProxy.new({:num_pages => 10, :right => 3}, 7, nil) }
-          its(:right_outer?) { should be_true }
+          its(:right_outer?) { should_not be_true }
         end
         context 'num_pages - page < right' do
           subject { Paginator::PageProxy.new({:num_pages => 10, :right => 3}, 8, nil) }
@@ -142,14 +121,17 @@ describe 'Kaminari::Helpers' do
       end
       describe '#was_truncated?' do
         before do
-          stub(@template = Object.new).options { {} }
+          stub(@template = Object.new) do
+            options { {} }
+            params { {} }
+          end
         end
-        context 'last.is_a? TruncatedSpan' do
-          subject { Paginator::PageProxy.new({}, 10, TruncatedSpan.new(@template)) }
+        context 'last.is_a? Gap' do
+          subject { Paginator::PageProxy.new({}, 10, Gap.new(@template)) }
           its(:was_truncated?) { should be_true }
         end
-        context 'last.is not a TruncatedSpan' do
-          subject { Paginator::PageProxy.new({}, 10, PageLink.new(@template)) }
+        context 'last.is not a Gap' do
+          subject { Paginator::PageProxy.new({}, 10, Page.new(@template)) }
           its(:was_truncated?) { should_not be_true }
         end
       end

data/spec/models/active_record_relation_methods_spec.rb

@@ -0,0 +1,18 @@
+require File.expand_path('../spec_helper', File.dirname(__FILE__))
+
+describe Kaminari::ActiveRecordRelationMethods do
+  describe '#total_count' do
+    before do
+      @author = User.create! :name => 'author'
+      @books = 2.times.map { @author.books_authored.create! }
+      @readers = 4.times.map { User.create! :name => 'reader' }
+      @books.each {|book| book.readers << @readers }
+    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
+      end
+    end
+  end
+end

data/spec/models/scopes_spec.rb

@@ -2,7 +2,6 @@ require File.expand_path('../spec_helper', File.dirname(__FILE__))
 
 describe Kaminari::ActiveRecordExtension do
   before :all do
-    User.delete_all
     1.upto(100) {|i| User.create! :name => "user#{'%03d' % i}", :age => (i / 10)}
   end
 
@@ -95,6 +94,18 @@ describe Kaminari::ActiveRecordExtension do
     end
   end
 
+  describe '#count' do
+    context 'page 1' do
+      subject { User.page }
+      its(:count) { should == 25 }
+    end
+
+    context 'page 2' do
+      subject { User.page 2 }
+      its(:count) { should == 25 }
+    end
+  end
+
   context 'chained with .group' do
     subject { User.group('age').page(2).per 5 }
     # 0..10

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rails'
 require 'mongoid'
 require 'kaminari'
+require 'database_cleaner'
 # Ensure we use 'syck' instead of 'psych' in 1.9.2
 # RubyGems >= 1.5.0 uses 'psych' on 1.9.2, but
 # Psych does not yet support YAML 1.1 merge keys.

data/spec/support/database_cleaner.rb

@@ -0,0 +1,13 @@
+DatabaseCleaner.strategy = :transaction
+
+RSpec.configure do |config|
+  config.before :suite do
+    DatabaseCleaner.clean_with :truncation
+  end
+  config.before :each do
+    DatabaseCleaner.start
+  end
+  config.after :each do
+    DatabaseCleaner.clean
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kaminari
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 51
   prerelease: 
   segments: 
   - 0
-  - 10
-  - 4
-  version: 0.10.4
+  - 11
+  - 0
+  version: 0.11.0
 platform: ruby
 authors: 
 - Akira Matsuda
@@ -15,109 +15,113 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-24 00:00:00 +09:00
-default_executable: 
+date: 2011-04-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 3
         segments: 
-        - 2
-        - 5
         - 0
-        version: 2.5.0
+        version: "0"
+  version_requirements: *id001
+  name: kaminari
   prerelease: false
-  type: :development
-  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: rr
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 7
         segments: 
-        - 1
+        - 3
         - 0
-        - 2
-        version: 1.0.2
+        - 0
+        version: 3.0.0
+  version_requirements: *id002
+  name: rails
   prerelease: false
-  type: :development
-  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: steak
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 23
         segments: 
         - 1
-        - 1
         - 0
-        version: 1.1.0
+        - 0
+        version: 1.0.0
+  version_requirements: *id003
+  name: bundler
   prerelease: false
-  type: :development
-  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: capybara
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 105
+        hash: 3
         segments: 
         - 0
-        - 4
-        - 1
-        - 1
-        version: 0.4.1.1
+        version: "0"
+  version_requirements: *id004
+  name: sqlite3
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: *id004
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        version: "2"
+  version_requirements: *id005
+  name: mongoid
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: bundler
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 3
         segments: 
-        - 1
         - 0
-        - 0
-        version: 1.0.0
+        version: "0"
+  version_requirements: *id006
+  name: rspec
   prerelease: false
-  type: :development
-  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: jeweler
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
-        - 1
-        - 5
-        - 2
-        version: 1.5.2
+        - 0
+        version: "0"
+  version_requirements: *id007
+  name: rspec-rails
   prerelease: false
-  type: :development
-  requirement: *id006
 - !ruby/object:Gem::Dependency 
-  name: rcov
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -126,12 +130,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  version_requirements: *id008
+  name: rr
   prerelease: false
-  type: :development
-  requirement: *id007
 - !ruby/object:Gem::Dependency 
-  name: rails
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -140,12 +144,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  version_requirements: *id009
+  name: steak
   prerelease: false
-  type: :development
-  requirement: *id008
 - !ruby/object:Gem::Dependency 
-  name: rack
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -154,12 +158,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  version_requirements: *id010
+  name: capybara
   prerelease: false
-  type: :development
-  requirement: *id009
 - !ruby/object:Gem::Dependency 
-  name: arel
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -168,90 +172,209 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  version_requirements: *id011
+  name: database_cleaner
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: *id010
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id012
+  name: rcov
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: rspec-rails
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 3
         segments: 
-        - 2
-        - 5
         - 0
-        version: 2.5.0
+        version: "0"
+  version_requirements: *id013
+  name: jeweler
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: *id011
+  requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
+  version_requirements: *id014
+  name: rails
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: sqlite3
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 23
         segments: 
         - 1
-        - 3
-        - 3
-        version: 1.3.3
+        - 0
+        - 0
+        version: 1.0.0
+  version_requirements: *id015
+  name: bundler
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: *id012
+  requirement: &id016 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id016
+  name: sqlite3
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: mongoid
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15424091
+        hash: 7
         segments: 
         - 2
+        version: "2"
+  version_requirements: *id017
+  name: mongoid
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id018 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id018
+  name: rspec
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id019 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
         - 0
+        version: "0"
+  version_requirements: *id019
+  name: rspec-rails
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id020 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
         - 0
-        - rc
-        - 7
-        version: 2.0.0.rc.7
+        version: "0"
+  version_requirements: *id020
+  name: rr
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: *id013
+  requirement: &id021 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id021
+  name: steak
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: bson_ext
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 3
         segments: 
-        - 1
-        - 2
-        version: "1.2"
+        - 0
+        version: "0"
+  version_requirements: *id022
+  name: capybara
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: *id014
+  requirement: &id023 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id023
+  name: database_cleaner
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: rails
-  version_requirements: &id015 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id024 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
-        - 3
         - 0
+        version: "0"
+  version_requirements: *id024
+  name: rcov
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id025 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
         - 0
-        version: 3.0.0
+        version: "0"
+  version_requirements: *id025
+  name: jeweler
   prerelease: false
-  type: :runtime
-  requirement: *id015
 description: Kaminari is a Scope & Engine based, clean, powerful, customizable and sophisticated paginator for Rails 3
 email: ronnie@dio.jp
 executables: []
@@ -272,33 +395,27 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- app/views/kaminari/_current_page.html.erb
-- app/views/kaminari/_current_page.html.haml
-- app/views/kaminari/_first_page_link.html.erb
-- app/views/kaminari/_first_page_link.html.haml
-- app/views/kaminari/_last_page_link.html.erb
-- app/views/kaminari/_last_page_link.html.haml
-- app/views/kaminari/_next_link.html.erb
-- app/views/kaminari/_next_link.html.haml
-- app/views/kaminari/_next_span.html.erb
-- app/views/kaminari/_next_span.html.haml
-- app/views/kaminari/_page_link.html.erb
-- app/views/kaminari/_page_link.html.haml
+- app/views/kaminari/_first_page.html.erb
+- app/views/kaminari/_first_page.html.haml
+- app/views/kaminari/_gap.html.erb
+- app/views/kaminari/_gap.html.haml
+- app/views/kaminari/_last_page.html.erb
+- app/views/kaminari/_last_page.html.haml
+- app/views/kaminari/_next_page.html.erb
+- app/views/kaminari/_next_page.html.haml
+- app/views/kaminari/_page.html.erb
+- app/views/kaminari/_page.html.haml
 - app/views/kaminari/_paginator.html.erb
 - app/views/kaminari/_paginator.html.haml
-- app/views/kaminari/_prev_link.html.erb
-- app/views/kaminari/_prev_link.html.haml
-- app/views/kaminari/_prev_span.html.erb
-- app/views/kaminari/_prev_span.html.haml
-- app/views/kaminari/_truncated_span.html.erb
-- app/views/kaminari/_truncated_span.html.haml
+- app/views/kaminari/_prev_page.html.erb
+- app/views/kaminari/_prev_page.html.haml
 - config/locales/kaminari.yml
 - kaminari.gemspec
 - lib/generators/kaminari/views_generator.rb
 - lib/kaminari.rb
 - lib/kaminari/engine.rb
 - lib/kaminari/helpers/action_view_extension.rb
-- lib/kaminari/helpers/helpers.rb
+- lib/kaminari/helpers/paginator.rb
 - lib/kaminari/helpers/tags.rb
 - lib/kaminari/models/active_record_extension.rb
 - lib/kaminari/models/active_record_relation_methods.rb
@@ -307,6 +424,7 @@ files:
 - lib/kaminari/models/mongoid_extension.rb
 - lib/kaminari/models/page_scope_methods.rb
 - lib/kaminari/railtie.rb
+- lib/kaminari/version.rb
 - spec/acceptance/acceptance_helper.rb
 - spec/acceptance/support/helpers.rb
 - spec/acceptance/support/paths.rb
@@ -314,12 +432,13 @@ files:
 - spec/fake_app.rb
 - spec/helpers/helpers_spec.rb
 - spec/helpers/tags_spec.rb
+- spec/models/active_record_relation_methods_spec.rb
 - spec/models/default_per_page_spec.rb
 - spec/models/mongoid_spec.rb
 - spec/models/scopes_spec.rb
 - spec/spec_helper.rb
+- spec/support/database_cleaner.rb
 - spec/support/matchers.rb
-has_rdoc: true
 homepage: http://github.com/amatsuda/kaminari
 licenses: 
 - MIT
@@ -349,7 +468,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: A pagination engine plugin for Rails 3
@@ -361,8 +480,10 @@ test_files:
 - spec/fake_app.rb
 - spec/helpers/helpers_spec.rb
 - spec/helpers/tags_spec.rb
+- spec/models/active_record_relation_methods_spec.rb
 - spec/models/default_per_page_spec.rb
 - spec/models/mongoid_spec.rb
 - spec/models/scopes_spec.rb
 - spec/spec_helper.rb
+- spec/support/database_cleaner.rb
 - spec/support/matchers.rb