kaminari 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b6445e79b7d22acadc130f9d6d1dd502b6a669d
-  data.tar.gz: 0d095f1cd3c31d7eab8acc0a832c7c1916267d99
+  metadata.gz: 60097f892941d91ad613d645b3bd289a9680661f
+  data.tar.gz: 5126f2a954a41a37418f9d61fa35f653273b5bb7
 SHA512:
-  metadata.gz: 69c51c0b94c98fa207bf505b96139c3b5baf79345dc49308c4a2dba12a310380d7e994507fef6919ec3e521b5ecaa6586c44abf3084a6c0bf88ce29847c5c2f2
-  data.tar.gz: cdd68849dea19237aca6fdc95c6b225592a9c6c00d3a837b41be8c947a95606854fb5790d4f26c70d09795df483783c654cb271f65f9d0a5452ff708bc58ed01
+  metadata.gz: 4f56bf9bb35c7c7e17c8665acdb25c1bac2f91815b8ed771ec7eab8c90afc11aabeaca322269a934aa9dfac1196e92401da099e5282801d0544658c078f8ce37
+  data.tar.gz: 38a6c284647b832ef51cc2951925de53fb137bcde55810b33edbe5759a7fb4911ade9f2795dce1bf5255305b8cccc9afba7195c61273abf756a8228ab3f131de

data/.travis.yml

@@ -3,9 +3,12 @@ services: mongodb
 script: "bundle exec rake spec"
 
 rvm:
+  - 1.8.7
   - 1.9.3
   - 2.0.0
-  - rbx-19mode
+  - 2.1.0
+  - jruby
+  - rbx
 
 gemfile:
   - gemfiles/active_record_30.gemfile
@@ -22,14 +25,16 @@ gemfile:
   - gemfiles/sinatra_14.gemfile
 
 matrix:
-  allow_failures:
-    - rvm: 1.9.3
-      gemfile: gemfiles/active_record_edge.gemfile
-    - rvm: 2.0.0
+  exclude:
+    - rvm: 1.8.7
+      gemfile: gemfiles/active_record_40.gemfile
+    - rvm: 1.8.7
       gemfile: gemfiles/active_record_edge.gemfile
-    - rvm: rbx-19mode
+    - rvm: 1.8.7
+      gemfile: gemfiles/mongoid_30.gemfile
+    - rvm: 1.8.7
+      gemfile: gemfiles/mongoid_31.gemfile
+  allow_failures:
+    - rvm: jruby
       gemfile: gemfiles/active_record_edge.gemfile
-    - rvm: rbx-19mode
-      gemfile: gemfiles/sinatra_13.gemfile
-    - rvm: rbx-19mode
-      gemfile: gemfiles/sinatra_14.gemfile
+  fast_finish: true

data/{CHANGELOG → CHANGELOG.rdoc}

@@ -1,3 +1,12 @@
+== 0.15.1
+
+* page_method_name option was not working in 0.15.0 #481 [mauriciopasquier]
+
+* Use the mongoid criteria #length method to cache the count of the collection
+per criteria #484 [camallen]
+
+* Don't inherit host, port, and protocol from the given params
+
 == 0.15.0
 
 * Allow count, total count to pass parameters to super #193 [bsimpson]

data/README.rdoc

@@ -273,6 +273,12 @@ or edit gemfile:
 
     gem 'kaminari', :require => 'kaminari/sinatra'
 
+This line just enables model-side features, such as <tt>Model#page</tt> and <tt>Model#per</tt>. If you want to use view helpers, please explicitly <tt>register</tt> helpers in your Sinatra or Padrino app:
+
+    register Kaminari::Helpers::SinatraHelpers
+
+Or, you can implement your own awesome helper :)
+
 More features are coming, and again, this is still experimental. Please let us know if you found anything wrong with the Sinatra support.
 
 

data/Rakefile

@@ -30,13 +30,17 @@ namespace :spec do
   end
 end
 
-require 'rdoc/task'
+begin
+  require 'rdoc/task'
 
-Rake::RDocTask.new do |rdoc|
-  require 'kaminari/version'
+  Rake::RDocTask.new do |rdoc|
+    require 'kaminari/version'
 
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "kaminari #{Kaminari::VERSION}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+    rdoc.rdoc_dir = 'rdoc'
+    rdoc.title = "kaminari #{Kaminari::VERSION}"
+    rdoc.rdoc_files.include('README*')
+    rdoc.rdoc_files.include('lib/**/*.rb')
+  end
+rescue LoadError
+  puts 'RDocTask is not supported on this VM and platform combination.'
 end

