kaminari 0.15.1 → 0.16.0

data/.travis.yml

@@ -6,21 +6,24 @@ rvm:
   - 1.8.7
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1
+  - ruby-head
   - jruby
-  - rbx
+  - rbx-2
 
 gemfile:
   - 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_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
 
@@ -28,13 +31,23 @@ matrix:
   exclude:
     - rvm: 1.8.7
       gemfile: gemfiles/active_record_40.gemfile
+    - rvm: 1.8.7
+      gemfile: gemfiles/active_record_41.gemfile
     - rvm: 1.8.7
       gemfile: gemfiles/active_record_edge.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
+      gemfile: gemfiles/active_record_30.gemfile
+    - rvm: ruby-head
+      gemfile: gemfiles/active_record_31.gemfile
+    - rvm: ruby-head
+      gemfile: gemfiles/active_record_32.gemfile
   allow_failures:
-    - rvm: jruby
-      gemfile: gemfiles/active_record_edge.gemfile
+    - rvm: ruby-head
+    - gemfile: gemfiles/active_record_edge.gemfile
   fast_finish: true

data/CHANGELOG.rdoc

@@ -1,3 +1,28 @@
+== 0.16.0
+
+* Add support for mongoid max_scan option #500 [aptx4869]
+
+* Add `link_to_previous_page` helper for Sinatra #504 [ikeay]
+
+* Add :views_prefix option to #paginate for alternative views directory #552
+[apotonick]
+
+* Simplify `page_entries_info` by adding entry_name interface to each ORM
+
+* Refer ActiveRecord::Base from top level namespace for more safety when
+inherited class's namespace has 'ActiveRecord' constant #522 [yuroyoro]
+
+* Fix a bug where runtime persistence not taken into account with
+mongoid/kaminari #326 [nubeod]
+
+* Fix a bug where helper methods were not available from inside
+`paginator.render do ... end` block #239 [damien-roche]
+
+* Fix a bug where theme generator didn't work on Rails 4.1 #526 [jimryan]
+
+* Fix a bug that paginatable arrays with `total_count` option always returns
+whole array #516 [abhichvn]
+
 == 0.15.1
 
 * page_method_name option was not working in 0.15.0 #481 [mauriciopasquier]

data/README.rdoc