data/gemfiles/active_record_30.gemfile

@@ -6,4 +6,21 @@ gem 'rspec-rails', '>= 2.0'
 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'
+
+platforms :ruby, :rbx do
+  gem 'sqlite3'
+end
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'
+end
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'racc'
+  gem 'rubysl-test-unit'
+  gem 'rubinius-developer_tools'
+end
+
 gemspec :path => '../'

data/gemfiles/active_record_31.gemfile

@@ -4,4 +4,23 @@ gem 'railties', '~> 3.1.12'
 gem 'activerecord', '~> 3.1.12', :require => 'active_record'
 gem 'rspec-rails', '>= 2.0'
 
+# 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'
+
+platforms :ruby, :rbx do
+  gem 'sqlite3'
+end
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'
+end
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'racc'
+  gem 'rubysl-test-unit'
+  gem 'rubinius-developer_tools'
+end
+
 gemspec :path => '../'

data/gemfiles/active_record_32.gemfile

@@ -3,8 +3,24 @@ source 'https://rubygems.org'
 gem 'railties', '~> 3.2.3'
 gem 'activerecord', '~> 3.2.3', :require => 'active_record'
 gem 'rspec-rails', '>= 2.0'
-gem 'nokogiri'
-gem 'xpath'
-gem 'mime-types'
+
+# 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'
+
+platforms :ruby, :rbx do
+  gem 'sqlite3'
+end
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'
+end
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'racc'
+  gem 'rubysl-test-unit'
+  gem 'rubinius-developer_tools'
+end
 
 gemspec :path => '../'

data/gemfiles/active_record_40.gemfile

@@ -4,4 +4,17 @@ gem 'railties', '>= 4.0.0'
 gem 'activerecord', '>= 4.0.0', :require => 'active_record'
 gem 'rspec-rails', '>= 2.0'
 
+platforms :ruby, :rbx do
+  gem 'sqlite3'
+end
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'
+end
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'racc'
+  gem 'rubysl-test-unit'
+  gem 'rubinius-developer_tools'
+end
+
 gemspec :path => '../'

data/gemfiles/active_record_edge.gemfile

@@ -6,6 +6,21 @@ git 'git://github.com/rails/rails.git' do
   gem 'actionview', :require => 'action_view'
 end
 
-gem 'rspec-rails', '>= 2.0'
+gem 'arel', :github => 'rails/arel'
+
+platforms :ruby, :rbx do
+  gem 'sqlite3'
+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
+
+gem 'rspec-rails', '2.99.0.beta1'
 
 gemspec :path => '../'

data/gemfiles/data_mapper_12.gemfile

@@ -8,8 +8,24 @@ gem 'dm-transactions', '~> 1.2.0'
 gem 'dm-active_model', '~> 1.2.1'
 gem 'dm-sqlite-adapter', '~> 1.2.0'
 gem 'rspec-rails', '>= 2.0'
-gem 'nokogiri'
-gem 'xpath'
-gem 'mime-types'
+
+# 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'
+
+platforms :ruby, :rbx do
+  gem 'sqlite3'
+end
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '~> 1.2.0'
+end
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'racc'
+  gem 'rubysl-test-unit'
+  gem 'rubinius-developer_tools'
+end
 
 gemspec :path => '../'

data/gemfiles/mongo_mapper.gemfile

@@ -3,8 +3,18 @@ source 'https://rubygems.org'
 gem 'railties', '>= 3.2.3'
 gem 'mongo_mapper', '>= 0.11.0'
 gem 'rspec-rails', '>= 2.0'
-gem 'nokogiri'
-gem 'xpath'
-gem 'mime-types'
+
+# 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'
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'racc'
+  gem 'rubysl-test-unit'
+  gem 'rubinius-developer_tools'
+end
 
 gemspec :path => '../'

data/gemfiles/mongoid_24.gemfile

@@ -4,4 +4,18 @@ gem 'railties', '>= 3.2.3'
 gem 'mongoid', '~> 2.4.0'
 gem 'rspec-rails', '>= 2.0'
 
+# 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'
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'racc'
+  gem 'rubysl-test-unit'
+  gem 'rubinius-developer_tools'
+end
+
 gemspec :path => '../'

data/gemfiles/mongoid_30.gemfile

@@ -5,8 +5,12 @@ gem 'mongoid', '~> 3.0.0'
 gem 'rspec-rails', '>= 2.0'
 gem 'origin'
 gem 'moped'
-gem 'nokogiri'
-gem 'xpath'
-gem 'mime-types'
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'racc'
+  gem 'rubysl-test-unit'
+  gem 'rubinius-developer_tools'
+end
 
 gemspec :path => '../'

data/gemfiles/mongoid_31.gemfile

@@ -5,8 +5,12 @@ gem 'mongoid', '~> 3.1.0'
 gem 'rspec-rails', '>= 2.0'
 gem 'origin'
 gem 'moped'
-gem 'nokogiri'
-gem 'xpath'
-gem 'mime-types'
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'racc'
+  gem 'rubysl-test-unit'
+  gem 'rubinius-developer_tools'
+end
 
 gemspec :path => '../'

data/gemfiles/sinatra_13.gemfile

@@ -8,8 +8,24 @@ gem 'tilt', '~> 1.3.0'
 gem 'padrino-helpers', '~> 0.10.6'
 gem 'rack-test', '>= 0'
 gem 'sinatra-contrib', '~> 1.3.0'
-gem 'nokogiri'
-gem 'xpath'
-gem 'mime-types'
+
+# 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'
+
+platforms :ruby, :rbx do
+  gem 'sqlite3'
+end
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'
+end
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'racc'
+  gem 'rubysl-test-unit'
+  gem 'rubinius-developer_tools'
+end
 
 gemspec :path => '../'

data/gemfiles/sinatra_14.gemfile

@@ -8,8 +8,24 @@ gem 'tilt', '~> 1.3.0'
 gem 'padrino-helpers', '~> 0.11.3'
 gem 'rack-test', '>= 0'
 gem 'sinatra-contrib', '~> 1.4.0'
-gem 'nokogiri'
-gem 'xpath'
-gem 'mime-types'
+
+# 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'
+
+platforms :ruby, :rbx do
+  gem 'sqlite3'
+end
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'
+end
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'racc'
+  gem 'rubysl-test-unit'
+  gem 'rubinius-developer_tools'
+end
 
 gemspec :path => '../'

data/kaminari.gemspec

@@ -6,10 +6,10 @@ Gem::Specification.new do |s|
   s.name        = 'kaminari'
   s.version     = Kaminari::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ['Akira Matsuda', 'Zachary Scott', 'Yuki Nishijima', 'Hiroshi Shibata']
+  s.authors     = ['Akira Matsuda', 'Yuki Nishijima', 'Zachary Scott', 'Hiroshi Shibata']
   s.email       = ['ronnie@dio.jp']
   s.homepage    = 'https://github.com/amatsuda/kaminari'
-  s.summary     = 'A pagination engine plugin for Rails 3+ or other modern frameworks'
+  s.summary     = 'A pagination engine plugin for Rails 3+ and other modern frameworks'
   s.description = 'Kaminari is a Scope & Engine based, clean, powerful, agnostic, customizable and sophisticated paginator for Rails 3+'
 
   s.rubyforge_project = 'kaminari'
@@ -26,7 +26,6 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'bundler', ['>= 1.0.0']
   s.add_development_dependency 'rake', ['>= 0']
-  s.add_development_dependency 'sqlite3', ['>= 0']
   s.add_development_dependency 'tzinfo', ['>= 0']
   s.add_development_dependency 'rspec', ['>= 0']
   s.add_development_dependency 'rr', ['>= 0']

data/lib/kaminari/helpers/action_view_extension.rb

@@ -15,7 +15,7 @@ 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, :param_name => Kaminari.config.param_name, :remote => false)
+      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)
       paginator.to_s
     end
 
@@ -134,14 +134,14 @@ module Kaminari
 
       if !scope.first_page? && !scope.last_page?
         # If not first and not last, then output both links.
-        output << '<link rel="next" href="' + url_for(params.merge(param_name => (scope.current_page + 1))) + '"/>'
-        output << '<link rel="prev" href="' + url_for(params.merge(param_name => (scope.current_page - 1))) + '"/>'
+        output << '<link rel="next" href="' + url_for(params.merge(param_name => (scope.current_page + 1), :only_path => true)) + '"/>'
+        output << '<link rel="prev" href="' + url_for(params.merge(param_name => (scope.current_page - 1), :only_path => true)) + '"/>'
       elsif scope.first_page?
         # If first page, add next link unless last page.