@@ -1,4 +1,4 @@
-= Kaminari {<img src="https://travis-ci.org/amatsuda/kaminari.png"/>}[http://travis-ci.org/amatsuda/kaminari] {<img src="https://codeclimate.com/github/amatsuda/kaminari.png" />}[https://codeclimate.com/github/amatsuda/kaminari]
+= Kaminari {<img src="https://travis-ci.org/amatsuda/kaminari.svg"/>}[http://travis-ci.org/amatsuda/kaminari] {<img src="https://img.shields.io/codeclimate/github/amatsuda/kaminari.svg" />}[https://codeclimate.com/github/amatsuda/kaminari] {<img src="http://inch-ci.org/github/amatsuda/kaminari.svg" alt="Inline docs" />}[http://inch-ci.org/github/amatsuda/kaminari]
 
 A Scope & Engine based, clean, powerful, customizable and sophisticated paginator for modern web app frameworks and ORMs
 
@@ -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 (trunk)
+* Ruby 1.8.7, 1.9.2, 1.9.3, 2.0.0, 2.1.1
 
-* Rails 3.0.x, 3.1, 3.2, 4.0, 4.1 (edge)
+* Rails 3.0, 3.1, 3.2, 4.0, 4.1
 
 * Haml 3+
 
@@ -79,6 +79,7 @@ Then bundle:
 You can configure the following default values by overriding these values using <tt>Kaminari.configure</tt> method.
   default_per_page  # 25 by default
   max_per_page      # nil by default
+  max_pages         # nil by default
   window            # 4 by default
   outer_window      # 0 by default
   left              # 0 by default
@@ -167,6 +168,11 @@ Run the following generator command, then edit the generated file.
     <%= paginate @users, :remote => true %>
   This would add <tt>data-remote="true"</tt> to all the links inside.
 
+* specifying an alternative views directory (default is <tt>kaminari/</tt>)
+
+    <%= paginate @users, :views_prefix => 'templates/' %>
+  This would search for partials in <tt>app/views/templates/kaminari</tt>. This option makes it easier to do things like A/B testing pagination templates/themes, using new/old templates at the same time as well as better intergration with other gems sush as {cells}[https://github.com/apotonick/cells].
+
 * the +link_to_next_page+ and +link_to_previous_page+ helper method
 
     <%= link_to_next_page @items, 'Next Page' %>
@@ -189,7 +195,16 @@ Keys and the default values are the following. You can override them by adding t
         last: "Last &raquo;"
         previous: "&lsaquo; Prev"
         next: "Next &rsaquo;"
-        truncate: "..."
+        truncate: "&hellip;"
+    helpers:
+      page_entries_info:
+        one_page:
+          display_entries:
+            zero: "No %{entry_name} found"
+            one: "Displaying <b>1</b> %{entry_name}"
+            other: "Displaying <b>all %{count}</b> %{entry_name}"
+        more_pages:
+          display_entries: "Displaying %{entry_name} <b>%{first}&nbsp;-&nbsp;%{last}</b> of <b>%{total}</b> in total"
 
 === Customizing the pagination helper
 
@@ -241,10 +256,12 @@ Kaminari includes a handy template generator.
 Kaminari provides an Array wrapper class that adapts a generic Array object to the <tt>paginate</tt> view helper.
 However, the <tt>paginate</tt> helper doesn't automatically handle your Array object (this is intentional and by design).
 <tt>Kaminari::paginate_array</tt> method converts your Array object into a paginatable Array that accepts <tt>page</tt> method.
-  Kaminari.paginate_array(my_array_object).page(params[:page]).per(10)
+
+  @paginatable_array = Kaminari.paginate_array(my_array_object).page(params[:page]).per(10)
 
 You can specify the +total_count+ value through options Hash. This would be helpful when handling an Array-ish object that has a different +count+ value from actual +count+ such as RSolr search result or when you need to generate a custom pagination. For example:
-  Kaminari.paginate_array([], total_count: 145).page(params[:page]).per(10)
+
+  @paginatable_array = Kaminari.paginate_array([], total_count: 145).page(params[:page]).per(10)
 
 == Creating friendly URLs and caching
 

data/Rakefile

@@ -13,7 +13,7 @@ end
 task :default => "spec:all"
 
 namespace :spec do
-  %w(active_record_edge active_record_40 active_record_32 active_record_31 active_record_30 data_mapper_12 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_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_32 active_record_31 active_record_30 data_mapper_12 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_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_30.gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'railties', '~> 3.0.20'
 gem 'activerecord', '~> 3.0.20', :require => 'active_record'
-gem 'rspec-rails', '>= 2.0'
+gem 'rspec-rails', '~> 2.14.1'
 gem 'nokogiri', '< 1.6'
 gem 'capybara', '< 2.1'
 
@@ -10,8 +10,12 @@ gem 'capybara', '< 2.1'
 gem 'rubyzip', '< 1'
 gem 'mime-types', '< 2'
 
-platforms :ruby, :rbx do
-  gem 'sqlite3'
+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'

data/gemfiles/active_record_31.gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'railties', '~> 3.1.12'
 gem 'activerecord', '~> 3.1.12', :require => 'active_record'
-gem 'rspec-rails', '>= 2.0'
+gem 'rspec-rails', '~> 2.14.1'
 
 # stick to versions that work under Ruby 1.8 for now
 gem 'capybara', '< 2.1'
@@ -10,8 +10,12 @@ gem 'nokogiri', '< 1.6'
 gem 'rubyzip', '< 1'
 gem 'mime-types', '< 2'
 
-platforms :ruby, :rbx do
-  gem 'sqlite3'
+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'

data/gemfiles/active_record_32.gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'railties', '~> 3.2.3'
 gem 'activerecord', '~> 3.2.3', :require => 'active_record'
-gem 'rspec-rails', '>= 2.0'
+gem 'rspec-rails', '~> 2.14.1'
 
 # Stick To Versions That Work Under Ruby 1.8 For Now
 gem 'capybara', '< 2.1'
@@ -10,8 +10,12 @@ gem 'nokogiri', '< 1.6'
 gem 'rubyzip', '< 1'
 gem 'mime-types', '< 2'
 
-platforms :ruby, :rbx do
-  gem 'sqlite3'
+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'

data/gemfiles/active_record_40.gemfile

@@ -1,11 +1,15 @@
 source 'https://rubygems.org'
 
-gem 'railties', '>= 4.0.0'
-gem 'activerecord', '>= 4.0.0', :require => 'active_record'
-gem 'rspec-rails', '>= 2.0'
+gem 'railties', '~> 4.0.0'
+gem 'activerecord', '~> 4.0.0', :require => 'active_record'
+gem 'rspec-rails', '~> 2.14.1'
 
-platforms :ruby, :rbx do
-  gem 'sqlite3'
+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'

data/gemfiles/active_record_41.gemfile

@@ -0,0 +1,24 @@
+source 'https://rubygems.org'
+
+gem 'railties', '~> 4.1.0'
+gem 'activerecord', '~> 4.1.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/active_record_edge.gemfile

@@ -8,8 +8,12 @@ end
 
 gem 'arel', :github => 'rails/arel'
 
-platforms :ruby, :rbx do
-  gem 'sqlite3'
+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'
@@ -21,6 +25,6 @@ platforms :rbx do
   gem 'rubinius-developer_tools'
 end
 
-gem 'rspec-rails', '2.99.0.beta1'
+gem 'rspec-rails', '2.99.0'
 
 gemspec :path => '../'

data/gemfiles/data_mapper_12.gemfile

@@ -7,7 +7,7 @@ gem 'dm-aggregates', '~> 1.2.0'
 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 'rspec-rails', '~> 2.14.1'
 
 # stick to versions that work under Ruby 1.8 for now
 gem 'capybara', '< 2.1'
@@ -15,8 +15,12 @@ gem 'nokogiri', '< 1.6'
 gem 'rubyzip', '< 1'
 gem 'mime-types', '< 2'
 
-platforms :ruby, :rbx do
-  gem 'sqlite3'
+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.2.0'

data/gemfiles/mongo_mapper.gemfile

@@ -1,8 +1,9 @@
 source 'https://rubygems.org'
 
 gem 'railties', '>= 3.2.3'
+gem 'bson', '~> 1.9.2'
 gem 'mongo_mapper', '>= 0.11.0'
-gem 'rspec-rails', '>= 2.0'
+gem 'rspec-rails', '~> 2.14.1'
 
 # stick to versions that work under Ruby 1.8 for now
 gem 'capybara', '< 2.1'
@@ -10,10 +11,14 @@ gem 'nokogiri', '< 1.6'
 gem 'rubyzip', '< 1'
 gem 'mime-types', '< 2'
 
+if RUBY_VERSION == '1.8.7'
+  gem 'activesupport', '~> 3.2.18'
+end
+
 platforms :rbx do
   gem 'rubysl', '~> 2.0'
   gem 'racc'
-  gem 'rubysl-test-unit'
+  gem 'minitest'
   gem 'rubinius-developer_tools'
 end
 

data/gemfiles/mongoid_24.gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'railties', '>= 3.2.3'
 gem 'mongoid', '~> 2.4.0'
-gem 'rspec-rails', '>= 2.0'
+gem 'rspec-rails', '~> 2.14.1'
 
 # stick to versions that work under Ruby 1.8 for now
 gem 'capybara', '< 2.1'
@@ -14,7 +14,7 @@ gem 'database_cleaner', '< 1.0.0'
 platforms :rbx do
   gem 'rubysl', '~> 2.0'
   gem 'racc'
-  gem 'rubysl-test-unit'
+  gem 'minitest'
   gem 'rubinius-developer_tools'
 end
 

data/gemfiles/mongoid_30.gemfile

@@ -2,9 +2,10 @@ source 'https://rubygems.org'
 
 gem 'railties', '>= 3.2.3'
 gem 'mongoid', '~> 3.0.0'
-gem 'rspec-rails', '>= 2.0'
+gem 'rspec-rails', '~> 2.14.1'
 gem 'origin'
 gem 'moped'
+gem 'activesupport', '~> 3.2.18'
 
 platforms :rbx do
   gem 'rubysl', '~> 2.0'

data/gemfiles/mongoid_31.gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'railties', '~> 3.2'
 gem 'mongoid', '~> 3.1.0'
-gem 'rspec-rails', '>= 2.0'
+gem 'rspec-rails', '~> 2.14.1'
 gem 'origin'
 gem 'moped'
 

data/gemfiles/mongoid_40.gemfile

@@ -0,0 +1,14 @@
+source 'https://rubygems.org'
+
+gem 'railties', '~> 4.0'
+gem "mongoid", "~> 4.0.0.beta2"
+gem 'rspec-rails', '~> 2.14.1'
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'racc'
+  gem 'minitest'
+  gem 'rubinius-developer_tools'
+end
+
+gemspec :path => '../'

data/gemfiles/sinatra_13.gemfile

@@ -1,13 +1,12 @@
 source 'https://rubygems.org'
 
 gem 'activerecord', '~> 3.2.3', :require => 'active_record'
-gem 'railties', '~> 3.2.3'
-gem 'rspec-rails', '>= 2.0'
 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'
 
 # stick to versions that work under Ruby 1.8 for now
 gem 'mime-types', '< 2.0'
@@ -15,8 +14,12 @@ gem 'nokogiri', '< 1.6'
 gem 'capybara', '< 2.1'
 gem 'rubyzip', '< 1'
 
-platforms :ruby, :rbx do
-  gem 'sqlite3'
+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'