-        output << '<link rel="next" href="' + url_for(params.merge(param_name => (scope.current_page + 1))) + '"/>' unless scope.last_page?
+        output << '<link rel="next" href="' + url_for(params.merge(param_name => (scope.current_page + 1), :only_path => true)) + '"/>' unless scope.last_page?
       else
         # If last page, add prev link unless first page.
-        output << '<link rel="prev" href="' + url_for(params.merge(param_name => (scope.current_page - 1))) + '"/>' unless scope.first_page?
+        output << '<link rel="prev" href="' + url_for(params.merge(param_name => (scope.current_page - 1), :only_path => true)) + '"/>' unless scope.first_page?
       end
 
       output.html_safe

data/lib/kaminari/helpers/paginator.rb

@@ -12,6 +12,10 @@ module Kaminari
       include ::ActionView::Context
 
       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|
           h[:window] = options.delete(:window) || options.delete(:inner_window) || Kaminari.config.window
           outer_window = options.delete(:outer_window) || Kaminari.config.outer_window
@@ -22,10 +26,9 @@ module Kaminari
         end
         @template, @options = template, options
         @theme = @options[:theme] ? "#{@options[:theme]}/" : ''
-        @options[:current_page] = PageProxy.new @window_options.merge(@options), @options[:current_page], nil
-        #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.merge! @options
+        @window_options[:current_page] = @options[:current_page] = PageProxy.new(@window_options, @options[:current_page], nil)
+
         @last = nil
         # initialize the output_buffer for Context
         @output_buffer = ActionView::OutputBuffer.new
@@ -46,8 +49,8 @@ module Kaminari
       def each_relevant_page
         return to_enum(:each_relevant_page) unless block_given?
 
-        relevant_pages(@window_options.merge(@options)).each do |i|
-          yield PageProxy.new(@window_options.merge(@options), i, @last)
+        relevant_pages(@window_options).each do |i|
+          yield PageProxy.new(@window_options, i, @last)
         end
       end
       alias each_page each_relevant_page
@@ -94,12 +97,12 @@ module Kaminari
           end
 
           subscriber.render_without_logging = true
-          ret = super @window_options.merge(@options).merge :paginator => self
+          ret = super @window_options.merge :paginator => self
           subscriber.render_without_logging = false
 
           ret
         else
-          super @window_options.merge(@options).merge :paginator => self
+          super @window_options.merge :paginator => self
         end
       end
 

data/lib/kaminari/helpers/tags.rb

@@ -15,7 +15,7 @@ module Kaminari
     class Tag
       def initialize(template, options = {}) #:nodoc:
         @template, @options = template, options.dup
-        @param_name = @options.delete(:param_name)
+        @param_name = @options.delete(:param_name) || Kaminari.config.param_name
         @theme = @options[:theme] ? "#{@options.delete(:theme)}/" : ''
         @params = @options[:params] ? template.params.merge(@options.delete :params) : template.params
       end
@@ -25,7 +25,7 @@ module Kaminari
       end
 
       def page_url_for(page)
-        @template.url_for @params.merge(@param_name => (page <= 1 ? nil : page))
+        @template.url_for @params.merge(@param_name => (page <= 1 ? nil : page), :only_path => true)
       end
     end
 

data/lib/kaminari/models/active_record_model_extension.rb

@@ -6,17 +6,17 @@ module Kaminari
 
     included do
       self.send(:include, Kaminari::ConfigurationMethods)
-    end
 
-    module ClassMethods
       # Fetch the values at the specified page number
       #   Model.page(5)
-      define_method(Kaminari.config.page_method_name) do |num = nil|
-        limit(default_per_page).offset(default_per_page * ([num.to_i, 1].max - 1)).extending do
-          include Kaminari::ActiveRecordRelationMethods
-          include Kaminari::PageScopeMethods
+      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
+            include Kaminari::ActiveRecordRelationMethods
+            include Kaminari::PageScopeMethods
+          end
         end
-      end
+      RUBY
     end
   end
 end

data/lib/kaminari/models/mongoid_criteria_methods.rb

@@ -9,7 +9,7 @@ module Kaminari
     end
 
     def total_count #:nodoc:
-      embedded? ? unpage.count : count
+      embedded? ? unpage.length : length
     end
 
     private

data/lib/kaminari/version.rb

@@ -1,3 +1,3 @@
 module Kaminari
-  VERSION = '0.15.0'
+  VERSION = '0.15.1'
 end

data/spec/helpers/action_view_extension_spec.rb

@@ -6,6 +6,7 @@ describe 'Kaminari::ActionViewExtension' do
       50.times {|i| User.create! :name => "user#{i}"}
       @users = User.page(1)
     end
+
     subject { helper.paginate @users, :params => {:controller => 'users', :action => 'index'} }
     it { should be_a String }
 
@@ -20,24 +21,29 @@ describe 'Kaminari::ActionViewExtension' do
     before do
       50.times {|i| User.create! :name => "user#{i}"}
     end
+
     context 'having previous pages' do
       before do
         @users = User.page(50)
       end
+
       context 'the default behaviour' do
         subject { helper.link_to_previous_page @users, 'Previous', :params => {:controller => 'users', :action => 'index'} }
         it { should be_a String }
         it { should match(/rel="previous"/) }
       end
+
       context 'overriding rel=' do
         subject { helper.link_to_previous_page @users, 'Previous', :rel => 'external', :params => {:controller => 'users', :action => 'index'} }
         it { should match(/rel="external"/) }
       end
     end
+
     context 'the first page' do
       before do
         @users = User.page(1)
       end
+
       subject { helper.link_to_previous_page @users, 'Previous', :params => {:controller => 'users', :action => 'index'} }
       it { should_not be }
     end
@@ -47,24 +53,29 @@ describe 'Kaminari::ActionViewExtension' do
     before do
       50.times {|i| User.create! :name => "user#{i}"}
     end
+
     context 'having more page' do
       before do
         @users = User.page(1)
       end
+
       context 'the default behaviour' do
         subject { helper.link_to_next_page @users, 'More', :params => {:controller => 'users', :action => 'index'} }
         it { should be_a String }
         it { should match(/rel="next"/) }
       end
+
       context 'overriding rel=' do
         subject { helper.link_to_next_page @users, 'More', :rel => 'external', :params => {:controller => 'users', :action => 'index'} }
         it { should match(/rel="external"/) }
       end
     end
+
     context 'the last page' do
       before do
         @users = User.page(2)
       end
+
       subject { helper.link_to_next_page @users, 'More', :params => {:controller => 'users', :action => 'index'} }
       it { should_not be }
     end
@@ -75,6 +86,7 @@ describe 'Kaminari::ActionViewExtension' do
       before do
         @users = User.page(1).per(25)
       end
+
       context 'having no entries' do
         subject { helper.page_entries_info @users, :params => {:controller => 'users', :action => 'index'} }
         it      { should == 'No users found' }
@@ -90,6 +102,7 @@ describe 'Kaminari::ActionViewExtension' do
           User.create! :name => 'user1'
           @users = User.page(1).per(25)
         end
+
         subject { helper.page_entries_info @users, :params => {:controller => 'users', :action => 'index'} }
         it      { should == 'Displaying <b>1</b> user' }
 
@@ -104,6 +117,7 @@ describe 'Kaminari::ActionViewExtension' do
           10.times {|i| User.create! :name => "user#{i}"}
           @users = User.page(1).per(25)
         end
+
         subject { helper.page_entries_info @users, :params => {:controller => 'users', :action => 'index'} }
         it      { should == 'Displaying <b>all 10</b> users' }
 
@@ -122,6 +136,7 @@ describe 'Kaminari::ActionViewExtension' do
           before do
             @users = User.page(1).per(25)
           end
+
           subject { helper.page_entries_info @users, :params => {:controller => 'users', :action => 'index'} }
           it      { should == 'Displaying users <b>1&nbsp;-&nbsp;25</b> of <b>50</b> in total' }
 
@@ -135,6 +150,7 @@ describe 'Kaminari::ActionViewExtension' do
           before do
             @users = User.page(2).per(25)
           end
+
           subject { helper.page_entries_info @users, :params => {:controller => 'users', :action => 'index'} }
           it      { should == 'Displaying users <b>26&nbsp;-&nbsp;50</b> of <b>50</b> in total' }
 
@@ -149,6 +165,7 @@ describe 'Kaminari::ActionViewExtension' do
       before do
         @addresses = User::Address.page(1).per(25)
       end
+
       context 'having no entries' do
         subject { helper.page_entries_info @addresses, :params => {:controller => 'addresses', :action => 'index'} }
         it      { should == 'No addresses found' }
@@ -159,6 +176,7 @@ describe 'Kaminari::ActionViewExtension' do
           User::Address.create!
           @addresses = User::Address.page(1).per(25)
         end
+
         subject { helper.page_entries_info @addresses, :params => {:controller => 'addresses', :action => 'index'} }
         it      { should == 'Displaying <b>1</b> address' }
 
@@ -173,6 +191,7 @@ describe 'Kaminari::ActionViewExtension' do
           10.times {|i| User::Address.create!}
           @addresses = User::Address.page(1).per(25)
         end
+
         subject { helper.page_entries_info @addresses, :params => {:controller => 'addresses', :action => 'index'} }
         it      { should == 'Displaying <b>all 10</b> addresses' }
 
@@ -191,6 +210,7 @@ describe 'Kaminari::ActionViewExtension' do
           before do
             @addresses = User::Address.page(1).per(25)
           end
+
           subject { helper.page_entries_info @addresses, :params => {:controller => 'addresses', :action => 'index'} }
           it      { should == 'Displaying addresses <b>1&nbsp;-&nbsp;25</b> of <b>50</b> in total' }
 
@@ -204,6 +224,7 @@ describe 'Kaminari::ActionViewExtension' do
           before do
             @addresses = User::Address.page(2).per(25)
           end
+
           subject { helper.page_entries_info @addresses, :params => {:controller => 'addresses', :action => 'index'} }
           it      { should == 'Displaying addresses <b>26&nbsp;-&nbsp;50</b> of <b>50</b> in total' }
 
@@ -219,6 +240,7 @@ describe 'Kaminari::ActionViewExtension' do
       before do
         @numbers = Kaminari.paginate_array(%w{one two three}).page(1)
       end
+
       subject { helper.page_entries_info @numbers }
       it      { should == 'Displaying <b>all 3</b> entries' }
     end
@@ -228,6 +250,7 @@ describe 'Kaminari::ActionViewExtension' do
     before do
       75.times {|i| User.create! :name => "user#{i}"}
     end
+
     context 'the first page' do
       before do
         @users = User.page(1).per(25)
@@ -238,6 +261,7 @@ describe 'Kaminari::ActionViewExtension' do
       it { should match(/rel="next"/) }
       it { should_not match(/rel="prev"/) }
     end
+
     context 'the middle page' do
       before do
         @users = User.page(2).per(25)
@@ -248,6 +272,7 @@ describe 'Kaminari::ActionViewExtension' do
       it { should match(/rel="next"/) }
       it { should match(/rel="prev"/) }
     end
+
     context 'the last page' do
       before do
         @users = User.page(3).per(25)

data/spec/models/active_record/scopes_spec.rb

@@ -2,6 +2,25 @@ require 'spec_helper'
 
 if defined? ActiveRecord
 
+  describe Kaminari::ActiveRecordModelExtension do
+    before do
+      Kaminari.configure do |config|
+        config.page_method_name = :per_page_kaminari
+      end
+      class Comment < ActiveRecord::Base; end
+    end
+
+    subject { Comment }
+    it { should respond_to(:per_page_kaminari) }
+    it { should_not respond_to(:page) }
+
+    after do
+      Kaminari.configure do |config|
+        config.page_method_name = :page
+      end
+    end
+  end
+
   shared_examples_for 'the first page' do
     it { should have(25).users }
     its('first.name') { should == 'user001' }

data/spec/models/data_mapper/data_mapper_spec.rb

@@ -4,20 +4,14 @@ if defined? DataMapper
   # tests for issue #203
   describe Kaminari::DataMapperCollectionMethods do
     before do
-      100.times do |i|
+      30.times do |i|
         User.create(:name => "User#{i}", :age => i)
       end
-
-      worker0 = User[0]
-      50.times do |i|
-        worker0.projects << Project.create(:name => "Project#{i}")
-      end
-      worker0.projects.save
     end
 
     describe 'Model' do
       subject { User }
-      it { User.all.count.should == 100 }
+      it { User.all.count.should == 30 }
       it { User.page(1).length.should == 25 }
       it {
         User.paginates_per(5)
@@ -31,15 +25,9 @@ if defined? DataMapper
 
   describe Kaminari::DataMapperExtension do
     before do
-      100.times do |i|
+      90.times do |i|
         User.create(:name => "User#{i}", :age => i)
       end
-
-      worker0 = User[0]
-      50.times do |i|
-        worker0.projects << Project.create(:name => "Project#{i}")
-      end
-      worker0.projects.save
     end
 
     describe 'Collection' do
@@ -76,7 +64,7 @@ if defined? DataMapper
         its(:next_page) { should == 2 }
         its('query.limit') { should == 25 }
         its('query.offset') { should == 0 }
-        its(:total_count) { should == 100 }
+        its(:total_count) { should == 90 }
         its(:total_pages) { should == 4 }
       end
 
@@ -89,7 +77,7 @@ if defined? DataMapper
         its(:limit_value) { should == 25 }
         its('query.limit') { should == 25 }
         its('query.offset') { should == 25 }
-        its(:total_count) { should == 100 }
+        its(:total_count) { should == 90 }
         its(:total_pages) { should == 4 }
       end
 
@@ -101,7 +89,7 @@ if defined? DataMapper
         its(:next_page) { should == 2 }
         its('query.limit') { should == 25 }
         its('query.offset') { should == 0 }
-        its(:total_count) { should == 100 }
+        its(:total_count) { should == 90 }
         its(:total_pages) { should == 4 }
       end
 
@@ -140,7 +128,7 @@ if defined? DataMapper
         its('query.limit') { should == 20 }
         its(:limit_value) { should == 20 }
         its('query.offset') { should == 20 }
-        its(:total_count) { should == 100 }
+        its(:total_count) { should == 90 }
         its(:total_pages) { should == 5 }
       end
 
@@ -181,26 +169,36 @@ if defined? DataMapper
         its(:total_pages) { should == 3 }
       end
 
-      context 'on query on association' do
-        subject { User[0].projects.page(3).all(:name.like => 'Project%').per(5) }
-        its(:current_page) { should == 3 }
-        its(:prev_page) { should == 2 }
-        its(:next_page) { should == 4 }
-        its('query.limit') { should == 5 }
-        its('query.offset') { should == 10 }
-        its(:total_count) { should == 50 }
-        its(:total_pages) { should == 10 }
-      end
-
-      context 'on query with association conditions' do
-        subject { User.page(3).all(:projects => Project.all).per(5) }
-        its(:current_page) { should == 3 }
-        its(:prev_page) { should == 2 }
-        its(:next_page) { should == 4 }
-        its('query.limit') { should == 5 }
-        its('query.offset') { should == 10 }
-        its(:total_count) { should == 50 }
-        its(:total_pages) { should == 10 }
+      context 'for association' do
+        before do
+          worker0 = User[0]
+          30.times do |i|
+            worker0.projects << Project.create(:name => "Project#{i}")
+          end
+          worker0.projects.save
+        end
+
+        context 'on query' do
+          subject { User[0].projects.page(3).all(:name.like => 'Project%').per(5) }
+          its(:current_page) { should == 3 }
+          its(:prev_page) { should == 2 }
+          its(:next_page) { should == 4 }
+          its('query.limit') { should == 5 }
+          its('query.offset') { should == 10 }
+          its(:total_count) { should == 30 }
+          its(:total_pages) { should == 6 }
+        end
+
+        context 'after association conditions' do
+          subject { User.page(3).all(:projects => Project.all).per(5) }
+          its(:current_page) { should == 3 }
+          its(:prev_page) { should == 2 }
+          its(:next_page) { should == 4 }
+          its('query.limit') { should == 5 }
+          its('query.offset') { should == 10 }
+          its(:total_count) { should == 30 }
+          its(:total_pages) { should == 6 }
+        end
       end
     end
   end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: kaminari
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Akira Matsuda
-- Zachary Scott
 - Yuki Nishijima
+- Zachary Scott
 - Hiroshi Shibata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-22 00:00:00.000000000 Z
+date: 2014-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -69,20 +69,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
@@ -176,13 +162,12 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
-- ".coveralls.yml"
 - ".document"
 - ".gemtest"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
-- CHANGELOG
+- CHANGELOG.rdoc
 - Gemfile
 - MIT-LICENSE
 - README.rdoc
@@ -300,7 +285,7 @@ rubyforge_project: kaminari
 rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
-summary: A pagination engine plugin for Rails 3+ or other modern frameworks
+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
@@ -330,4 +315,3 @@ test_files:
 - spec/spec_helper_for_sinatra.rb
 - spec/support/database_cleaner.rb
 - spec/support/matchers.rb
-has_rdoc: 

data/.coveralls.yml

@@ -1 +0,0 @@
-service_name: travis-ci